@leverege/build-tools 2.23.1 → 2.23.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.23.1",
+  "version": "2.23.2",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -71,6 +71,6 @@
     "@babel/core": "^7.20.12",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^9.2.0"
+    "npm": "^9.3.0"
   }
 }

package/src/helmup

@@ -7,9 +7,6 @@
 
 SHELMUP_ARGS=("$*")
 
-# The project id is used in a lot of places so just set it here
-GCP_PROJECT_ID="$(getProjectIdFromK8sContext)"
-
 # removed geotile-server from standard platform 3/20/22 - low usage
 PLATFORM=(
   authz-server
@@ -487,8 +484,11 @@ function installVelero() {
 
   gcloud config set project $GCP_PROJECT_ID
 
+  ## The major chart version will determine the bucket suffix
+  [ -z "$VELERO_HELM_CHART" ] && VELERO_HELM_CHART="3"
+
   ## Create a bucket
-  BUCKET="$GCP_PROJECT_ID-velero"
+  BUCKET="$GCP_PROJECT_ID-velero-$VELERO_HELM_CHART"
   GCE_REGION=`overwhelm -k GCE_REGION`
   printf "\nCreating storage bucket `color g $BUCKET` in `color g $GCE_REGION`\n"
   gsutil mb -l $GCE_REGION gs://$BUCKET/ &> /dev/null
@@ -582,7 +582,6 @@ function installVelero() {
   ## Helpful debugging link    => https://github.com/vmware-tanzu/helm-charts/issues/351
   addHelmRepo vmware-tanzu https://vmware-tanzu.github.io/helm-charts
   ## Build velero command
-  [ -z "$VELERO_HELM_CHART" ] && VELERO_HELM_CHART="3"
   helm upgrade --install velero vmware-tanzu/velero \
     --version "$VELERO_HELM_CHART" \
     --namespace "velero" \
@@ -879,5 +878,8 @@ K8S_UTILS="${GITTOP}/k8s-utils"
 overwhelm
 [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1
 
+# The project id is used in a lot of places so just set it here
+GCP_PROJECT_ID="$(getProjectIdFromK8sContext)"
+
 doInstall $@
 cd - &> /dev/null