mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-09 16:00:22 +00:00
Revert back the changes made for v2.0.1 release
Reverting back the changes done for v2.0.1 as release is out and we dont want to update the released image again. Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
parent
be6318716e
commit
79f1fa2b67
2
Makefile
2
Makefile
@ -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.0.1)
|
CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v2.0-canary)
|
||||||
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))
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
appVersion: v2.0.1
|
appVersion: v2.0-canary
|
||||||
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.0.1-canary
|
version: 2.0-canary
|
||||||
keywords:
|
keywords:
|
||||||
- ceph
|
- ceph
|
||||||
- cephfs
|
- cephfs
|
||||||
|
@ -104,7 +104,7 @@ nodeplugin:
|
|||||||
plugin:
|
plugin:
|
||||||
image:
|
image:
|
||||||
repository: quay.io/cephcsi/cephcsi
|
repository: quay.io/cephcsi/cephcsi
|
||||||
tag: v2.0.1
|
tag: v2.0-canary
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
resources: {}
|
resources: {}
|
||||||
|
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
appVersion: v2.0.1
|
appVersion: v2.0-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: 2.0.1-canary
|
version: 2.0-canary
|
||||||
keywords:
|
keywords:
|
||||||
- ceph
|
- ceph
|
||||||
- rbd
|
- rbd
|
||||||
|
@ -104,7 +104,7 @@ nodeplugin:
|
|||||||
plugin:
|
plugin:
|
||||||
image:
|
image:
|
||||||
repository: quay.io/cephcsi/cephcsi
|
repository: quay.io/cephcsi/cephcsi
|
||||||
tag: v2.0.1
|
tag: v2.0-canary
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
resources: {}
|
resources: {}
|
||||||
|
|
||||||
|
@ -71,7 +71,7 @@ build_push_images() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if [ "${TRAVIS_BRANCH}" == 'release-v2.0' ]; then
|
if [ "${TRAVIS_BRANCH}" == 'release-v2.0' ]; then
|
||||||
export ENV_CSI_IMAGE_VERSION='v2.0.1'
|
export ENV_CSI_IMAGE_VERSION='v2.0-canary'
|
||||||
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
|
||||||
|
@ -84,7 +84,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.0.1
|
image: quay.io/cephcsi/cephcsi:v2.0-canary
|
||||||
args:
|
args:
|
||||||
- "--nodeid=$(NODE_ID)"
|
- "--nodeid=$(NODE_ID)"
|
||||||
- "--type=cephfs"
|
- "--type=cephfs"
|
||||||
@ -128,7 +128,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.0.1
|
image: quay.io/cephcsi/cephcsi:v2.0-canary
|
||||||
args:
|
args:
|
||||||
- "--type=liveness"
|
- "--type=liveness"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
@ -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.0.1
|
image: quay.io/cephcsi/cephcsi:v2.0-canary
|
||||||
args:
|
args:
|
||||||
- "--nodeid=$(NODE_ID)"
|
- "--nodeid=$(NODE_ID)"
|
||||||
- "--type=cephfs"
|
- "--type=cephfs"
|
||||||
@ -110,7 +110,7 @@ spec:
|
|||||||
- name: liveness-prometheus
|
- name: liveness-prometheus
|
||||||
securityContext:
|
securityContext:
|
||||||
privileged: true
|
privileged: true
|
||||||
image: quay.io/cephcsi/cephcsi:v2.0.1
|
image: quay.io/cephcsi/cephcsi:v2.0-canary
|
||||||
args:
|
args:
|
||||||
- "--type=liveness"
|
- "--type=liveness"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
@ -104,7 +104,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.0.1
|
image: quay.io/cephcsi/cephcsi:v2.0-canary
|
||||||
args:
|
args:
|
||||||
- "--nodeid=$(NODE_ID)"
|
- "--nodeid=$(NODE_ID)"
|
||||||
- "--type=rbd"
|
- "--type=rbd"
|
||||||
@ -143,7 +143,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.0.1
|
image: quay.io/cephcsi/cephcsi:v2.0-canary
|
||||||
args:
|
args:
|
||||||
- "--type=liveness"
|
- "--type=liveness"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
@ -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.0.1
|
image: quay.io/cephcsi/cephcsi:v2.0-canary
|
||||||
args:
|
args:
|
||||||
- "--nodeid=$(NODE_ID)"
|
- "--nodeid=$(NODE_ID)"
|
||||||
- "--type=rbd"
|
- "--type=rbd"
|
||||||
@ -107,7 +107,7 @@ spec:
|
|||||||
- name: liveness-prometheus
|
- name: liveness-prometheus
|
||||||
securityContext:
|
securityContext:
|
||||||
privileged: true
|
privileged: true
|
||||||
image: quay.io/cephcsi/cephcsi:v2.0.1
|
image: quay.io/cephcsi/cephcsi:v2.0-canary
|
||||||
args:
|
args:
|
||||||
- "--type=liveness"
|
- "--type=liveness"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
@ -129,7 +129,7 @@ teardown-rook)
|
|||||||
;;
|
;;
|
||||||
cephcsi)
|
cephcsi)
|
||||||
echo "copying the cephcsi image"
|
echo "copying the cephcsi image"
|
||||||
copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0.1 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0.1
|
copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0-canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0-canary
|
||||||
;;
|
;;
|
||||||
k8s-sidecar)
|
k8s-sidecar)
|
||||||
echo "copying the kubernetes sidecar images"
|
echo "copying the kubernetes sidecar images"
|
||||||
|
Loading…
Reference in New Issue
Block a user