revert: update templates for v3.1.2 release

This reverts commit b5fe726b2a.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2020-11-19 18:09:33 +05:30 committed by Madhu Rajanna
parent b5fe726b2a
commit 19204ea371
13 changed files with 20 additions and 20 deletions

View File

@ -22,7 +22,7 @@ CPUS?=$(shell nproc --ignore=1)
CPUSET?=--cpuset-cpus=0-${CPUS}
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),v3.1.2)
CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v3.1-canary)
CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION)
$(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION))

View File

@ -43,4 +43,4 @@ DEPLOY_TIMEOUT=10
UPGRADE_VERSION=v3.0.0
# This var will be used by CentOS CI to build the image
CSI_IMAGE_VERSION=v3.1.2
CSI_IMAGE_VERSION=v3.1-canary

View File

@ -1,10 +1,10 @@
---
apiVersion: v1
appVersion: v3.1.2
appVersion: v3.1-canary
description: "Container Storage Interface (CSI) driver,
provisioner, snapshotter and attacher for Ceph cephfs"
name: ceph-csi-cephfs
version: 3.1.2-canary
version: 3.1-canary
keywords:
- ceph
- cephfs

View File

@ -75,7 +75,7 @@ nodeplugin:
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: v3.1.2
tag: v3.1-canary
pullPolicy: IfNotPresent
resources: {}

View File

@ -1,10 +1,10 @@
---
apiVersion: v1
appVersion: v3.1.2
appVersion: v3.1-canary
description: "Container Storage Interface (CSI) driver,
provisioner, snapshotter, and attacher for Ceph RBD"
name: ceph-csi-rbd
version: 3.1.2-canary
version: 3.1-canary
keywords:
- ceph
- rbd

View File

@ -87,7 +87,7 @@ nodeplugin:
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: v3.1.2
tag: v3.1-canary
pullPolicy: IfNotPresent
resources: {}

View File

@ -83,7 +83,7 @@ build_push_images() {
}
if [ "${TRAVIS_BRANCH}" == 'release-v3.1' ]; then
export ENV_CSI_IMAGE_VERSION='v3.1.2'
export ENV_CSI_IMAGE_VERSION='v3.1-canary'
else
echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"
exit 0 # Exiting 0 so that this isn't marked as failing

View File

@ -99,7 +99,7 @@ spec:
capabilities:
add: ["SYS_ADMIN"]
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v3.1.2
image: quay.io/cephcsi/cephcsi:v3.1-canary
args:
- "--nodeid=$(NODE_ID)"
- "--type=cephfs"
@ -135,7 +135,7 @@ spec:
- name: keys-tmp-dir
mountPath: /tmp/csi/keys
- name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:v3.1.2
image: quay.io/cephcsi/cephcsi:v3.1-canary
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

View File

@ -54,7 +54,7 @@ spec:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v3.1.2
image: quay.io/cephcsi/cephcsi:v3.1-canary
args:
- "--nodeid=$(NODE_ID)"
- "--type=cephfs"
@ -104,7 +104,7 @@ spec:
- name: liveness-prometheus
securityContext:
privileged: true
image: quay.io/cephcsi/cephcsi:v3.1.2
image: quay.io/cephcsi/cephcsi:v3.1-canary
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

View File

@ -99,7 +99,7 @@ spec:
capabilities:
add: ["SYS_ADMIN"]
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v3.1.2
image: quay.io/cephcsi/cephcsi:v3.1-canary
args:
- "--nodeid=$(NODE_ID)"
- "--type=rbd"
@ -139,7 +139,7 @@ spec:
- name: keys-tmp-dir
mountPath: /tmp/csi/keys
- name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:v3.1.2
image: quay.io/cephcsi/cephcsi:v3.1-canary
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

View File

@ -55,7 +55,7 @@ spec:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v3.1.2
image: quay.io/cephcsi/cephcsi:v3.1-canary
args:
- "--nodeid=$(NODE_ID)"
- "--type=rbd"
@ -107,7 +107,7 @@ spec:
- name: liveness-prometheus
securityContext:
privileged: true
image: quay.io/cephcsi/cephcsi:v3.1.2
image: quay.io/cephcsi/cephcsi:v3.1-canary
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

View File

@ -84,12 +84,12 @@ that will not be supported in the official releases. Builds from the master
branch can have functionality changed and even removed at any time without
compatibility support and without prior notice.
git checkout v3.1.2 tag
git checkout v3.1.1 tag
```bash
[$] git clone https://github.com/ceph/ceph-csi.git
[$] cd ./ceph-csi
[$] git checkout v3.1.2
[$] git checkout v3.1.1
```
**Note:** While upgrading please Ignore warning messages from kubectl output

View File

@ -239,7 +239,7 @@ teardown-rook)
;;
cephcsi)
echo "copying the cephcsi image"
copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.1.2 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.1.2
copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.1-canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.1-canary
;;
k8s-sidecar)
echo "copying the kubernetes sidecar images"