revert: template changes for release v3.2.2

This reverts commit d719986cac
which was created to make template changes for
v3.2.2 release.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2021-05-03 17:04:03 +05:30 committed by Madhu Rajanna
parent d719986cac
commit ba17282906
10 changed files with 17 additions and 17 deletions

View File

@ -10,7 +10,7 @@
# #
# cephcsi image version # cephcsi image version
CSI_IMAGE_VERSION=v3.2.2 CSI_IMAGE_VERSION=v3.2-canary
# Ceph version to use # Ceph version to use
BASE_IMAGE=docker.io/ceph/ceph:v15 BASE_IMAGE=docker.io/ceph/ceph:v15

View File

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

View File

@ -80,7 +80,7 @@ nodeplugin:
plugin: plugin:
image: image:
repository: quay.io/cephcsi/cephcsi repository: quay.io/cephcsi/cephcsi
tag: v3.2.2 tag: v3.2-canary
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}

View File

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

View File

@ -92,7 +92,7 @@ nodeplugin:
plugin: plugin:
image: image:
repository: quay.io/cephcsi/cephcsi repository: quay.io/cephcsi/cephcsi
tag: v3.2.2 tag: v3.2-canary
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}

View File

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

View File

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

View File

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

View File

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

View File

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