From 2a8fca8a898de169196bd9c40889ab3a16d0b222 Mon Sep 17 00:00:00 2001 From: lubronzhan Date: Tue, 19 Oct 2021 19:31:24 -0700 Subject: [PATCH] Update yaml or doc to reflect 1.21.1 version --- charts/vsphere-cpi/Chart.yaml | 2 +- charts/vsphere-cpi/values.yaml | 2 +- docs/book/tutorials/deploying-cpi-with-k3s.md | 4 ++-- index.yaml | 2 +- releases/v1.21/vsphere-cloud-controller-manager.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/vsphere-cpi/Chart.yaml b/charts/vsphere-cpi/Chart.yaml index 913fd8e98..6f1d76eb8 100644 --- a/charts/vsphere-cpi/Chart.yaml +++ b/charts/vsphere-cpi/Chart.yaml @@ -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 diff --git a/charts/vsphere-cpi/values.yaml b/charts/vsphere-cpi/values.yaml index b05306623..b7865da65 100644 --- a/charts/vsphere-cpi/values.yaml +++ b/charts/vsphere-cpi/values.yaml @@ -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: diff --git a/docs/book/tutorials/deploying-cpi-with-k3s.md b/docs/book/tutorials/deploying-cpi-with-k3s.md index 32b8b33ce..d0569a125 100644 --- a/docs/book/tutorials/deploying-cpi-with-k3s.md +++ b/docs/book/tutorials/deploying-cpi-with-k3s.md @@ -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 `://`, in our case, `vsphere://1234567`. However, k3s passes it as `k3s://`, 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 @@ -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/ diff --git a/index.yaml b/index.yaml index bed7f181b..d604e455b 100644 --- a/index.yaml +++ b/index.yaml @@ -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 diff --git a/releases/v1.21/vsphere-cloud-controller-manager.yaml b/releases/v1.21/vsphere-cloud-controller-manager.yaml index 8fabed84a..767c25261 100644 --- a/releases/v1.21/vsphere-cloud-controller-manager.yaml +++ b/releases/v1.21/vsphere-cloud-controller-manager.yaml @@ -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