@leverege/build-tools 2.23.1 → 2.23.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.23.1",
+  "version": "2.23.3",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -57,7 +57,7 @@
     "dotenv": "^16.0.3",
     "enquirer": "^2.3.6",
     "execa": "^5.1.1",
-    "glob": "^8.0.3",
+    "glob": "^8.1.0",
     "js-yaml": "^4.1.0",
     "npm-registry-fetch": "^13.3.1",
     "parse-gitignore": "^2.0.0",
@@ -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
@@ -36,7 +33,7 @@ SYSTEM=(
   preemptible-killer
   zombie-killer
   reloader
-  cert-manager # deprecated
+# cert-manager # deprecated from SYSTEM 01/13/2023
   traefik
   velero
   monitoring # do monitoring last to show password
@@ -140,17 +137,6 @@ function bootstrapLocalSetup() {
   ifPluggedIn $SERVICE
 }
 
-function installGrafana() {
-  ## Install Grafana
-  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
-  removeHelmRepo grafana
-}
-
 function errorIfMissingSecret() {
   SECRET="$1"
   kubectl get secret $SECRET &> /dev/null
@@ -481,14 +467,17 @@ NEED_TRAEFIK_SECRET
   fi
 }
 
-function installVelero() {
+function installVeleroEnvironment() {
   # Follows instructions => https://github.com/vmware-tanzu/velero-plugin-for-gcp
   showInstalling "Velero Backup Management"
 
   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
@@ -576,64 +565,6 @@ function installVelero() {
 
   ## Clean up from previous failed install
   kubectl delete volumesnapshotlocation.velero.io -n velero gcp &>/dev/null
-
-  ## Install velero chart      => https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero/values.yaml
-  ## The velero plugin for GCP => https://github.com/vmware-tanzu/velero-plugin-for-gcp
-  ## 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" \
-    --set credentials.useSecret="false" \
-    --set configuration.provider="gcp" \
-    --set configuration.backupStorageLocation.name="default" \
-    --set configuration.backupStorageLocation.bucket="${BUCKET}" \
-    --set configuration.backupStorageLocation.config.serviceAccount="$SERVICE_ACCOUNT_EMAIL" \
-    --set serviceAccount.server.create="false" \
-    --set serviceAccount.server.name="velero" \
-    --set snapshotsEnabled="true" \
-    --set configuration.volumeSnapshotLocation.name="default" \
-    --set configuration.volumeSnapshotLocation.config.snapshotLocation="$GCE_REGION" \
-    --set "initContainers[0].name"="velero-plugin-for-gcp" \
-    --set "initContainers[0].image"="velero/velero-plugin-for-gcp:v1.5.0" \
-    --set "initContainers[0].volumeMounts[0].mountPath"="/target" \
-    --set "initContainers[0].volumeMounts[0].name"="plugins" \
-    --set schedules.postgresql.schedule="0 2 * * *" \
-    --set schedules.postgresql.template.ttl="720h" \
-    --set schedules.postgresql.template.labelSelector.matchLabels.release="postgres" \
-    --set schedules.postgresql.template.labelSelector.matchLabels.app="postgresql" \
-    --set schedules.postgresql.template.snapshotVolumes="true" \
-    --set schedules.timescale.schedule="0 3 * * *" \
-    --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.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'`
-
-  Wait at least 1 minute before kicking off the following backups:
-
-    `color g 'velero backup create --from-schedule velero-postgresql'`
-    `color g 'velero backup create --from-schedule velero-timescale'`
-
-  This will create initial backups from the defined schedules which should
-  avoid alerts from prometheus about backups failing on new installations.
-
-  The status of the backups may be checked by running:
-
-    `color g 'overwhelm && velero get backups'`
-
-DONE_VELERO
-  removeHelmRepo vmware-tanzu
 }
 
 # If a helmup.plugin file exists and is executable helmup assumes it is
@@ -806,7 +737,8 @@ function doInstall() {
         ;;
 
       "velero")
-        installVelero # because it's a little more involved
+        installVeleroEnvironment
+        bootstrapLocalSetup velero
         ;;
 
       *)
@@ -879,5 +811,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

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

@@ -0,0 +1,105 @@
+# Backup schedules to create.
+#
+schedules:
+  postgresql:
+    disabled: false
+    schedule: "0 2 * * *"
+    template:
+      ttl: "720h"
+      snapshotVolumes: true
+      labelSelector:
+        matchLabels:
+          release: "postgres"
+          app: "postgresql"
+
+  timescale:
+    disabled: false
+    schedule: "0 3 * * *"
+    template:
+      ttl: "720h"
+      snapshotVolumes: true
+      labelSelector:
+        matchLabels:
+          release: "timescale-db"
+          app: "postgresql"
+
+  redis:
+    disabled: true
+    schedule: "*/30 * * * *"
+    template:
+      ttl: "24h"
+      snapshotVolumes: true
+      labelSelector:
+        matchLabels:
+          name: "redis"
+##
+## End of Schedules Section
+##
+
+# Resource requests/limits to specify for the Velero deployment.
+# https://velero.io/docs/v1.6/customize-installation/#customize-resource-requests-and-limits
+resources:
+  requests:
+    cpu: 250m
+    memory: 128Mi
+  limits:
+    cpu: 300m
+    memory: 256Mi
+
+# Annotations to add to the Velero deployment's. Optional.
+#
+# If you are using reloader use the following annotation with your VELERO_SECRET_NAME
+annotations: {}
+# secret.reloader.stakater.com/reload: "<VELERO_SECRET_NAME>"
+
+# Labels to add to the Velero deployment's. Optional.
+labels: {}
+
+# Additional pod labels for Velero deployment's template. Optional
+# ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+podLabels: {}
+
+# Tolerations to use for the Velero deployment. Optional.
+tolerations: []
+
+# Affinity to use for the Velero deployment. Optional.
+affinity: {}
+
+# Node selector to use for the Velero deployment. Optional.
+nodeSelector: {}
+
+# Init containers to add to the Velero deployment's pod spec. At least one plugin provider image is required.
+# If the value is a string then it is evaluated as a template.
+initContainers:
+  - name: velero-plugin-for-gcp
+    image: velero/velero-plugin-for-gcp:v1.5.0
+    volumeMounts:
+      - mountPath: /target
+        name: plugins
+
+##
+## Parameters for the `default` BackupStorageLocation and VolumeSnapshotLocation,
+## and additional server settings.
+##
+configuration:
+  # Cloud provider being used (e.g. aws, azure, gcp).
+  provider: gcp
+
+  # Parameters for the `default` VolumeSnapshotLocation. See
+  # https://velero.io/docs/v1.6/api-types/volumesnapshotlocation/
+  volumeSnapshotLocation:
+    name: default
+
+# Information about the Kubernetes service account Velero uses. The SA is
+# created and bound the first time helmup deploys the service. No need to
+# recreate with each deployment.
+serviceAccount:
+  server:
+    create: false
+    name: velero
+
+# Info about the secret to be used by the Velero deployment, which
+# should contain credentials for the cloud provider IAM account you've
+# set up for Velero.
+credentials:
+  useSecret: false

package/src/system-charts/velero.hup

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+addHelmRepo vmware-tanzu https://vmware-tanzu.github.io/helm-charts
+
+[ -z "$VELERO_HELM_CHART" ] && VELERO_HELM_CHART="3"
+#
+# Build the bucket, region and SA email variables and use --set to mod the
+# chart values as opposed to using an OVH:<label> approach. This eliminates
+# the need for an overwhelm generated values.yaml file which also contains
+# all of the contamination from the default-values.yaml file.
+#
+# Note: GCP_PROJECT_ID is passed down from helmup's environment.
+#
+GCE_BUCKET="$GCP_PROJECT_ID-velero-$VELERO_HELM_CHART"
+GCE_REGION=`overwhelm -k GCE_REGION`
+GCE_SA_EMAIL="velero@${GCP_PROJECT_ID}.iam.gserviceaccount.com"
+
+helm upgrade \
+     --install velero vmware-tanzu/velero --namespace velero \
+     --values velero/velero-local.yaml \
+     --version $VELERO_HELM_CHART $HELM_WHAT \
+     --set configuration.backupStorageLocation.bucket="$GCE_BUCKET" \
+     --set configuration.backupStorageLocation.config.serviceAccount="$SA_EMAIL" \
+     --set configuration.volumeSnapshotLocation.config.snapshotLocation="$GCE_REGION"
+
+velero schedule get
+cat<<DONE_VELERO
+
+  Velero docs => `color g 'open https://velero.io/docs'`
+
+  Wait at least 1 minute before kicking off the following backups:
+
+  `color g 'velero backup create --from-schedule velero-postgresql'`
+  `color g 'velero backup create --from-schedule velero-timescale'`
+
+  This will create initial backups from the defined schedules which should
+  avoid alerts from prometheus about backups failing on new installations.
+
+  The status of the backups may be checked by running:
+
+  `color g 'overwhelm && velero get backups'`
+
+DONE_VELERO
+
+removeHelmRepo vmware-tanzu