feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #10059 from Madhu-1/update-nfs-image-reg

Browse Source 
csi: use k8s.gcr.io for csi nfsplugin image
This commit is contained in:
Travis Nielsen
2022-04-20 08:01:47 -06:00
committed by GitHub
parent d172030238 52c8211e43
commit 09c7b305c7
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/helm-operator.md
+1 -1
View File
@@ -130,7 +130,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. | <none> |
| `admissionController.nodeAffinity` | The node labels for affinity of the admission controller deployment (***) | <none> |
| `monitoring.enabled` | Create necessary RBAC rules for Rook to integrate with Prometheus monitoring in the operator namespace. Requires Prometheus to be pre-installed. | `false` |
deploy/charts/rook-ceph/values.yaml
+1 -1
View File
@@ -377,7 +377,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"
deploy/examples/images.txt
+1 -1
View File
@@ -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
deploy/examples/operator-openshift.yaml
+1 -1
View File
@@ -179,7 +179,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"
deploy/examples/operator.yaml
+1 -1
View File
@@ -94,7 +94,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"
images/ceph/Makefile
+1 -1
View File
@@ -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
pkg/operator/ceph/csi/spec.go
+1 -1
View File
@@ -112,7 +112,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"