From 2032a84c686a0dbaabddb798690aa28083682d0e Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 22 Apr 2022 13:39:48 +0530 Subject: [PATCH] deploy: change image versions to v3.6.1 This commit change the required image tag to v3.6.1 instead of v3.6-canary for v3.6.1 release Signed-off-by: Madhu Rajanna --- build.env | 2 +- deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml | 4 ++-- deploy/cephfs/kubernetes/csi-cephfsplugin.yaml | 4 ++-- deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 6 +++--- deploy/rbd/kubernetes/csi-rbdplugin.yaml | 4 ++-- scripts/minikube.sh | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.env b/build.env index a678d163b..056b9dd24 100644 --- a/build.env +++ b/build.env @@ -9,7 +9,7 @@ # get proporly expanded. # # cephcsi image version -CSI_IMAGE_VERSION=v3.6-canary +CSI_IMAGE_VERSION=v3.6.1 # Ceph version to use BASE_IMAGE=quay.io/ceph/ceph:v17 diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 77b173ad0..774af4598 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -105,7 +105,7 @@ spec: mountPath: /csi - name: csi-cephfsplugin # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.6-canary + image: quay.io/cephcsi/cephcsi:v3.6.1 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -144,7 +144,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.6-canary + image: quay.io/cephcsi/cephcsi:v3.6.1 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index 64508b8fa..efe07708f 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -48,7 +48,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.6-canary + image: quay.io/cephcsi/cephcsi:v3.6.1 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -106,7 +106,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:v3.6-canary + image: quay.io/cephcsi/cephcsi:v3.6.1 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index f0446e694..3c59133f2 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -112,7 +112,7 @@ spec: mountPath: /csi - name: csi-rbdplugin # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.6-canary + image: quay.io/cephcsi/cephcsi:v3.6.1 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -168,7 +168,7 @@ spec: readOnly: true - name: csi-rbdplugin-controller # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.6-canary + image: quay.io/cephcsi/cephcsi:v3.6.1 args: - "--type=controller" - "--v=5" @@ -188,7 +188,7 @@ spec: - name: ceph-config mountPath: /etc/ceph/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.6-canary + image: quay.io/cephcsi/cephcsi:v3.6.1 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index a5687c713..7c54e8270 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -50,7 +50,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.6-canary + image: quay.io/cephcsi/cephcsi:v3.6.1 args: - "--nodeid=$(NODE_ID)" - "--pluginpath=/var/lib/kubelet/plugins" @@ -124,7 +124,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:v3.6-canary + image: quay.io/cephcsi/cephcsi:v3.6.1 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/scripts/minikube.sh b/scripts/minikube.sh index 9f1331060..41c55ddee 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -177,7 +177,7 @@ else fi # configure csi image version -CSI_IMAGE_VERSION=${CSI_IMAGE_VERSION:-"v3.6-canary"} +CSI_IMAGE_VERSION=${CSI_IMAGE_VERSION:-"v3.6.1"} #feature-gates for kube K8S_FEATURE_GATES=${K8S_FEATURE_GATES:-""}