mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-12-18 02:50:30 +00:00
deploy: use "devel" branch instead of "master"
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
parent
253858c104
commit
41e4dbe509
@ -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
|
||||
|
@ -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
|
||||
|
@ -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: "<cluster-id>"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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: "<cluster-id>"
|
||||
@ -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:
|
||||
|
16
deploy.sh
16
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
|
||||
|
Loading…
Reference in New Issue
Block a user