@leverege/build-tools 2.22.0 → 2.22.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.22.0",
+  "version": "2.22.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -67,8 +67,8 @@
     "zx": "^7.1.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.19.3",
-    "@babel/core": "^7.20.5",
+    "@babel/cli": "^7.20.7",
+    "@babel/core": "^7.20.12",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
     "npm": "^9.2.0"

package/src/bash-funcs

@@ -102,7 +102,7 @@ function addHelmRepo() {
   Adding helm repo => $(color g "$chart") from $(color g "$url")
 
 REPOADD
-  helm repo add $chart $url &> /dev/null
+  helm repo add --force-update $chart $url &> /dev/null
   helm repo update &> /dev/null
 }
 

package/src/helmup

@@ -518,8 +518,8 @@ HINTS
   removeHelmRepo jetstack
 }
 
-function installTraefik() {
-  showInstalling "Traefik Load Balancer / Router"
+function installTraefikEnvironment() {
+  showInstalling "Traefik Namespace and Cloudflare Secret"
   createNamespaceIfNeeded traefik
 
   kubectl get secret cloudflare --namespace traefik &>/dev/null
@@ -542,39 +542,6 @@ NEED_TRAEFIK_SECRET
       --namespace traefik \
       --from-literal=dns-token=$TOKEN
   fi
-
-  TRAEFIK_DIR="traefik"
-  [ ! -d "$TRAEFIK_DIR" ] && mkdir $TRAEFIK_DIR
-  TRAEFIK_HA_YAML="$TRAEFIK_DIR/traefik-ha-values.yaml"
-  if [ ! -f "$TRAEFIK_HA_YAML" ];
-  then
-    touch "$TRAEFIK_DIR/.nohelm"
-    cat<<TRAEFIK_CFG>>"$TRAEFIK_HA_YAML"
-additionalArguments:
-  - "--accesslog=true"
-  - "--accesslog.format=json"
-  - "--log.level=WARN"
-  - "--metrics.prometheus=true"
-  - "--api.dashboard=true"
-
-deployment:
-  replicas: 3
-
-#service:
-#  spec:
-#   loadBalancerIP: xx.xx.xx.xx
-TRAEFIK_CFG
-  fi
-
-  addHelmRepo traefik https://helm.traefik.io/traefik
-
-  [ -z "$TRAEFIK_HELM_CHART" ] && TRAEFIK_HELM_CHART="16"
-  helm upgrade --install traefik traefik/traefik \
-    --namespace traefik \
-    --version  $TRAEFIK_HELM_CHART \
-    --values   $TRAEFIK_HA_YAML
- 
-  removeHelmRepo traefik
 }
 
 function installVelero() {
@@ -593,8 +560,9 @@ function installVelero() {
 
   ## Create a bucket
   BUCKET="$PROJECT_ID-velero"
-  printf "\nCreating storage bucket...\n"
-  gsutil mb gs://$BUCKET/ &> /dev/null
+  GCE_REGION=`overwhelm -k GCE_REGION`
+  printf "\nCreating storage bucket in $GCE_REGION...\n"
+  gsutil mb -l $GCE_REGION gs://$BUCKET/ &> /dev/null
   warnOnError $? "Bucket failed to create or already exists - go check it\n"
 
   ## Create a service account
@@ -682,7 +650,7 @@ function installVelero() {
   ## Install velero chart   => https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero/values.yaml
   ## Helpful debugging link => https://github.com/vmware-tanzu/helm-charts/issues/351
   addHelmRepo vmware-tanzu https://vmware-tanzu.github.io/helm-charts
-  [ -z "$VELERO_HELM_CHART" ] && VELERO_HELM_CHART="2"
+  [ -z "$VELERO_HELM_CHART" ] && VELERO_HELM_CHART="3"
   helm upgrade --install velero vmware-tanzu/velero \
     --version $VELERO_HELM_CHART \
     --namespace velero \
@@ -696,7 +664,7 @@ function installVelero() {
     --set snapshotsEnabled="true" \
     --set configuration.volumeSnapshotLocation.name=default \
     --set "initContainers[0].name"="velero-plugin-for-gcp" \
-    --set "initContainers[0].image"="velero/velero-plugin-for-gcp:v1.0.0" \
+    --set "initContainers[0].image"="velero/velero-plugin-for-gcp:v1.6.0" \
     --set "initContainers[0].volumeMounts[0].mountPath"="/target" \
     --set "initContainers[0].volumeMounts[0].name"="plugins" \
     --set schedules.postgresql.schedule="0 2 * * *" \
@@ -708,13 +676,22 @@ function installVelero() {
     --set schedules.timescale.template.ttl="720h" \
     --set schedules.timescale.template.labelSelector.matchLabels.release="timescale-db" \
     --set schedules.timescale.template.labelSelector.matchLabels.app="postgresql" \
-    --set schedules.timescale.template.snapshotVolumes="true"
+    --set schedules.timescale.template.snapshotVolumes="true" \
+    --set schedules.redis.schedule="*/30 * * * *" \
+    --set schedules.redis.template.ttl="24h" \
+    --set schedules.redis.template.labelSelector.matchLabels.name="redis" \
+    --set schedules.redis.template.snapshotVolumes="true"
 
   velero get backups
   cat<<DONE_VELERO
 
   Velero docs => `color g 'open https://velero.io/docs'`
+
+  Creating initial backups from `color g 'velero-postgres'` and `color g 'velero-timescale'` schedules...
 DONE_VELERO
+  sleep 2
+  velero backup create --from-schedule velero-postgresql
+  velero backup create --from-schedule velero-timescale
   removeHelmRepo vmware-tanzu
   echo -n "npm run ahoy && velero get backups" | pbcopy
 }
@@ -737,6 +714,7 @@ PLUGIN_NOEXEC
   fi
 
   printf "\n***Executing local plugin code => `color y $PLUGIN`\n\n" && sleep 2
+  export HELM_WHAT
   . $PLUGIN # executing with . allows the plugin to use functions like color
   return 0
 }
@@ -806,7 +784,7 @@ function doInstall() {
     [ ! -z "$CHARTVER" ] && CHARTVER="--version $CHARTVER"
 
     # set the dry-run flag on what
-    [ "`basename $0`" == "helmwhat" ] && WHAT="--dry-run --debug"
+    [ "`basename $0`" == "helmwhat" ] && HELM_WHAT="--dry-run --debug"
 
     # If we're referencing a plugin then execute it and continue
     ifPluggedIn $SERVICE && continue
@@ -841,7 +819,7 @@ function doInstall() {
         ;;
 
       "grafana")
-        installGrafana
+        bootstrapLocalSetup grafana
         ;;
 
       "monitoring")
@@ -878,12 +856,13 @@ function doInstall() {
 
       transponder-*)
         # transponders use the same chart but different deployment name
-        HELMUP="helm upgrade --install $SERVICE leverege/transponder --values $SERVICE/values.yaml $CHARTVER $WHAT"
+        HELMUP="helm upgrade --install $SERVICE leverege/transponder --values $SERVICE/values.yaml $CHARTVER $HELM_WHAT"
         doHelmup "$HELMUP"
         ;;
 
       "traefik")
-        installTraefik
+        installTraefikEnvironment
+        bootstrapLocalSetup traefik
         ;;
 
       "velero")
@@ -929,7 +908,7 @@ NO_SERVICE_MAN
           MUSEUM=$(<${OVERRIDE})
           printf "\n$YELO_WARN Local chartmuseum name override from ${SERVICE} to ${MUSEUM}\n"
         fi
-        HELMUP="helm upgrade --install $SERVICE leverege/$MUSEUM -f $SERVICE/values.yaml $CHARTVER $WHAT"
+        HELMUP="helm upgrade --install $SERVICE leverege/$MUSEUM -f $SERVICE/values.yaml $CHARTVER $HELM_WHAT"
         doHelmup $HELMUP
         SAVERR=$?
         if [ $SAVERR -ne 0 ];
@@ -957,7 +936,7 @@ NOTRUNNING
 GITTOP=`git rev-parse --show-toplevel` # `&& cd $GITTOP
 K8S_UTILS="${GITTOP}/k8s-utils"
 
-overwhelm.js #XXX
+overwhelm # overwhelm.js # use overwhelm.js for local
 [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1
 
 doInstall $@

package/src/system-charts/elasticsearch.hup

@@ -13,6 +13,6 @@ addHelmRepo elastic https://helm.elastic.co
 helm upgrade --install elasticsearch elastic/elasticsearch \
   --version 7.16 \
   --values $LOCAL_ES_VALUES \
-  --set volumeClaimTemplate.storageClassName="ssd"
+  --set volumeClaimTemplate.storageClassName="ssd" $HELM_WHAT
 
 removeHelmRepo elastic

package/src/system-charts/grafana-local.yaml

@@ -0,0 +1,29 @@
+service:
+  type: "NodePort"
+  port: "9000"
+
+persistence:
+  enabled: true
+  storageClassName: ssd
+
+plugins:
+  - grafana-piechart-panel
+  - agenty-flowcharting-panel
+
+deploymentStrategy:
+  type: Recreate
+
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: target-env
+          operator: In
+          values:
+          - database
+tolerations:
+- key: "database"
+  operator: "Equal"
+  value: "true"
+  effect: "NoSchedule"

package/src/system-charts/grafana.hup

@@ -9,7 +9,9 @@ addHelmRepo grafana https://grafana.github.io/helm-charts
 [ -z "$GRAFANA_HELM_CHART" ] && GRAFANA_HELM_CHART="6"
 helm upgrade --install grafana grafana/grafana \
   --namespace monitoring \
-  --values grafana/values-grafana.yaml \
-  --version $GRAFANA_HELM_CHART
+  --values grafana/grafana-local.yaml \
+  --version $GRAFANA_HELM_CHART $HELM_WHAT
+
+helmup monitoring-wtf
 
 removeHelmRepo grafana

package/src/system-charts/postgres.hup

@@ -6,6 +6,6 @@ addBitnamiRepo
 
 helm upgrade --install postgres bitnami/postgresql  \
              --values  postgres/postgres-local.yaml \
-             --version 10
+             --version 10 $HELM_WHAT
 
 removeHelmRepo bitnami

package/src/system-charts/prometheus-local.yaml

@@ -784,3 +784,9 @@ server:
 
 pushgateway:
   enabled: false
+
+# temp set to false if upgrade errors with something like:
+#   Error: UPGRADE FAILED: cannot patch "prometheus-kube-state-metrics" ... field is immutable
+#
+kubeStateMetrics:
+  enabled: true

package/src/system-charts/prometheus.hup

@@ -10,6 +10,6 @@ addHelmRepo prometheus-community https://prometheus-community.github.io/helm-cha
 helm upgrade --install prometheus prometheus-community/prometheus \
              --namespace monitoring \
              --values prometheus/values.yaml \
-             --version $PROMETHEUS_HELM_CHART
+             --version $PROMETHEUS_HELM_CHART $HELM_WHAT
 
 removeHelmRepo prometheus-community

package/src/system-charts/redis-local.yaml

@@ -23,7 +23,7 @@ master:
     effect: "NoSchedule"
 
   persistence:
-    size: 1Gi # 8Gi is default
+    size: 8Gi # 8Gi is default
 
 replica:
   affinity:

package/src/system-charts/redis.hup

@@ -7,6 +7,6 @@ addBitnamiRepo latest
 [ -z "$REDIS_HELM_CHART" ] && REDIS_HELM_CHART="17" # latest chart 17 is redis v7
 helm upgrade --install redis bitnami/redis    \
              --values  redis/redis-local.yaml \
-             --version $REDIS_HELM_CHART
+             --version $REDIS_HELM_CHART $HELM_WHAT
 
 removeHelmRepo bitnami

package/src/system-charts/timescale-db.hup

@@ -7,4 +7,4 @@ checkTimescalePassword
 [ -z "$TIMESCALE_HELM_CHART" ] && TIMESCALE_HELM_CHART="2"
 helm upgrade --install timescale-db leverege/timescale-db   \
              --values  timescale-db/timescale-db-local.yaml \
-             --version $TIMESCALE_HELM_CHART
+             --version $TIMESCALE_HELM_CHART $HELM_WHAT

package/src/system-charts/traefik-local.yaml

@@ -0,0 +1,13 @@
+additionalArguments:
+  - "--accesslog=true"
+  - "--accesslog.format=json"
+  - "--log.level=WARN"
+  - "--metrics.prometheus=true"
+  - "--api.dashboard=true"
+
+deployment:
+  replicas: 3
+
+#service:
+#  spec:
+#   loadBalancerIP: xx.xx.xx.xx

package/src/system-charts/traefik.hup

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+showInstalling "Traefik Load Balancer / Router"
+
+addHelmRepo traefik https://helm.traefik.io/traefik
+
+[ -z "$TRAEFIK_HELM_CHART" ] && TRAEFIK_HELM_CHART="16"
+helm upgrade --install traefik traefik/traefik \
+             --namespace traefik \
+             --values  traefik/traefik-local.yaml \
+             --version $TRAEFIK_HELM_CHART $HELM_WHAT
+
+removeHelmRepo traefik