mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-09 16:00:22 +00:00
Prepare for release v1.2.2
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
parent
fa32e1022b
commit
f8c854dc7d
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),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))
|
$(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION))
|
||||||
|
|
||||||
|
@ -87,6 +87,7 @@ in the Kubernetes documentation.
|
|||||||
| Ceph CSI Release/Branch | Container image name | Image Tag |
|
| Ceph CSI Release/Branch | Container image name | Image Tag |
|
||||||
| ----------------------- | ---------------------------- | --------- |
|
| ----------------------- | ---------------------------- | --------- |
|
||||||
| Master (Branch) | quay.io/cephcsi/cephcsi | canary |
|
| 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.1 (Release) | quay.io/cephcsi/cephcsi | v1.2.1 |
|
||||||
| v1.2.0 (Release) | quay.io/cephcsi/cephcsi | v1.2.0 |
|
| v1.2.0 (Release) | quay.io/cephcsi/cephcsi | v1.2.0 |
|
||||||
| v1.1.0 (Release) | quay.io/cephcsi/cephcsi | v1.1.0 |
|
| v1.1.0 (Release) | quay.io/cephcsi/cephcsi | v1.1.0 |
|
||||||
|
@ -102,7 +102,7 @@ nodeplugin:
|
|||||||
plugin:
|
plugin:
|
||||||
image:
|
image:
|
||||||
repository: quay.io/cephcsi/cephcsi
|
repository: quay.io/cephcsi/cephcsi
|
||||||
tag: canary
|
tag: v1.2.2
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
resources: {}
|
resources: {}
|
||||||
|
|
||||||
|
@ -102,7 +102,7 @@ nodeplugin:
|
|||||||
plugin:
|
plugin:
|
||||||
image:
|
image:
|
||||||
repository: quay.io/cephcsi/cephcsi
|
repository: quay.io/cephcsi/cephcsi
|
||||||
tag: canary
|
tag: v1.2.2
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
resources: {}
|
resources: {}
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ push_helm_charts() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if [ "${TRAVIS_BRANCH}" == 'release-v1.2.0' ]; then
|
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
|
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
|
||||||
|
@ -68,7 +68,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--nodeid=$(NODE_ID)"
|
- "--nodeid=$(NODE_ID)"
|
||||||
- "--type=cephfs"
|
- "--type=cephfs"
|
||||||
@ -112,7 +112,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--type=liveness"
|
- "--type=liveness"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
@ -49,7 +49,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--nodeid=$(NODE_ID)"
|
- "--nodeid=$(NODE_ID)"
|
||||||
- "--type=cephfs"
|
- "--type=cephfs"
|
||||||
@ -102,7 +102,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--type=liveness"
|
- "--type=liveness"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
@ -71,7 +71,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--nodeid=$(NODE_ID)"
|
- "--nodeid=$(NODE_ID)"
|
||||||
- "--type=cephfs"
|
- "--type=cephfs"
|
||||||
@ -115,7 +115,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--type=liveness"
|
- "--type=liveness"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
@ -49,7 +49,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--nodeid=$(NODE_ID)"
|
- "--nodeid=$(NODE_ID)"
|
||||||
- "--type=cephfs"
|
- "--type=cephfs"
|
||||||
@ -101,7 +101,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--type=liveness"
|
- "--type=liveness"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
@ -87,7 +87,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--nodeid=$(NODE_ID)"
|
- "--nodeid=$(NODE_ID)"
|
||||||
- "--type=rbd"
|
- "--type=rbd"
|
||||||
@ -126,7 +126,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--type=liveness"
|
- "--type=liveness"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
@ -52,7 +52,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--nodeid=$(NODE_ID)"
|
- "--nodeid=$(NODE_ID)"
|
||||||
- "--type=rbd"
|
- "--type=rbd"
|
||||||
@ -96,7 +96,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--type=liveness"
|
- "--type=liveness"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
@ -91,7 +91,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--nodeid=$(NODE_ID)"
|
- "--nodeid=$(NODE_ID)"
|
||||||
- "--type=rbd"
|
- "--type=rbd"
|
||||||
@ -130,7 +130,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--type=liveness"
|
- "--type=liveness"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
@ -52,7 +52,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--nodeid=$(NODE_ID)"
|
- "--nodeid=$(NODE_ID)"
|
||||||
- "--type=rbd"
|
- "--type=rbd"
|
||||||
@ -96,7 +96,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:v1.2.1
|
image: quay.io/cephcsi/cephcsi:v1.2.2
|
||||||
args:
|
args:
|
||||||
- "--type=liveness"
|
- "--type=liveness"
|
||||||
- "--endpoint=$(CSI_ENDPOINT)"
|
- "--endpoint=$(CSI_ENDPOINT)"
|
||||||
|
@ -101,7 +101,7 @@ ssh)
|
|||||||
;;
|
;;
|
||||||
cephcsi)
|
cephcsi)
|
||||||
echo "copying the cephcsi image"
|
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)
|
k8s-sidecar)
|
||||||
echo "copying the kubernetes sidecar images"
|
echo "copying the kubernetes sidecar images"
|
||||||
|
Loading…
Reference in New Issue
Block a user