Skip to content

Commit

Permalink
Merge pull request #512 from lubronzhan/bump_1.21
Browse files Browse the repository at this point in the history
Update yaml or doc to reflect 1.21.1 version
  • Loading branch information
lubronzhan authored Oct 21, 2021
2 parents 5fb7d5e + 2a8fca8 commit 7fa9d06
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
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.21.0
appVersion: 1.21.1
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/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.21.0
tag: v1.21.1
pullPolicy: IfNotPresent
dnsPolicy: ClusterFirst
cmdline:
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.21.0/pkg/cloudprovider/vsphere/cloud.go#L51) and [vsphere-paravirtual](https://github.com/kubernetes/cloud-provider-vsphere/blob/v1.21.0/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.21.1/pkg/cloudprovider/vsphere/cloud.go#L51) and [vsphere-paravirtual](https://github.com/kubernetes/cloud-provider-vsphere/blob/v1.21.1/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.21.0:
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.21.1:

```shell
kubectl apply -f releases/v1.21/
Expand Down
2 changes: 1 addition & 1 deletion index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
entries:
vsphere-cpi:
- apiVersion: v2
appVersion: 1.21.0
appVersion: 1.21.1
created: "2021-07-28T14:36:52.229812-07:00"
description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
digest: db24dcbcbdb250809c313912ea7bfc50fbf5b2a99ee0cc3bbd799cdf0db726ac
Expand Down
2 changes: 1 addition & 1 deletion releases/v1.21/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.21.0
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.21.1
args:
- --cloud-provider=vsphere
- --v=2
Expand Down

0 comments on commit 7fa9d06

Please sign in to comment.