From 52c8211e4320295669e310f8a459f5be3eafe0bc Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Wed, 13 Apr 2022 11:54:35 +0530 Subject: [PATCH] csi: use k8s.gcr.io for csi nfsplugin image use k8s.gcr.io like other kubernetes sidecar image to pull the nfsplugin image. Signed-off-by: Madhu Rajanna --- Documentation/helm-operator.md | 2 +- deploy/charts/rook-ceph/values.yaml | 2 +- deploy/examples/images.txt | 2 +- deploy/examples/operator-openshift.yaml | 2 +- deploy/examples/operator.yaml | 2 +- images/ceph/Makefile | 2 +- pkg/operator/ceph/csi/spec.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/helm-operator.md b/Documentation/helm-operator.md index f903941e0..efd6749af 100644 --- a/Documentation/helm-operator.md +++ b/Documentation/helm-operator.md @@ -157,7 +157,7 @@ The following tables lists the configurable parameters of the rook-operator char | `csi.csiAddons.enabled` | Enable CSIAddons | `false` | | `csi.csiAddons.image` | CSIAddons Sidecar image. | `quay.io/csiaddons/k8s-sidecar:v0.2.1` | | `csi.nfs.enabled` | Enable nfs driver. | `false` | -| `csi.nfs.image` | NFS nodeplugin image. | `mcr.microsoft.com/k8s/csi/nfs-csi:v3.1.0` | +| `csi.nfs.image` | NFS nodeplugin image. | `k8s.gcr.io/sig-storage/nfsplugin:v3.1.0` | | `admissionController.tolerations` | Array of tolerations in YAML format which will be added to admission controller deployment. | | | `admissionController.nodeAffinity` | The node labels for affinity of the admission controller deployment (***) | | | `monitoring.enabled` | Create necessary RBAC rules for Rook to integrate with Prometheus monitoring in the operator namespace. Requires Prometheus to be pre-installed. | `false` | diff --git a/deploy/charts/rook-ceph/values.yaml b/deploy/charts/rook-ceph/values.yaml index b28ecc0a4..c05f11ecc 100644 --- a/deploy/charts/rook-ceph/values.yaml +++ b/deploy/charts/rook-ceph/values.yaml @@ -355,7 +355,7 @@ csi: # Enable the nfs csi driver. nfs: enabled: false - #image: "mcr.microsoft.com/k8s/csi/nfs-csi:v3.1.0" + #image: "k8s.gcr.io/sig-storage/nfsplugin:v3.1.0" enableDiscoveryDaemon: false cephCommandsTimeoutSeconds: "15" diff --git a/deploy/examples/images.txt b/deploy/examples/images.txt index 9f237f872..7e03b9524 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -3,7 +3,7 @@ k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0 k8s.gcr.io/sig-storage/csi-resizer:v1.4.0 k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1 - mcr.microsoft.com/k8s/csi/nfs-csi:v3.1.0 + k8s.gcr.io/sig-storage/nfsplugin:v3.1.0 quay.io/ceph/ceph:v16.2.7 quay.io/cephcsi/cephcsi:v3.6.0 quay.io/csiaddons/k8s-sidecar:v0.2.1 diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index 6d17f0d1f..432e9c05b 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -175,7 +175,7 @@ data: # ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0" # ROOK_CSI_SNAPSHOTTER_IMAGE: "k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1" # ROOK_CSI_ATTACHER_IMAGE: "k8s.gcr.io/sig-storage/csi-attacher:v3.4.0" - # ROOK_CSI_NFS_IMAGE: "mcr.microsoft.com/k8s/csi/nfs-csi:v3.1.0" + # ROOK_CSI_NFS_IMAGE: "k8s.gcr.io/sig-storage/nfsplugin:v3.1.0" # (Optional) set user created priorityclassName for csi plugin pods. # CSI_PLUGIN_PRIORITY_CLASSNAME: "system-node-critical" diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml index f84180449..d0b8b3370 100644 --- a/deploy/examples/operator.yaml +++ b/deploy/examples/operator.yaml @@ -91,7 +91,7 @@ data: # ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0" # ROOK_CSI_SNAPSHOTTER_IMAGE: "k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1" # ROOK_CSI_ATTACHER_IMAGE: "k8s.gcr.io/sig-storage/csi-attacher:v3.4.0" - # ROOK_CSI_NFS_IMAGE: "mcr.microsoft.com/k8s/csi/nfs-csi:v3.1.0" + # ROOK_CSI_NFS_IMAGE: "k8s.gcr.io/sig-storage/nfsplugin:v3.1.0" # (Optional) set user created priorityclassName for csi plugin pods. # CSI_PLUGIN_PRIORITY_CLASSNAME: "system-node-critical" diff --git a/images/ceph/Makefile b/images/ceph/Makefile index 68a3929b3..6e3738c4d 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -147,7 +147,7 @@ list-image: ## Create a list of images for offline installation rm -f $(IMAGE_TMP) awk '/image:/ {print $2}' $(MANIFESTS_DIR)/operator.yaml $(MANIFESTS_DIR)/cluster.yaml | \ cut -d: -f2- | tee $(IMAGE_TMP) - awk '/quay.io/ || /k8s.gcr.io/ || /mcr.microsoft.com/ {print $3}' ../../pkg/operator/ceph/csi/spec.go | \ + awk '/quay.io/ || /k8s.gcr.io/ {print $3}' ../../pkg/operator/ceph/csi/spec.go | \ cut -d= -f2- | tr -d '"' | tee -a $(IMAGE_TMP) rm -f $(MANIFESTS_DIR)/images.txt cat $(IMAGE_TMP) | sort -h | uniq | tee $(MANIFESTS_DIR)/images.txt diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index 6511a02be..f8b30ada5 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -110,7 +110,7 @@ var ( var ( // image names DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.6.0" - DefaultNFSPluginImage = "mcr.microsoft.com/k8s/csi/nfs-csi:v3.1.0" + DefaultNFSPluginImage = "k8s.gcr.io/sig-storage/nfsplugin:v3.1.0" DefaultRegistrarImage = "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0" DefaultProvisionerImage = "k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0" DefaultAttacherImage = "k8s.gcr.io/sig-storage/csi-attacher:v3.4.0"