diff --git a/charts/vsphere-cpi-1.23.5.tgz b/charts/vsphere-cpi-1.23.5.tgz new file mode 100644 index 000000000..c2ffa4e8d Binary files /dev/null and b/charts/vsphere-cpi-1.23.5.tgz differ diff --git a/charts/vsphere-cpi/Chart.yaml b/charts/vsphere-cpi/Chart.yaml index 107b2fac0..3864f3474 100644 --- a/charts/vsphere-cpi/Chart.yaml +++ b/charts/vsphere-cpi/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 1.23.4 +appVersion: 1.23.5 description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI) name: vsphere-cpi -version: 1.23.4 +version: 1.23.5 keywords: - vsphere - vmware diff --git a/charts/vsphere-cpi/values.yaml b/charts/vsphere-cpi/values.yaml index 201964954..9b424acfc 100644 --- a/charts/vsphere-cpi/values.yaml +++ b/charts/vsphere-cpi/values.yaml @@ -58,7 +58,7 @@ serviceAccount: daemonset: annotations: {} image: gcr.io/cloud-provider-vsphere/cpi/release/manager - tag: v1.23.4 + tag: v1.23.5 pullPolicy: IfNotPresent dnsPolicy: ClusterFirst cmdline: diff --git a/cluster/images/controller-manager/Dockerfile b/cluster/images/controller-manager/Dockerfile index e6ed39b68..10d06298d 100644 --- a/cluster/images/controller-manager/Dockerfile +++ b/cluster/images/controller-manager/Dockerfile @@ -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.23.4 +ARG VERSION=1.23.5 # This build arg controls the GOPROXY setting ARG GOPROXY diff --git a/docs/book/tutorials/deploying-cpi-with-k3s.md b/docs/book/tutorials/deploying-cpi-with-k3s.md index f3de35aa5..079100f7b 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.23.4/pkg/cloudprovider/vsphere/cloud.go#L51) and [vsphere-paravirtual](https://github.com/kubernetes/cloud-provider-vsphere/blob/1.23.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.23.5/pkg/cloudprovider/vsphere/cloud.go#L51) and [vsphere-paravirtual](https://github.com/kubernetes/cloud-provider-vsphere/blob/1.23.5/pkg/cloudprovider/vsphereparavirtual/cloud.go#L42). ## How to integrate k3s with cloud provider vsphere diff --git a/docs/book/tutorials/disable-node-deletion.yaml b/docs/book/tutorials/disable-node-deletion.yaml index 53b058a15..9799f0c34 100644 --- a/docs/book/tutorials/disable-node-deletion.yaml +++ b/docs/book/tutorials/disable-node-deletion.yaml @@ -233,7 +233,7 @@ spec: priorityClassName: system-node-critical containers: - name: vsphere-cloud-controller-manager - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.23.4 + image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.23.5 args: - --cloud-provider=vsphere - --v=2 diff --git a/index.yaml b/index.yaml index 874e88449..a2fbf23cc 100644 --- a/index.yaml +++ b/index.yaml @@ -1,9 +1,28 @@ apiVersion: v1 entries: vsphere-cpi: + - apiVersion: v2 + appVersion: 1.23.5 + created: "2023-08-28T16:46:55.969073+08:00" + description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI) + digest: e52060f75f36cb9c93d93eaa6ace81c32c3bfc71bf690055960a397401583bea + home: https://github.com/kubernetes/cloud-provider-vsphere + icon: https://raw.githubusercontent.com/kubernetes/cloud-provider-vsphere/master/docs/vmware_logo.png + keywords: + - vsphere + - vmware + - cloud + - provider + - cpi + name: vsphere-cpi + sources: + - https://github.com/kubernetes/cloud-provider-vsphere + urls: + - https://kubernetes.github.io/cloud-provider-vsphere/charts/vsphere-cpi-1.23.5.tgz + version: 1.23.5 - apiVersion: v2 appVersion: 1.23.4 - created: "2023-03-03T14:12:25.895478-08:00" + created: "2023-08-28T16:46:55.968132+08:00" description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI) digest: d6e201506e01f83b52a64dc03dae0d231da835e882c258859ac62a118e278e09 home: https://github.com/kubernetes/cloud-provider-vsphere @@ -22,7 +41,7 @@ entries: version: 1.23.4 - apiVersion: v2 appVersion: 1.23.2 - created: "2023-03-03T14:12:25.894622-08:00" + created: "2023-08-28T16:46:55.96701+08:00" description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI) digest: 883ec295a07ac932009179801748668090e915d1f88d1bf001337d7ab463100e home: https://github.com/kubernetes/cloud-provider-vsphere @@ -41,7 +60,7 @@ entries: version: 1.23.2 - apiVersion: v2 appVersion: 1.23.1 - created: "2023-03-03T14:12:25.893642-08:00" + created: "2023-08-28T16:46:55.965619+08:00" description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI) digest: ec70834e13c37ab0080ddbad05f6b1ba80da097a32ee1a61e7ba19428276b54a home: https://github.com/kubernetes/cloud-provider-vsphere @@ -58,4 +77,4 @@ entries: urls: - https://kubernetes.github.io/cloud-provider-vsphere/charts/vsphere-cpi-1.23.1.tgz version: 1.23.1 -generated: "2023-03-03T14:12:25.891703-08:00" +generated: "2023-08-28T16:46:55.964383+08:00" diff --git a/releases/README.md b/releases/README.md index ba95a1412..d48953c8c 100644 --- a/releases/README.md +++ b/releases/README.md @@ -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.23.4) freshly. If you have an older version of CPI already installed, the steps to deploy and upgrade CPI stay the same. With our `RollingUpdate` update strategy, after you update a DaemonSet template, old DaemonSet pods will be killed, and new DaemonSet pods will be created automatically. +In this tutorial, we will be installing the latest version of cloud provider vsphere(v1.23.5) freshly. If you have an older version of CPI already installed, the steps to deploy and upgrade CPI stay the same. With our `RollingUpdate` update strategy, after you update a DaemonSet template, old DaemonSet pods will be killed, and new DaemonSet pods will be created automatically. ### Step 1: find the kubernetes major version you are using diff --git a/releases/v1.23/vsphere-cloud-controller-manager.yaml b/releases/v1.23/vsphere-cloud-controller-manager.yaml index fc26dc07d..87db10589 100644 --- a/releases/v1.23/vsphere-cloud-controller-manager.yaml +++ b/releases/v1.23/vsphere-cloud-controller-manager.yaml @@ -233,7 +233,7 @@ spec: priorityClassName: system-node-critical containers: - name: vsphere-cloud-controller-manager - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.23.4 + image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.23.5 args: - --cloud-provider=vsphere - --v=2 diff --git a/test/e2e/config/vsphere-ci.yaml b/test/e2e/config/vsphere-ci.yaml index 8431503f2..4445057f9 100644 --- a/test/e2e/config/vsphere-ci.yaml +++ b/test/e2e/config/vsphere-ci.yaml @@ -145,7 +145,7 @@ variables: IP_FAMILY: "IPv4" CLUSTER_CLASS_NAME: "quick-start" # Following CAPV variables should be set before testing - VSPHERE_TLS_THUMBPRINT: "AA:70:F9:CF:5A:5F:CF:6C:81:15:E0:A1:88:B9:E9:2B:DC:19:0E:D0" + VSPHERE_TLS_THUMBPRINT: "18:EC:35:60:54:68:92:F6:F8:92:3E:4D:11:A1:0D:13:9C:E9:3E:B6" VSPHERE_DATACENTER: "SDDC-Datacenter" VSPHERE_FOLDER: "clusterapi" VSPHERE_RESOURCE_POOL: "clusterapi"