mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-02 19:20:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

deploy: Template changes for release v2.1.2

Browse Source 
Updated the templates and the required scripts
to make a v2.1.2 release.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2020-06-05 12:27:47 +05:30 committed by Madhu Rajanna
parent 958d2b3974
commit a03675e3ae
11 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -17,7 +17,7 @@
CONTAINER_CMD?=docker CONTAINER_CMD?=docker
CSI_IMAGE_NAME=$(if $(ENV_CSI_IMAGE_NAME),$(ENV_CSI_IMAGE_NAME),quay.io/cephcsi/cephcsi) 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),v2.1-canary) CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v2.1.2)
CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION) CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION)
$(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION)) $(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION))

4
charts/ceph-csi-cephfs/Chart.yaml
View File

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

2
charts/ceph-csi-cephfs/values.yaml
View File

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

4
charts/ceph-csi-rbd/Chart.yaml
View File

@ -1,10 +1,10 @@
--- ---
apiVersion: v1 apiVersion: v1
appVersion: v2.1-canary appVersion: v2.1.2
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: 2.1-canary version: 2.1.2-canary
keywords: keywords:
- ceph - ceph
- rbd - rbd

2
charts/ceph-csi-rbd/values.yaml
View File

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

2
deploy.sh
View File

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

4
deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
View File

@ -81,7 +81,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:v2.1-canary image: quay.io/cephcsi/cephcsi:v2.1.2
args: args:
- "--nodeid=$(NODE_ID)" - "--nodeid=$(NODE_ID)"
- "--type=cephfs" - "--type=cephfs"
@ -122,7 +122,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:v2.1-canary image: quay.io/cephcsi/cephcsi:v2.1.2
args: args:
- "--type=liveness" - "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"

4
deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
View File

@ -54,7 +54,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:v2.1-canary image: quay.io/cephcsi/cephcsi:v2.1.2
args: args:
- "--nodeid=$(NODE_ID)" - "--nodeid=$(NODE_ID)"
- "--type=cephfs" - "--type=cephfs"
@ -109,7 +109,7 @@ spec:
- name: liveness-prometheus - name: liveness-prometheus
securityContext: securityContext:
privileged: true privileged: true
image: quay.io/cephcsi/cephcsi:v2.1-canary image: quay.io/cephcsi/cephcsi:v2.1.2
args: args:
- "--type=liveness" - "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"

4
deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
View File

@ -101,7 +101,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:v2.1-canary image: quay.io/cephcsi/cephcsi:v2.1.2
args: args:
- "--nodeid=$(NODE_ID)" - "--nodeid=$(NODE_ID)"
- "--type=rbd" - "--type=rbd"
@ -139,7 +139,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:v2.1-canary image: quay.io/cephcsi/cephcsi:v2.1.2
args: args:
- "--type=liveness" - "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"

4
deploy/rbd/kubernetes/csi-rbdplugin.yaml
View File

@ -55,7 +55,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:v2.1-canary image: quay.io/cephcsi/cephcsi:v2.1.2
args: args:
- "--nodeid=$(NODE_ID)" - "--nodeid=$(NODE_ID)"
- "--type=rbd" - "--type=rbd"
@ -111,7 +111,7 @@ spec:
- name: liveness-prometheus - name: liveness-prometheus
securityContext: securityContext:
privileged: true privileged: true
image: quay.io/cephcsi/cephcsi:v2.1-canary image: quay.io/cephcsi/cephcsi:v2.1.2
args: args:
- "--type=liveness" - "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"

2
scripts/minikube.sh
View File

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