From 99328a9c28bc5823721ebaeee0aafdd1148b7da9 Mon Sep 17 00:00:00 2001 From: Lubron Date: Wed, 14 Dec 2022 11:36:18 -0800 Subject: [PATCH] Update CPI to 1.24.3 for CVEs(#4167) --- providers/vendir.lock.yml | 6 +++--- providers/vendir.yml | 4 ++-- .../bundle/config/overlays/update-strategy-overlay.yaml | 0 .../bundle/config/overlays/vsphere-cpi/add-secret.yaml | 0 .../bundle/config/overlays/vsphere-cpi/update-config.yaml | 0 .../config/overlays/vsphere-cpi/update-daemonset.yaml | 0 .../bundle/config/overlays/vsphere-cpi/update-secret.yaml | 0 .../overlays/vsphere-paravirtual-cpi/update-deployment.yaml | 0 .../{1.24.0 => 1.24.3}/bundle/config/schema.yaml | 0 .../bundle/config/upstream/vsphere-cpi/01-rbac.yaml | 0 .../bundle/config/upstream/vsphere-cpi/02-config.yaml | 0 .../bundle/config/upstream/vsphere-cpi/03-secret.yaml | 0 .../bundle/config/upstream/vsphere-cpi/04-daemonset.yaml | 2 +- .../config/upstream/vsphere-paravirtual-cpi/01-rbac.yaml | 0 .../config/upstream/vsphere-paravirtual-cpi/02-config.yaml | 0 .../upstream/vsphere-paravirtual-cpi/03-deployment.yaml | 2 +- .../{1.24.0 => 1.24.3}/bundle/config/values.star | 0 .../{1.24.0 => 1.24.3}/bundle/config/values.yaml | 0 .../{1.24.0 => 1.24.3}/bundle/config/vsphereconf.lib.txt | 0 providers/ytt/vendir/vsphere_cpi/vsphere_cpi.lib.yaml | 2 +- 20 files changed, 8 insertions(+), 8 deletions(-) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/overlays/update-strategy-overlay.yaml (100%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/overlays/vsphere-cpi/add-secret.yaml (100%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/overlays/vsphere-cpi/update-config.yaml (100%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/overlays/vsphere-cpi/update-daemonset.yaml (100%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/overlays/vsphere-cpi/update-secret.yaml (100%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/overlays/vsphere-paravirtual-cpi/update-deployment.yaml (100%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/schema.yaml (100%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/upstream/vsphere-cpi/01-rbac.yaml (100%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/upstream/vsphere-cpi/02-config.yaml (100%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/upstream/vsphere-cpi/03-secret.yaml (100%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml (99%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/upstream/vsphere-paravirtual-cpi/01-rbac.yaml (100%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/upstream/vsphere-paravirtual-cpi/02-config.yaml (100%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/upstream/vsphere-paravirtual-cpi/03-deployment.yaml (99%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/values.star (100%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/values.yaml (100%) rename providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/{1.24.0 => 1.24.3}/bundle/config/vsphereconf.lib.txt (100%) diff --git a/providers/vendir.lock.yml b/providers/vendir.lock.yml index bfa4188d6c9..c0c78d0f37e 100644 --- a/providers/vendir.lock.yml +++ b/providers/vendir.lock.yml @@ -2,10 +2,10 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - git: - commitTitle: Update the cpi 1.23.1's tolerations and affinity (#5332) - sha: b04f47f5c009ea4d560ec1e87c204e77818de960 + commitTitle: Adds Contour 1.22.3 (#5603)... + sha: 95ef4138317d8777ca29730a156cb229333811a9 tags: - - v0.13.0-dev.2-331-gb04f47f5 + - v0.13.0-dev.2-521-g95ef4138 path: . path: ytt/vendir/vsphere_cpi/_ytt_lib - contents: diff --git a/providers/vendir.yml b/providers/vendir.yml index fe0e7c93c40..9393fc64617 100644 --- a/providers/vendir.yml +++ b/providers/vendir.yml @@ -6,9 +6,9 @@ directories: - path: . git: url: git@github.com:vmware-tanzu/community-edition.git - ref: b04f47f5c009ea4d560ec1e87c204e77818de960 + ref: 95ef4138317d8777ca29730a156cb229333811a9 includePaths: - - addons/packages/vsphere-cpi/1.24.0/bundle/config/**/* + - addons/packages/vsphere-cpi/1.24.3/bundle/config/**/* - path: ytt/vendir/cni/_ytt_lib contents: - path: . diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/overlays/update-strategy-overlay.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/overlays/update-strategy-overlay.yaml similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/overlays/update-strategy-overlay.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/overlays/update-strategy-overlay.yaml diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/overlays/vsphere-cpi/add-secret.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/overlays/vsphere-cpi/add-secret.yaml similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/overlays/vsphere-cpi/add-secret.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/overlays/vsphere-cpi/add-secret.yaml diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/overlays/vsphere-cpi/update-config.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/overlays/vsphere-cpi/update-config.yaml similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/overlays/vsphere-cpi/update-config.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/overlays/vsphere-cpi/update-config.yaml diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/overlays/vsphere-cpi/update-daemonset.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/overlays/vsphere-cpi/update-daemonset.yaml similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/overlays/vsphere-cpi/update-daemonset.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/overlays/vsphere-cpi/update-daemonset.yaml diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/overlays/vsphere-cpi/update-secret.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/overlays/vsphere-cpi/update-secret.yaml similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/overlays/vsphere-cpi/update-secret.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/overlays/vsphere-cpi/update-secret.yaml diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/overlays/vsphere-paravirtual-cpi/update-deployment.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/overlays/vsphere-paravirtual-cpi/update-deployment.yaml similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/overlays/vsphere-paravirtual-cpi/update-deployment.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/overlays/vsphere-paravirtual-cpi/update-deployment.yaml diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/schema.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/schema.yaml similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/schema.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/schema.yaml diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-cpi/01-rbac.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-cpi/01-rbac.yaml similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-cpi/01-rbac.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-cpi/01-rbac.yaml diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-cpi/02-config.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-cpi/02-config.yaml similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-cpi/02-config.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-cpi/02-config.yaml diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-cpi/03-secret.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-cpi/03-secret.yaml similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-cpi/03-secret.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-cpi/03-secret.yaml diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml similarity index 99% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml index f9bb8d19eb1..abf83154eb5 100644 --- a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml +++ b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml @@ -23,7 +23,7 @@ spec: - --v=2 - --cloud-provider=vsphere - --cloud-config=/etc/cloud/vsphere.conf - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.24.0 + image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.24.3 imagePullPolicy: IfNotPresent name: vsphere-cloud-controller-manager resources: diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-paravirtual-cpi/01-rbac.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-paravirtual-cpi/01-rbac.yaml similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-paravirtual-cpi/01-rbac.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-paravirtual-cpi/01-rbac.yaml diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-paravirtual-cpi/02-config.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-paravirtual-cpi/02-config.yaml similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-paravirtual-cpi/02-config.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-paravirtual-cpi/02-config.yaml diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-paravirtual-cpi/03-deployment.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-paravirtual-cpi/03-deployment.yaml similarity index 99% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-paravirtual-cpi/03-deployment.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-paravirtual-cpi/03-deployment.yaml index b5c08ae1407..32ee3fe83df 100644 --- a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/upstream/vsphere-paravirtual-cpi/03-deployment.yaml +++ b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/upstream/vsphere-paravirtual-cpi/03-deployment.yaml @@ -32,7 +32,7 @@ spec: value: #@ values.vsphereCPI.supervisorMasterEndpointIP - name: SUPERVISOR_APISERVER_PORT value: #@ values.vsphereCPI.supervisorMasterPort - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.24.0 + image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.24.3 imagePullPolicy: IfNotPresent name: guest-cluster-cloud-provider volumeMounts: diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/values.star b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/values.star similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/values.star rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/values.star diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/values.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/values.yaml similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/values.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/values.yaml diff --git a/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/vsphereconf.lib.txt b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/vsphereconf.lib.txt similarity index 100% rename from providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.0/bundle/config/vsphereconf.lib.txt rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.24.3/bundle/config/vsphereconf.lib.txt diff --git a/providers/ytt/vendir/vsphere_cpi/vsphere_cpi.lib.yaml b/providers/ytt/vendir/vsphere_cpi/vsphere_cpi.lib.yaml index c400e72f7d8..cf13fe298d0 100644 --- a/providers/ytt/vendir/vsphere_cpi/vsphere_cpi.lib.yaml +++ b/providers/ytt/vendir/vsphere_cpi/vsphere_cpi.lib.yaml @@ -1,3 +1,3 @@ #@ load("@ytt:library", "library") -#@ vsphere_cpi_lib = library.get("addons/packages/vsphere-cpi/1.24.0/bundle/config") +#@ vsphere_cpi_lib = library.get("addons/packages/vsphere-cpi/1.24.3/bundle/config")