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

deploy: use "devel" branch instead of "master"

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2021-02-25 09:19:52 +01:00 committed by Madhu Rajanna
parent 253858c104
commit 41e4dbe509
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,5 +11,5 @@ keywords:
- ceph-csi - ceph-csi
home: https://github.com/ceph/ceph-csi home: https://github.com/ceph/ceph-csi
sources: sources:
- https://github.com/ceph/ceph-csi/tree/master/charts/ceph-csi-cephfs - https://github.com/ceph/ceph-csi/tree/devel/charts/ceph-csi-cephfs
icon: https://raw.githubusercontent.com/ceph/ceph-csi/master/assets/ceph-logo.png icon: https://raw.githubusercontent.com/ceph/ceph-csi/devel/assets/ceph-logo.png

2
charts/ceph-csi-cephfs/templates/NOTES.txt
View File

@ -1,2 +1,2 @@
Examples on how to configure a storage class and start using the driver are here: 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

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

@ -18,7 +18,7 @@ serviceAccounts:
name: name:
# Configuration for the CSI to connect to the cluster # 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: # Example:
# csiConfig: # csiConfig:
# - clusterID: "<cluster-id>" # - clusterID: "<cluster-id>"

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

@ -11,5 +11,5 @@ keywords:
- ceph-csi - ceph-csi
home: https://github.com/ceph/ceph-csi home: https://github.com/ceph/ceph-csi
sources: sources:
- https://github.com/ceph/ceph-csi/tree/master/charts/ceph-csi-rbd - https://github.com/ceph/ceph-csi/tree/devel/charts/ceph-csi-rbd
icon: https://raw.githubusercontent.com/ceph/ceph-csi/master/assets/ceph-logo.png icon: https://raw.githubusercontent.com/ceph/ceph-csi/devel/assets/ceph-logo.png

2
charts/ceph-csi-rbd/templates/NOTES.txt
View File

@ -1,2 +1,2 @@
Examples on how to configure a storage class and start using the driver are here: 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

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

@ -18,7 +18,7 @@ serviceAccounts:
name: name:
# Configuration for the CSI to connect to the cluster # 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: # Example:
# csiConfig: # csiConfig:
# - clusterID: "<cluster-id>" # - clusterID: "<cluster-id>"
@ -28,7 +28,7 @@ serviceAccounts:
csiConfig: [] csiConfig: []
# Configuration for the encryption KMS # 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: # Example:
# encryptionKMSConfig: # encryptionKMSConfig:
# vault-unique-id-1: # vault-unique-id-1:

16
deploy.sh
View File

@ -9,18 +9,18 @@ push_helm_charts() {
CHARTDIR=$2 CHARTDIR=$2
VERSION=${CSI_IMAGE_VERSION//v/} # Set version (without v prefix) VERSION=${CSI_IMAGE_VERSION//v/} # Set version (without v prefix)
# update information in Chart.yaml if the branch is not master # update information in Chart.yaml if the branch is not devel
if [ "$TRAVIS_BRANCH" != "master" ]; then if [ "$TRAVIS_BRANCH" != "devel" ]; then
# Replace appVersion: canary and version: *-canary with the actual version # Replace appVersion: canary and version: *-canary with the actual version
sed -i "s/\(\s.*canary\)/ $VERSION/" "charts/ceph-csi-$PACKAGE/Chart.yaml" sed -i "s/\(\s.*canary\)/ $VERSION/" "charts/ceph-csi-$PACKAGE/Chart.yaml"
if [[ "$VERSION" == *"canary"* ]]; then if [[ "$VERSION" == *"canary"* ]]; then
# Replace master with the version branch # Replace devel with the version branch
sed -i "s/master/$TRAVIS_BRANCH/" "charts/ceph-csi-$PACKAGE/Chart.yaml" sed -i "s/devel/$TRAVIS_BRANCH/" "charts/ceph-csi-$PACKAGE/Chart.yaml"
else else
# This is not a canary release, replace master with the tagged branch # This is not a canary release, replace devel with the tagged branch
sed -i "s/master/v$VERSION/" "charts/ceph-csi-$PACKAGE/templates/NOTES.txt" sed -i "s/devel/v$VERSION/" "charts/ceph-csi-$PACKAGE/templates/NOTES.txt"
sed -i "s/master/v$VERSION/" "charts/ceph-csi-$PACKAGE/Chart.yaml" sed -i "s/devel/v$VERSION/" "charts/ceph-csi-$PACKAGE/Chart.yaml"
fi fi
fi fi
@ -83,7 +83,7 @@ build_push_images() {
make push-manifest make push-manifest
} }
if [ "${TRAVIS_BRANCH}" != 'master' ]; then if [ "${TRAVIS_BRANCH}" != 'devel' ]; then
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
fi fi