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

revert: revert back the changes for v3.1.0

Browse Source 
as the release is done this commit reverts
back the changes to build canary images
from release branch.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2020-08-13 21:55:34 +05:30 committed by Madhu Rajanna
parent 5d48473582
commit 91475c0a66
12 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
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.0)
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))

2
build.env
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.0
CSI_IMAGE_VERSION=v3.1-canary

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

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

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

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

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

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

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

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

2
deploy.sh
View File

@ -83,7 +83,7 @@ build_push_images() {
}
if [ "${TRAVIS_BRANCH}" == 'release-v3.1' ]; then
export ENV_CSI_IMAGE_VERSION='v3.1.0'
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

4
deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
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.0
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.0
image: quay.io/cephcsi/cephcsi:v3.1-canary
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

4
deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
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.0
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.0
image: quay.io/cephcsi/cephcsi:v3.1-canary
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

4
deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
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.0
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.0
image: quay.io/cephcsi/cephcsi:v3.1-canary
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

4
deploy/rbd/kubernetes/csi-rbdplugin.yaml
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.0
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.0
image: quay.io/cephcsi/cephcsi:v3.1-canary
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

2
scripts/minikube.sh
View File

@ -219,7 +219,7 @@ teardown-rook)
;;
cephcsi)
echo "copying the cephcsi image"
copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.1.0 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.1.0
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"