Skip to content

Commit

Permalink
Merge pull request #568 from lubronzhan/bump_cpi_1.22.5
Browse files Browse the repository at this point in the history
Bump to 1.22.5
  • Loading branch information
k8s-ci-robot authored Jan 21, 2022
2 parents 6a40ed4 + 132f272 commit fc61a5d
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 17 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
name: Release Charts

name: Release Helm Charts

on:
Expand All @@ -18,13 +16,13 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0

# Configure Git for helm release
- name: Configure Git
run: |
git config user.name "$GITHUB_ACTOR"
git config user.email "[email protected]"
# Install Helm
- name: Install Helm
uses: azure/setup-helm@v1
Expand Down
Binary file modified charts/vsphere-cpi-1.0.0.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion charts/vsphere-cpi/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 1.22.4
appVersion: 1.22.5
description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
name: vsphere-cpi
version: 1.0.0
Expand Down
2 changes: 1 addition & 1 deletion charts/vsphere-cpi/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- else }}
node-role.kubernetes.io/control-plane: "true"
node-role.kubernetes.io/control-plane: ""
{{- end }}
tolerations:
- key: node.cloudprovider.kubernetes.io/uninitialized
Expand Down
2 changes: 1 addition & 1 deletion charts/vsphere-cpi/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ serviceAccount:
daemonset:
annotations: {}
image: gcr.io/cloud-provider-vsphere/cpi/release/manager
tag: v1.22.4
tag: v1.22.5
pullPolicy: IfNotPresent
dnsPolicy: ClusterFirst
cmdline:
Expand Down
2 changes: 1 addition & 1 deletion cluster/images/controller-manager/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static@sha256:9b60270ec0991bc4f14bda475e8
FROM ${GOLANG_IMAGE} as builder

# This build arg is the version to embed in the CPI binary
ARG VERSION=1.22.4
ARG VERSION=1.22.5

# This build arg controls the GOPROXY setting
ARG GOPROXY
Expand Down
4 changes: 2 additions & 2 deletions docs/book/tutorials/deploying-cpi-with-k3s.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This document is designed to show you how to integrate k3s with cloud provider v

When running with a cloud-controller-manager, it is expected to pass the node provider ID to a CCM as `<provider>://<id>`, in our case, `vsphere://1234567`. However, k3s passes it as `k3s://<hostname>`, which makes vsphere CCM not be able to find the node.

We only support `vsphere` as the provider name that is used for constructing **providerID** for both [vsphere](https://github.com/kubernetes/cloud-provider-vsphere/blob/v1.22.4/pkg/cloudprovider/vsphere/cloud.go#L51) and [vsphere-paravirtual](https://github.com/kubernetes/cloud-provider-vsphere/blob/v1.22.4/pkg/cloudprovider/vsphereparavirtual/cloud.go#L42).
We only support `vsphere` as the provider name that is used for constructing **providerID** for both [vsphere](https://github.com/kubernetes/cloud-provider-vsphere/blob/v1.22.5/pkg/cloudprovider/vsphere/cloud.go#L51) and [vsphere-paravirtual](https://github.com/kubernetes/cloud-provider-vsphere/blob/v1.22.5/pkg/cloudprovider/vsphereparavirtual/cloud.go#L42).

## How to integrate k3s with cloud provider vsphere

Expand Down Expand Up @@ -54,7 +54,7 @@ curl -sfL https://get.k3s.io | K3S_TOKEN=${token} sh -s - agent \

### Install CCM

Now after k3s server starts we need to install the CCM itself. Simply apply the yaml manifest that matches the CCM version you are using, e.g. for v1.22.4:
Now after k3s server starts we need to install the CCM itself. Simply apply the yaml manifest that matches the CCM version you are using, e.g. for v1.22.5:

```shell
kubectl apply -f releases/v1.22/
Expand Down
2 changes: 1 addition & 1 deletion docs/book/tutorials/disable-node-deletion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ spec:
serviceAccountName: cloud-controller-manager
containers:
- name: vsphere-cloud-controller-manager
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.22.4
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.22.5
args:
- --cloud-provider=vsphere
- --v=2
Expand Down
8 changes: 4 additions & 4 deletions index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apiVersion: v1
entries:
vsphere-cpi:
- apiVersion: v2
appVersion: 1.22.4
created: "2021-07-28T14:36:52.229812-07:00"
appVersion: 1.22.5
created: "2022-01-20T21:02:52.518394-08:00"
description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
digest: db24dcbcbdb250809c313912ea7bfc50fbf5b2a99ee0cc3bbd799cdf0db726ac
digest: 47c6c4d533d7ea84e57e7fe012f30f9af76be9f1380641fd2a0ce0fb682f8524
home: https://github.com/kubernetes/cloud-provider-vsphere
icon: https://raw.githubusercontent.com/kubernetes/cloud-provider-vsphere/master/docs/vmware_logo.png
keywords:
Expand All @@ -20,4 +20,4 @@ entries:
urls:
- https://kubernetes.github.io/cloud-provider-vsphere/charts/vsphere-cpi-1.0.0.tgz
version: 1.0.0
generated: "2021-07-28T14:36:52.22876-07:00"
generated: "2022-01-20T21:02:52.517483-08:00"
2 changes: 1 addition & 1 deletion releases/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Note that YAML files from [manifests/controller-manager repo](https://github.com

## Example workflow

In this tutorial, we will be installing the latest version of cloud provider vsphere(v1.22.4).
In this tutorial, we will be installing the latest version of cloud provider vsphere(v1.22.5).

### Step 1: find the kubernetes major version you are using

Expand Down
2 changes: 1 addition & 1 deletion releases/v1.22/vsphere-cloud-controller-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ spec:
serviceAccountName: cloud-controller-manager
containers:
- name: vsphere-cloud-controller-manager
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.22.4
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.22.5
args:
- --cloud-provider=vsphere
- --v=2
Expand Down

0 comments on commit fc61a5d

Please sign in to comment.