From 07c5fc7e4654775254f4d8a9cabbfc7115dac47e Mon Sep 17 00:00:00 2001 From: yati1998 Date: Fri, 21 Jan 2022 17:09:59 +0530 Subject: [PATCH] csi: updates the default csi-addons image This commit updates the csi-addons image version from v0.1.0 to v0.2.1. Also, this updates the staging path from {{ .KubeletDirPath }}/plugins/kubernetes.io/csi/pv/ to {{ .KubeletDirPath }}/plugins/kubernetes.io/csi/. This changes is done as the reclaimspace on block mode was not working. For more details: https://github.com/csi-addons/kubernetes-csi-addons/pull/97 Signed-off-by: yati1998 --- Documentation/ceph-upgrade.md | 4 ++-- 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 +- pkg/operator/ceph/csi/spec.go | 2 +- .../ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml | 2 +- pkg/operator/ceph/csi/template/rbd/csi-rbdplugin.yaml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/ceph-upgrade.md b/Documentation/ceph-upgrade.md index feb8ed786..a3a7bfe00 100644 --- a/Documentation/ceph-upgrade.md +++ b/Documentation/ceph-upgrade.md @@ -552,7 +552,7 @@ ROOK_CSI_ATTACHER_IMAGE: "k8s.gcr.io/sig-storage/csi-attacher:v3.4.0" ROOK_CSI_RESIZER_IMAGE: "k8s.gcr.io/sig-storage/csi-resizer:v1.3.0" ROOK_CSI_SNAPSHOTTER_IMAGE: "k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.0" CSI_VOLUME_REPLICATION_IMAGE: "quay.io/csiaddons/volumereplication-operator:v0.1.0" -ROOK_CSIADDONS_IMAGE: "quay.io/csiaddons/k8s-sidecar:v0.1.0" +ROOK_CSIADDONS_IMAGE: "quay.io/csiaddons/k8s-sidecar:v0.2.1" ``` ### **Use default images** @@ -578,5 +578,5 @@ k8s.gcr.io/sig-storage/csi-resizer:v1.3.0 k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.0 quay.io/cephcsi/cephcsi:v3.5.0 quay.io/csiaddons/volumereplication-operator:v0.1.0 -quay.io/csiaddons/k8s-sidecar:v0.1.0 +quay.io/csiaddons/k8s-sidecar:v0.2.1 ``` diff --git a/Documentation/helm-operator.md b/Documentation/helm-operator.md index 919c5cfc3..b135ec59f 100644 --- a/Documentation/helm-operator.md +++ b/Documentation/helm-operator.md @@ -147,7 +147,7 @@ The following tables lists the configurable parameters of the rook-operator char | `csi.volumeReplication.enabled` | Enable Volume Replication. | `false` | | `csi.volumeReplication.image` | Volume Replication Controller image. | `quay.io/csiaddons/volumereplication-operator:v0.1.0` | | `csi.csiAddons.enabled` | Enable CSIAddons | `false` | -| `csi.csiAddons.image` | CSIAddons Sidecar image. | `quay.io/csiaddons/k8s-sidecar:v0.1.0` | +| `csi.csiAddons.image` | CSIAddons Sidecar image. | `quay.io/csiaddons/k8s-sidecar:v0.2.1` | | `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 (***) | | | `allowMultipleFilesystems` | **(experimental in Octopus (v15))** Allows multiple filesystems to be deployed to a Ceph cluster. | `false` | diff --git a/deploy/charts/rook-ceph/values.yaml b/deploy/charts/rook-ceph/values.yaml index 8a869b761..1d6a9223c 100644 --- a/deploy/charts/rook-ceph/values.yaml +++ b/deploy/charts/rook-ceph/values.yaml @@ -300,7 +300,7 @@ csi: # Enable the CSIAddons sidecar. csiAddons: enabled: false - #image: "quay.io/csiaddons/k8s-sidecar:v0.1.0" + #image: "quay.io/csiaddons/k8s-sidecar:v0.2.1" enableDiscoveryDaemon: false cephCommandsTimeoutSeconds: "15" diff --git a/deploy/examples/images.txt b/deploy/examples/images.txt index dac22620e..fdf3fc0bc 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -5,6 +5,6 @@ k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.0 quay.io/ceph/ceph:v16.2.7 quay.io/cephcsi/cephcsi:v3.5.0 - quay.io/csiaddons/k8s-sidecar:v0.1.0 + quay.io/csiaddons/k8s-sidecar:v0.2.1 quay.io/csiaddons/volumereplication-operator:v0.1.0 rook/ceph:master diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index d1340d6b4..ab6bac837 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -420,7 +420,7 @@ data: # CSI_VOLUME_REPLICATION_IMAGE: "quay.io/csiaddons/volumereplication-operator:v0.1.0" # Enable the csi addons sidecar. CSI_ENABLE_CSIADDONS: "false" - # ROOK_CSIADDONS_IMAGE: "quay.io/csiaddons/k8s-sidecar:v0.1.0" + # ROOK_CSIADDONS_IMAGE: "quay.io/csiaddons/k8s-sidecar:v0.2.1" --- # The deployment for the rook operator # OLM: BEGIN OPERATOR DEPLOYMENT diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml index c81ad7a9e..af0340efd 100644 --- a/deploy/examples/operator.yaml +++ b/deploy/examples/operator.yaml @@ -338,7 +338,7 @@ data: # CSI_VOLUME_REPLICATION_IMAGE: "quay.io/csiaddons/volumereplication-operator:v0.1.0" # Enable the csi addons sidecar. CSI_ENABLE_CSIADDONS: "false" - # ROOK_CSIADDONS_IMAGE: "quay.io/csiaddons/k8s-sidecar:v0.1.0" + # ROOK_CSIADDONS_IMAGE: "quay.io/csiaddons/k8s-sidecar:v0.2.1" --- # OLM: BEGIN OPERATOR DEPLOYMENT apiVersion: apps/v1 diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index cad77a8f1..0fc086ad9 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -108,7 +108,7 @@ var ( DefaultSnapshotterImage = "k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.0" DefaultResizerImage = "k8s.gcr.io/sig-storage/csi-resizer:v1.3.0" DefaultVolumeReplicationImage = "quay.io/csiaddons/volumereplication-operator:v0.1.0" - DefaultCSIAddonsImage = "quay.io/csiaddons/k8s-sidecar:v0.1.0" + DefaultCSIAddonsImage = "quay.io/csiaddons/k8s-sidecar:v0.2.1" // Local package template path for RBD //go:embed template/rbd/csi-rbdplugin.yaml diff --git a/pkg/operator/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml b/pkg/operator/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml index b586ffb94..9088d158d 100644 --- a/pkg/operator/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml +++ b/pkg/operator/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml @@ -139,7 +139,7 @@ spec: - "--pod=$(POD_NAME)" - "--namespace=$(POD_NAMESPACE)" - "--pod-uid=$(POD_UID)" - - "--stagingpath={{ .KubeletDirPath }}/plugins/kubernetes.io/csi/pv/" + - "--stagingpath={{ .KubeletDirPath }}/plugins/kubernetes.io/csi/" ports: - containerPort: {{ .CSIAddonsPort }} env: diff --git a/pkg/operator/ceph/csi/template/rbd/csi-rbdplugin.yaml b/pkg/operator/ceph/csi/template/rbd/csi-rbdplugin.yaml index 2b1ae4fcb..e688e6af2 100644 --- a/pkg/operator/ceph/csi/template/rbd/csi-rbdplugin.yaml +++ b/pkg/operator/ceph/csi/template/rbd/csi-rbdplugin.yaml @@ -132,7 +132,7 @@ spec: - "--pod=$(POD_NAME)" - "--namespace=$(POD_NAMESPACE)" - "--pod-uid=$(POD_UID)" - - "--stagingpath={{ .KubeletDirPath }}/plugins/kubernetes.io/csi/pv/" + - "--stagingpath={{ .KubeletDirPath }}/plugins/kubernetes.io/csi/" ports: - containerPort: {{ .CSIAddonsPort }} env: