@leverege/build-tools 2.23.0 → 2.23.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/helmup +7 -5
- package/src/system-charts/traefik.hup +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@leverege/build-tools",
|
|
3
|
-
"version": "2.23.
|
|
3
|
+
"version": "2.23.2",
|
|
4
4
|
"description": "A collection of build / support tools for Leverege developers",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"repository": {
|
|
@@ -71,6 +71,6 @@
|
|
|
71
71
|
"@babel/core": "^7.20.12",
|
|
72
72
|
"@leverege/babel-preset-leverege-node": "^2.0.0",
|
|
73
73
|
"@leverege/eslint-config-leverege": "^3.0.1",
|
|
74
|
-
"npm": "^9.
|
|
74
|
+
"npm": "^9.3.0"
|
|
75
75
|
}
|
|
76
76
|
}
|
package/src/helmup
CHANGED
|
@@ -7,9 +7,6 @@
|
|
|
7
7
|
|
|
8
8
|
SHELMUP_ARGS=("$*")
|
|
9
9
|
|
|
10
|
-
# The project id is used in a lot of places so just set it here
|
|
11
|
-
GCP_PROJECT_ID="$(getProjectIdFromK8sContext)"
|
|
12
|
-
|
|
13
10
|
# removed geotile-server from standard platform 3/20/22 - low usage
|
|
14
11
|
PLATFORM=(
|
|
15
12
|
authz-server
|
|
@@ -487,8 +484,11 @@ function installVelero() {
|
|
|
487
484
|
|
|
488
485
|
gcloud config set project $GCP_PROJECT_ID
|
|
489
486
|
|
|
487
|
+
## The major chart version will determine the bucket suffix
|
|
488
|
+
[ -z "$VELERO_HELM_CHART" ] && VELERO_HELM_CHART="3"
|
|
489
|
+
|
|
490
490
|
## Create a bucket
|
|
491
|
-
BUCKET="$GCP_PROJECT_ID-velero"
|
|
491
|
+
BUCKET="$GCP_PROJECT_ID-velero-$VELERO_HELM_CHART"
|
|
492
492
|
GCE_REGION=`overwhelm -k GCE_REGION`
|
|
493
493
|
printf "\nCreating storage bucket `color g $BUCKET` in `color g $GCE_REGION`\n"
|
|
494
494
|
gsutil mb -l $GCE_REGION gs://$BUCKET/ &> /dev/null
|
|
@@ -582,7 +582,6 @@ function installVelero() {
|
|
|
582
582
|
## Helpful debugging link => https://github.com/vmware-tanzu/helm-charts/issues/351
|
|
583
583
|
addHelmRepo vmware-tanzu https://vmware-tanzu.github.io/helm-charts
|
|
584
584
|
## Build velero command
|
|
585
|
-
[ -z "$VELERO_HELM_CHART" ] && VELERO_HELM_CHART="3"
|
|
586
585
|
helm upgrade --install velero vmware-tanzu/velero \
|
|
587
586
|
--version "$VELERO_HELM_CHART" \
|
|
588
587
|
--namespace "velero" \
|
|
@@ -879,5 +878,8 @@ K8S_UTILS="${GITTOP}/k8s-utils"
|
|
|
879
878
|
overwhelm
|
|
880
879
|
[ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1
|
|
881
880
|
|
|
881
|
+
# The project id is used in a lot of places so just set it here
|
|
882
|
+
GCP_PROJECT_ID="$(getProjectIdFromK8sContext)"
|
|
883
|
+
|
|
882
884
|
doInstall $@
|
|
883
885
|
cd - &> /dev/null
|
|
@@ -10,7 +10,7 @@ addHelmRepo traefik https://helm.traefik.io/traefik
|
|
|
10
10
|
|
|
11
11
|
[ -z "$TRAEFIK_HELM_CHART" ] && TRAEFIK_HELM_CHART="16"
|
|
12
12
|
helm upgrade --install traefik traefik/traefik \
|
|
13
|
-
--namespace
|
|
13
|
+
--namespace $TRAEFIK_NAMESPACE \
|
|
14
14
|
--values traefik/traefik-local.yaml \
|
|
15
15
|
--version $TRAEFIK_HELM_CHART $HELM_WHAT
|
|
16
16
|
|