Merge pull request #693 from lubronzhan/fix_cve_1.22

[CVE 1.22] Bump gopkg.in/yaml.v3

charts/vsphere-cpi/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 1.22.6
+appVersion: 1.22.8
 description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
 name: vsphere-cpi
-version: 1.22.6
+version: 1.22.8
 keywords:
   - vsphere
   - vmware

charts/vsphere-cpi/values.yaml

@@ -50,7 +50,7 @@ serviceAccount:
 daemonset:
   annotations: {}
   image: gcr.io/cloud-provider-vsphere/cpi/release/manager
-  tag: v1.22.6
+  tag: v1.22.8
   pullPolicy: IfNotPresent
   dnsPolicy: ClusterFirst
   cmdline:

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.22.7
+ARG VERSION=1.22.8
 
 # This build arg controls the GOPROXY setting
 ARG GOPROXY

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 `<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.7/pkg/cloudprovider/vsphere/cloud.go#L51) and [vsphere-paravirtual](https://github.com/kubernetes/cloud-provider-vsphere/blob/v1.22.7/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.8/pkg/cloudprovider/vsphere/cloud.go#L51) and [vsphere-paravirtual](https://github.com/kubernetes/cloud-provider-vsphere/blob/v1.22.8/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.22.7:
+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.8:
 
 ```shell
 kubectl apply -f releases/v1.22/

docs/book/tutorials/disable-node-deletion.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.22.7
+          image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.22.8
           args:
             - --cloud-provider=vsphere
             - --v=2

go.mod

@@ -106,7 +106,7 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.22.1 // indirect
 	k8s.io/apiserver v0.22.1 // indirect
 	k8s.io/controller-manager v0.22.1 // indirect

go.sum

@@ -1064,8 +1064,9 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=

index.yaml

@@ -0,0 +1,42 @@
+apiVersion: v1
+entries:
+  vsphere-cpi:
+  - apiVersion: v2
+    appVersion: 1.22.8
+    created: "2023-03-03T14:15:51.509585-08:00"
+    description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
+    digest: 329ce0da31e1493fb545588cc5155f3dabf03d533c88f4c417613412f1b40340
+    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.22.8.tgz
+    version: 1.22.8
+  - apiVersion: v2
+    appVersion: 1.22.6
+    created: "2023-03-03T14:15:51.508658-08:00"
+    description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
+    digest: e71a47c8fab9dd32012025eae90b14db8d15284f18f3a386b7feb4976c7369d8
+    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.22.6.tgz
+    version: 1.22.6
+generated: "2023-03-03T14:15:51.506331-08:00"

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.22.7).
+In this tutorial, we will be installing the latest version of cloud provider vsphere(v1.22.8).
 
 ### Step 1: find the kubernetes major version you are using
 

releases/v1.22/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.22.7
+          image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.22.8
           args:
             - --cloud-provider=vsphere
             - --v=2