From 4f61895bd5959a4e0833dd15315fc4fb9551622c Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 12 Feb 2023 13:45:32 +0200 Subject: [PATCH] Use registry.k8s.io for managed addons --- .../k8s-1.22.yaml.template | 12 ++++++------ .../k8s-1.22.yaml.template | 12 ++++++------ .../metadata-proxy.addons.k8s.io/v0.1.12.yaml | 6 +++--- .../k8s-1.24.yaml.template | 16 ++++++++-------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/upup/models/cloudup/resources/addons/digitalocean-csi-driver.addons.k8s.io/k8s-1.22.yaml.template b/upup/models/cloudup/resources/addons/digitalocean-csi-driver.addons.k8s.io/k8s-1.22.yaml.template index 23a1cadbd9..e42618337f 100644 --- a/upup/models/cloudup/resources/addons/digitalocean-csi-driver.addons.k8s.io/k8s-1.22.yaml.template +++ b/upup/models/cloudup/resources/addons/digitalocean-csi-driver.addons.k8s.io/k8s-1.22.yaml.template @@ -801,7 +801,7 @@ spec: serviceAccount: csi-do-controller-sa containers: - name: csi-provisioner - image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1 + image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1 args: - "--csi-address=$(ADDRESS)" - "--default-fstype=ext4" @@ -814,7 +814,7 @@ spec: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ - name: csi-attacher - image: k8s.gcr.io/sig-storage/csi-attacher:v3.5.0 + image: registry.k8s.io/sig-storage/csi-attacher:v3.5.0 args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -828,7 +828,7 @@ spec: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ - name: csi-snapshotter - image: k8s.gcr.io/sig-storage/csi-snapshotter:v6.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v6.0.1 args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -840,7 +840,7 @@ spec: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ - name: csi-resizer - image: k8s.gcr.io/sig-storage/csi-resizer:v1.5.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.5.0 args: - "--csi-address=$(ADDRESS)" - "--timeout=30s" @@ -1088,7 +1088,7 @@ spec: mountPath: /etc/udev/rules.d/ containers: - name: csi-node-driver-registrar - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1 args: - "--v=5" - "--csi-address=$(ADDRESS)" @@ -1230,7 +1230,7 @@ spec: serviceAccountName: snapshot-controller containers: - name: snapshot-controller - image: k8s.gcr.io/sig-storage/snapshot-controller:v6.0.1 + image: registry.k8s.io/sig-storage/snapshot-controller:v6.0.1 args: - "--v=5" imagePullPolicy: IfNotPresent diff --git a/upup/models/cloudup/resources/addons/hcloud-csi-driver.addons.k8s.io/k8s-1.22.yaml.template b/upup/models/cloudup/resources/addons/hcloud-csi-driver.addons.k8s.io/k8s-1.22.yaml.template index 0d14efcaa6..08bab99b65 100644 --- a/upup/models/cloudup/resources/addons/hcloud-csi-driver.addons.k8s.io/k8s-1.22.yaml.template +++ b/upup/models/cloudup/resources/addons/hcloud-csi-driver.addons.k8s.io/k8s-1.22.yaml.template @@ -219,12 +219,12 @@ spec: app: hcloud-csi-controller spec: containers: - - image: k8s.gcr.io/sig-storage/csi-attacher:v3.2.1 + - image: registry.k8s.io/sig-storage/csi-attacher:v3.2.1 name: csi-attacher volumeMounts: - mountPath: /run/csi name: socket-dir - - image: k8s.gcr.io/sig-storage/csi-resizer:v1.2.0 + - image: registry.k8s.io/sig-storage/csi-resizer:v1.2.0 name: csi-resizer volumeMounts: - mountPath: /run/csi @@ -232,7 +232,7 @@ spec: - args: - --feature-gates=Topology=true - --default-fstype=ext4 - image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2 + image: registry.k8s.io/sig-storage/csi-provisioner:v2.2.2 name: csi-provisioner volumeMounts: - mountPath: /run/csi @@ -276,7 +276,7 @@ spec: volumeMounts: - mountPath: /run/csi name: socket-dir - - image: k8s.gcr.io/sig-storage/livenessprobe:v2.3.0 + - image: registry.k8s.io/sig-storage/livenessprobe:v2.3.0 imagePullPolicy: Always name: liveness-probe volumeMounts: @@ -315,7 +315,7 @@ spec: containers: - args: - --kubelet-registration-path=/var/lib/kubelet/plugins/csi.hetzner.cloud/socket - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.2.0 name: csi-node-driver-registrar volumeMounts: - mountPath: /run/csi @@ -358,7 +358,7 @@ spec: name: plugin-dir - mountPath: /dev name: device-dir - - image: k8s.gcr.io/sig-storage/livenessprobe:v2.3.0 + - image: registry.k8s.io/sig-storage/livenessprobe:v2.3.0 imagePullPolicy: Always name: liveness-probe volumeMounts: diff --git a/upup/models/cloudup/resources/addons/metadata-proxy.addons.k8s.io/v0.1.12.yaml b/upup/models/cloudup/resources/addons/metadata-proxy.addons.k8s.io/v0.1.12.yaml index b73025fd6a..23ed08b4f5 100644 --- a/upup/models/cloudup/resources/addons/metadata-proxy.addons.k8s.io/v0.1.12.yaml +++ b/upup/models/cloudup/resources/addons/metadata-proxy.addons.k8s.io/v0.1.12.yaml @@ -48,7 +48,7 @@ spec: - name: update-ipdtables securityContext: privileged: true - image: k8s.gcr.io/k8s-custom-iptables:1.0 + image: registry.k8s.io/k8s-custom-iptables:1.0 imagePullPolicy: Always command: - "/bin/sh" @@ -77,7 +77,7 @@ spec: type: Directory containers: - name: metadata-proxy - image: k8s.gcr.io/metadata-proxy:v0.1.12 + image: registry.k8s.io/metadata-proxy:v0.1.12 securityContext: privileged: true args: @@ -92,7 +92,7 @@ spec: cpu: "30m" # BEGIN_PROMETHEUS_TO_SD - name: prometheus-to-sd-exporter - image: k8s.gcr.io/prometheus-to-sd:v0.5.0 + image: registry.k8s.io/prometheus-to-sd:v0.5.0 # Request and limit resources to get guaranteed QoS. resources: requests: diff --git a/upup/models/cloudup/resources/addons/scaleway-csi-driver.addons.k8s.io/k8s-1.24.yaml.template b/upup/models/cloudup/resources/addons/scaleway-csi-driver.addons.k8s.io/k8s-1.24.yaml.template index ebc5124e57..2f1faa5144 100644 --- a/upup/models/cloudup/resources/addons/scaleway-csi-driver.addons.k8s.io/k8s-1.24.yaml.template +++ b/upup/models/cloudup/resources/addons/scaleway-csi-driver.addons.k8s.io/k8s-1.24.yaml.template @@ -88,7 +88,7 @@ spec: - name: device-dir mountPath: /dev - name: csi-node-driver-registrar - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.0.1 args: - "--v=2" - "--csi-address=$(CSI_ADDRESS)" @@ -108,7 +108,7 @@ spec: - name: registration-dir mountPath: /registration/ - name: liveness-probe - image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0 + image: registry.k8s.io/sig-storage/livenessprobe:v2.2.0 args: - "--csi-address=$(CSI_ADDRESS)" env: @@ -863,7 +863,7 @@ spec: periodSeconds: 2 failureThreshold: 5 - name: csi-provisioner - image: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v3.0.0 args: - "--v=5" - "--csi-address=$(CSI_ADDRESS)" @@ -877,7 +877,7 @@ spec: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ - name: csi-attacher - image: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0 + image: registry.k8s.io/sig-storage/csi-attacher:v3.4.0 args: - "--v=5" - "--csi-address=$(CSI_ADDRESS)" @@ -889,7 +889,7 @@ spec: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ - name: csi-snapshotter - image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v4.2.1 args: - "--v=5" - "--csi-address=$(CSI_ADDRESS)" @@ -901,12 +901,12 @@ spec: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ - name: snapshot-controller - image: k8s.gcr.io/sig-storage/snapshot-controller:v4.1.1 + image: registry.k8s.io/sig-storage/snapshot-controller:v4.1.1 args: - "--v=5" - "--leader-election" - name: csi-resizer - image: k8s.gcr.io/sig-storage/csi-resizer:v1.3.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.3.0 args: - "--v=5" - "--csi-address=$(CSI_ADDRESS)" @@ -918,7 +918,7 @@ spec: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ - name: liveness-probe - image: k8s.gcr.io/sig-storage/livenessprobe:v2.6.0 + image: registry.k8s.io/sig-storage/livenessprobe:v2.6.0 args: - "--csi-address=$(CSI_ADDRESS)" env: