From 6d06698672f0ceaa20c8140445445ce34a931bf9 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Tue, 19 Apr 2022 21:54:07 +0530 Subject: [PATCH] rbd: change the image registry for sidecars This commit change the image registry URL for sidecars in the RBD deployment from `k8s.gcr.io` to `registry.k8s.io` as the migration is happening from former to the latter. Signed-off-by: Humble Chirammal --- charts/ceph-csi-rbd/README.md | 10 +++++----- charts/ceph-csi-rbd/values.yaml | 10 +++++----- deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 8 ++++---- deploy/rbd/kubernetes/csi-rbdplugin.yaml | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/charts/ceph-csi-rbd/README.md b/charts/ceph-csi-rbd/README.md index a0e79d263..4c4542bee 100644 --- a/charts/ceph-csi-rbd/README.md +++ b/charts/ceph-csi-rbd/README.md @@ -92,7 +92,7 @@ charts and their default values. | `nodeplugin.updateStrategy` | Specifies the update Strategy. If you are using ceph-fuse client set this value to OnDelete | `RollingUpdate` | | `nodeplugin.priorityClassName` | Set user created priorityclassName for csi plugin pods. default is system-node-critical which is highest priority | `system-node-critical` | | `nodeplugin.profiling.enabled` | Specifies whether profiling should be enabled | `false` | -| `nodeplugin.registrar.image.repository` | Node Registrar image repository URL | `k8s.gcr.io/sig-storage/csi-node-driver-registrar` | +| `nodeplugin.registrar.image.repository` | Node Registrar image repository URL | `registry.k8s.io/sig-storage/csi-node-driver-registrar` | | `nodeplugin.registrar.image.tag` | Image tag | `v2.2.0` | | `nodeplugin.registrar.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `nodeplugin.plugin.image.repository` | Nodeplugin image repository URL | `quay.io/cephcsi/cephcsi` | @@ -113,20 +113,20 @@ charts and their default values. | `provisioner.timeout` | GRPC timeout for waiting for creation or deletion of a volume | `60s` | | `provisioner.priorityClassName` | Set user created priorityclassName for csi provisioner pods. Default is `system-cluster-critical` which is less priority than `system-node-critical` | `system-cluster-critical` | | `provisioner.profiling.enabled` | Specifies whether profiling should be enabled | `false` | -| `provisioner.provisioner.image.repository` | Specifies the csi-provisioner image repository URL | `k8s.gcr.io/sig-storage/csi-provisioner` | +| `provisioner.provisioner.image.repository` | Specifies the csi-provisioner image repository URL | `registry.k8s.io/sig-storage/csi-provisioner` | | `provisioner.provisioner.image.tag` | Specifies image tag | `v2.2.2` | | `provisioner.provisioner.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | -| `provisioner.attacher.image.repository` | Specifies the csi-attacher image repository URL | `k8s.gcr.io/sig-storage/csi-attacher` | +| `provisioner.attacher.image.repository` | Specifies the csi-attacher image repository URL | `registry.k8s.io/sig-storage/csi-attacher` | | `provisioner.attacher.image.tag` | Specifies image tag | `v3.2.1` | | `provisioner.attacher.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.attacher.name` | Specifies the name of csi-attacher sidecar | `attacher` | | `provisioner.attacher.enabled` | Specifies whether attacher sidecar is enabled | `true` | -| `provisioner.resizer.image.repository` | Specifies the csi-resizer image repository URL | `k8s.gcr.io/sig-storage/csi-resizer` | +| `provisioner.resizer.image.repository` | Specifies the csi-resizer image repository URL | `registry.k8s.io/sig-storage/csi-resizer` | | `provisioner.resizer.image.tag` | Specifies image tag | `v1.2.0` | | `provisioner.resizer.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.resizer.name` | Specifies the name of csi-resizer sidecar | `resizer` | | `provisioner.resizer.enabled` | Specifies whether resizer sidecar is enabled | `true` | -| `provisioner.snapshotter.image.repository` | Specifies the csi-snapshotter image repository URL | `k8s.gcr.io/sig-storage/csi-snapshotter` | +| `provisioner.snapshotter.image.repository` | Specifies the csi-snapshotter image repository URL | `registry.k8s.io/sig-storage/csi-snapshotter` | | `provisioner.snapshotter.image.tag` | Specifies image tag | `v4.1.1` | | `provisioner.snapshotter.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.nodeSelector` | Specifies the node selector for provisioner deployment | `{}` | diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 2c9311b75..82a5462dc 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -103,7 +103,7 @@ nodeplugin: registrar: image: - repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar + repository: registry.k8s.io/sig-storage/csi-node-driver-registrar tag: v2.4.0 pullPolicy: IfNotPresent resources: {} @@ -199,7 +199,7 @@ provisioner: provisioner: image: - repository: k8s.gcr.io/sig-storage/csi-provisioner + repository: registry.k8s.io/sig-storage/csi-provisioner tag: v3.1.0 pullPolicy: IfNotPresent resources: {} @@ -208,7 +208,7 @@ provisioner: name: attacher enabled: true image: - repository: k8s.gcr.io/sig-storage/csi-attacher + repository: registry.k8s.io/sig-storage/csi-attacher tag: v3.4.0 pullPolicy: IfNotPresent resources: {} @@ -217,14 +217,14 @@ provisioner: name: resizer enabled: true image: - repository: k8s.gcr.io/sig-storage/csi-resizer + repository: registry.k8s.io/sig-storage/csi-resizer tag: v1.4.0 pullPolicy: IfNotPresent resources: {} snapshotter: image: - repository: k8s.gcr.io/sig-storage/csi-snapshotter + repository: registry.k8s.io/sig-storage/csi-snapshotter tag: v4.2.0 pullPolicy: IfNotPresent resources: {} diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index ce364636a..7cc0b7317 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -47,7 +47,7 @@ spec: priorityClassName: system-cluster-critical containers: - name: csi-provisioner - image: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v3.1.0 args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -67,7 +67,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-snapshotter - image: k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v5.0.1 args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -82,7 +82,7 @@ spec: - name: socket-dir mountPath: /csi - 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=$(ADDRESS)" @@ -96,7 +96,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-resizer - image: k8s.gcr.io/sig-storage/csi-resizer:v1.4.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.4.0 args: - "--csi-address=$(ADDRESS)" - "--v=5" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index e9117e9ff..032126b07 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -28,7 +28,7 @@ spec: # created by privileged CSI driver container. securityContext: privileged: true - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.4.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.4.0 args: - "--v=5" - "--csi-address=/csi/csi.sock"