diff --git a/Makefile b/Makefile index a82b967e0..f89638c85 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ CONTAINER_CMD?=docker CSI_IMAGE_NAME=$(if $(ENV_CSI_IMAGE_NAME),$(ENV_CSI_IMAGE_NAME),quay.io/cephcsi/cephcsi) -CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v1.2-canary) +CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v1.2.2) $(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION)) diff --git a/README.md b/README.md index 7f800c680..b23c8f059 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,7 @@ in the Kubernetes documentation. | Ceph CSI Release/Branch | Container image name | Image Tag | | ----------------------- | ---------------------------- | --------- | | Master (Branch) | quay.io/cephcsi/cephcsi | canary | +| v1.2.2 (Release) | quay.io/cephcsi/cephcsi | v1.2.2 | | v1.2.1 (Release) | quay.io/cephcsi/cephcsi | v1.2.1 | | v1.2.0 (Release) | quay.io/cephcsi/cephcsi | v1.2.0 | | v1.1.0 (Release) | quay.io/cephcsi/cephcsi | v1.1.0 | diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index b7c2e2c32..8353f9ac6 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -102,7 +102,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: canary + tag: v1.2.2 pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 582745da9..c06714815 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -102,7 +102,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: canary + tag: v1.2.2 pullPolicy: IfNotPresent resources: {} diff --git a/deploy.sh b/deploy.sh index 8d337183a..8c44edb3d 100755 --- a/deploy.sh +++ b/deploy.sh @@ -34,7 +34,7 @@ push_helm_charts() { } if [ "${TRAVIS_BRANCH}" == 'release-v1.2.0' ]; then - export ENV_CSI_IMAGE_VERSION='v1.2-canary' + export ENV_CSI_IMAGE_VERSION='v1.2.2' else echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting" exit 0 # Exiting 0 so that this isn't marked as failing diff --git a/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml index 774c4ea87..203565803 100644 --- a/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml @@ -68,7 +68,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -112,7 +112,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin.yaml index f0e087594..e8a9d5cef 100644 --- a/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin.yaml @@ -49,7 +49,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -102,7 +102,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml index edda0606b..be7c430b5 100644 --- a/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml @@ -71,7 +71,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -115,7 +115,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin.yaml index 5b5127d79..05c7a58d7 100644 --- a/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin.yaml @@ -49,7 +49,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -101,7 +101,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml index 1e524b3fe..25f8b0c50 100644 --- a/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml @@ -87,7 +87,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -126,7 +126,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/v1.13/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/v1.13/csi-rbdplugin.yaml index 269bc0b48..e28612b4a 100644 --- a/deploy/rbd/kubernetes/v1.13/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/v1.13/csi-rbdplugin.yaml @@ -52,7 +52,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -96,7 +96,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml index 88d50be8a..ea3c0650d 100644 --- a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml @@ -91,7 +91,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -130,7 +130,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin.yaml index 269bc0b48..e28612b4a 100644 --- a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin.yaml @@ -52,7 +52,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -96,7 +96,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v1.2.1 + image: quay.io/cephcsi/cephcsi:v1.2.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/scripts/minikube.sh b/scripts/minikube.sh index 57116c4cf..4836a427c 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -101,7 +101,7 @@ ssh) ;; cephcsi) echo "copying the cephcsi image" - copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2-canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.1 + copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.2 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.2 ;; k8s-sidecar) echo "copying the kubernetes sidecar images"