From 41e4dbe509dd9c3f45e97be756e1c20e2d9916c8 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 25 Feb 2021 09:19:52 +0100 Subject: [PATCH] deploy: use "devel" branch instead of "master" Signed-off-by: Niels de Vos --- charts/ceph-csi-cephfs/Chart.yaml | 4 ++-- charts/ceph-csi-cephfs/templates/NOTES.txt | 2 +- charts/ceph-csi-cephfs/values.yaml | 2 +- charts/ceph-csi-rbd/Chart.yaml | 4 ++-- charts/ceph-csi-rbd/templates/NOTES.txt | 2 +- charts/ceph-csi-rbd/values.yaml | 4 ++-- deploy.sh | 16 ++++++++-------- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/charts/ceph-csi-cephfs/Chart.yaml b/charts/ceph-csi-cephfs/Chart.yaml index 7e2378c66..471f8282c 100644 --- a/charts/ceph-csi-cephfs/Chart.yaml +++ b/charts/ceph-csi-cephfs/Chart.yaml @@ -11,5 +11,5 @@ keywords: - ceph-csi home: https://github.com/ceph/ceph-csi sources: - - https://github.com/ceph/ceph-csi/tree/master/charts/ceph-csi-cephfs -icon: https://raw.githubusercontent.com/ceph/ceph-csi/master/assets/ceph-logo.png + - https://github.com/ceph/ceph-csi/tree/devel/charts/ceph-csi-cephfs +icon: https://raw.githubusercontent.com/ceph/ceph-csi/devel/assets/ceph-logo.png diff --git a/charts/ceph-csi-cephfs/templates/NOTES.txt b/charts/ceph-csi-cephfs/templates/NOTES.txt index c603c5741..c0c8c552b 100644 --- a/charts/ceph-csi-cephfs/templates/NOTES.txt +++ b/charts/ceph-csi-cephfs/templates/NOTES.txt @@ -1,2 +1,2 @@ Examples on how to configure a storage class and start using the driver are here: -https://github.com/ceph/ceph-csi/tree/master/examples/cephfs +https://github.com/ceph/ceph-csi/tree/devel/examples/cephfs diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index dd0198042..c020db497 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -18,7 +18,7 @@ serviceAccounts: name: # Configuration for the CSI to connect to the cluster -# Ref: https://github.com/ceph/ceph-csi/blob/master/examples/README.md +# Ref: https://github.com/ceph/ceph-csi/blob/devel/examples/README.md # Example: # csiConfig: # - clusterID: "" diff --git a/charts/ceph-csi-rbd/Chart.yaml b/charts/ceph-csi-rbd/Chart.yaml index 1e92dbf52..0cf1493bb 100644 --- a/charts/ceph-csi-rbd/Chart.yaml +++ b/charts/ceph-csi-rbd/Chart.yaml @@ -11,5 +11,5 @@ keywords: - ceph-csi home: https://github.com/ceph/ceph-csi sources: - - https://github.com/ceph/ceph-csi/tree/master/charts/ceph-csi-rbd -icon: https://raw.githubusercontent.com/ceph/ceph-csi/master/assets/ceph-logo.png + - https://github.com/ceph/ceph-csi/tree/devel/charts/ceph-csi-rbd +icon: https://raw.githubusercontent.com/ceph/ceph-csi/devel/assets/ceph-logo.png diff --git a/charts/ceph-csi-rbd/templates/NOTES.txt b/charts/ceph-csi-rbd/templates/NOTES.txt index b067d95eb..47e90f707 100644 --- a/charts/ceph-csi-rbd/templates/NOTES.txt +++ b/charts/ceph-csi-rbd/templates/NOTES.txt @@ -1,2 +1,2 @@ Examples on how to configure a storage class and start using the driver are here: -https://github.com/ceph/ceph-csi/tree/master/examples/rbd +https://github.com/ceph/ceph-csi/tree/devel/examples/rbd diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 2860c746f..7e5a48c5c 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -18,7 +18,7 @@ serviceAccounts: name: # Configuration for the CSI to connect to the cluster -# Ref: https://github.com/ceph/ceph-csi/blob/master/examples/README.md +# Ref: https://github.com/ceph/ceph-csi/blob/devel/examples/README.md # Example: # csiConfig: # - clusterID: "" @@ -28,7 +28,7 @@ serviceAccounts: csiConfig: [] # Configuration for the encryption KMS -# Ref: https://github.com/ceph/ceph-csi/blob/master/docs/deploy-rbd.md +# Ref: https://github.com/ceph/ceph-csi/blob/devel/docs/deploy-rbd.md # Example: # encryptionKMSConfig: # vault-unique-id-1: diff --git a/deploy.sh b/deploy.sh index d0a4eb220..01d318aba 100755 --- a/deploy.sh +++ b/deploy.sh @@ -9,18 +9,18 @@ push_helm_charts() { CHARTDIR=$2 VERSION=${CSI_IMAGE_VERSION//v/} # Set version (without v prefix) - # update information in Chart.yaml if the branch is not master - if [ "$TRAVIS_BRANCH" != "master" ]; then + # update information in Chart.yaml if the branch is not devel + if [ "$TRAVIS_BRANCH" != "devel" ]; then # Replace appVersion: canary and version: *-canary with the actual version sed -i "s/\(\s.*canary\)/ $VERSION/" "charts/ceph-csi-$PACKAGE/Chart.yaml" if [[ "$VERSION" == *"canary"* ]]; then - # Replace master with the version branch - sed -i "s/master/$TRAVIS_BRANCH/" "charts/ceph-csi-$PACKAGE/Chart.yaml" + # Replace devel with the version branch + sed -i "s/devel/$TRAVIS_BRANCH/" "charts/ceph-csi-$PACKAGE/Chart.yaml" else - # This is not a canary release, replace master with the tagged branch - sed -i "s/master/v$VERSION/" "charts/ceph-csi-$PACKAGE/templates/NOTES.txt" - sed -i "s/master/v$VERSION/" "charts/ceph-csi-$PACKAGE/Chart.yaml" + # This is not a canary release, replace devel with the tagged branch + sed -i "s/devel/v$VERSION/" "charts/ceph-csi-$PACKAGE/templates/NOTES.txt" + sed -i "s/devel/v$VERSION/" "charts/ceph-csi-$PACKAGE/Chart.yaml" fi fi @@ -83,7 +83,7 @@ build_push_images() { make push-manifest } -if [ "${TRAVIS_BRANCH}" != 'master' ]; then +if [ "${TRAVIS_BRANCH}" != 'devel' ]; then echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting" exit 0 # Exiting 0 so that this isn't marked as failing fi