@leverege/build-tools 2.24.0 → 2.25.0

package/lib/server/unleash.js

@@ -14,9 +14,17 @@ const getCurrentBranchName = async () => {
   return Object.entries(branchInfo.branches).find(([name, info]) => info.current)[0];
 };
 const isProtected = async () => {
-  const protectedBranches = ['main', 'master', 'development', ...process.argv.slice(2)];
   const theBranch = await getCurrentBranchName();
-  return protectedBranches.includes(theBranch);
+  const protectedBranches = ['main', 'master', 'development'];
+  const additionalProtectedBranches = [...process.argv.slice(2)];
+
+  // Check if the current branch starts with any of the additional
+  // protected branch name
+  let matchesAdditionalBranch = false;
+  for (let i = 0; i < additionalProtectedBranches.length; i++) {
+    matchesAdditionalBranch = matchesAdditionalBranch || theBranch.startsWith(additionalProtectedBranches[i]);
+  }
+  return protectedBranches.includes(theBranch) || matchesAdditionalBranch;
 };
 const npmRunner = async script => {
   try {

package/lib/web/unleash.js

@@ -14,9 +14,17 @@ const getCurrentBranchName = async () => {
   return Object.entries(branchInfo.branches).find(([name, info]) => info.current)[0];
 };
 const isProtected = async () => {
-  const protectedBranches = ['main', 'master', 'development', ...process.argv.slice(2)];
   const theBranch = await getCurrentBranchName();
-  return protectedBranches.includes(theBranch);
+  const protectedBranches = ['main', 'master', 'development'];
+  const additionalProtectedBranches = [...process.argv.slice(2)];
+
+  // Check if the current branch starts with any of the additional
+  // protected branch name
+  let matchesAdditionalBranch = false;
+  for (let i = 0; i < additionalProtectedBranches.length; i++) {
+    matchesAdditionalBranch = matchesAdditionalBranch || theBranch.startsWith(additionalProtectedBranches[i]);
+  }
+  return protectedBranches.includes(theBranch) || matchesAdditionalBranch;
 };
 const npmRunner = async script => {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -13,7 +13,7 @@
     "compile": "npm run clean && npm run compile_server && npm run compile_web",
     "compile_server": "NODE_ENV=server babel -d lib/server src/",
     "compile_web": "NODE_ENV=web babel -d lib/web src/",
-    "postinstall": "src/npm-scripts/postinstall.js",
+    "xpostinstall": "src/npm-scripts/postinstall.js",
     "prepublintOnly": "npm run lint && npm run build",
     "prepublishOnly": "npm run compile",
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -32,6 +32,8 @@
     "helmup": "src/helmup",
     "helmwhat": "src/helmup",
     "k8scale": "src/k8scale",
+    "k8cryo": "src/k8cryo",
+    "k8thaw": "src/k8thaw",
     "k8x": "src/k8x",
     "klog": "src/klog",
     "npm-link": "src/npm-link",
@@ -53,7 +55,7 @@
     "chalk": "^4.1.2",
     "command-line-args": "^5.2.1",
     "command-line-usage": "^6.1.3",
-    "deepmerge": "^4.2.2",
+    "deepmerge": "^4.3.0",
     "dotenv": "^16.0.3",
     "enquirer": "^2.3.6",
     "execa": "^5.1.1",
@@ -71,6 +73,6 @@
     "@babel/core": "^7.20.12",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^9.4.0"
+    "npm": "^9.4.1"
   }
 }

package/src/helmdn

@@ -54,6 +54,7 @@ PLATFORM=(
   transponder-postgres
   transponder-tsdb
   transponder-rt
+  pubsub-pulse
 )
 
 SYSTEM=(

package/src/helmup

@@ -470,6 +470,7 @@ NEED_TRAEFIK_SECRET
 function installVeleroEnvironment() {
   # Follows instructions => https://github.com/vmware-tanzu/velero-plugin-for-gcp
   showInstalling "Velero Backup Management"
+  createNamespaceIfNeeded velero
 
   gcloud config set project $GCP_PROJECT_ID
 
@@ -548,10 +549,6 @@ function installVeleroEnvironment() {
       $SERVICE_ACCOUNT_EMAIL
   warnOnError $? "gcloud workload identity binding may have failed"
 
-  ## Create velero namespace
-  kubectl get namespaces velero &>/dev/null
-  [ $? -eq 1 ] && kubectl create ns velero
-
   printf "\nCreate and annotate the k8s SA\n"
   kubectl create serviceaccount velero --namespace velero
   warnOnError $? "Failed to create k8s SA - perhaps it already exists?"

package/src/k8cryo

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [ "`basename $0`" == "k8thaw" ];
+then
+  errorExit "k8thaw - UNDER CONSTRUCTION"
+fi
+
+# Gets the UTC time in the same format that velero schedules use for
+# generating the Date Time Stamp for scheduled backups.
+DTS="`date -u +\"%Y%m%d%H%M%S\"`"
+
+# The 1440h specifies the number of hours to keep the backup - 60 days
+velero backup create velero-cryo-$DTS --ttl 1440h

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

@@ -21,7 +21,7 @@ existingSecret: authz-postgres
 metrics:
   enabled: true
 
-master:
+primary:
   tolerations:
   - key: "database"
     operator: "Equal"

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

@@ -737,7 +737,7 @@ serverFiles:
       - name: Velero Alerts
         rules:
           - alert: VeleroBackupFailure
-            expr: (time() - velero_backup_last_successful_timestamp{schedule!=""} > 108000) and (velero_backup_success_total{schedule!=""}  != 0)
+            expr: (time() - velero_backup_last_successful_timestamp{schedule_version=~"2.[0]"} > 108000) and (velero_backup_success_total{schedule!=""}  != 0)
             for: 5m
             labels:
               severity: warning
@@ -745,15 +745,15 @@ serverFiles:
               summary: "Velero schedule {{ $labels.schedule }} backup failed to execute properly"
               description: "It has been over 30 hours since the last successful backup"
               dashboard: "OVH:<MONITORING>/velero"
-          - alert: NoVeleroBackups
-            expr: velero_backup_success_total{schedule!=""}  == 0
-            for: 5m
-            labels:
-              severity: warning
-            annotations:
-              summary: "Velero has not made any backups yet"
-              description: "Velero has been broken since cluster initialization because there is no successful backups around"
-              dashboard: "OVH:<MONITORING>/velero"
+#         - alert: NoVeleroBackups
+#           expr: velero_backup_success_total{schedule!=""}  == 0
+#           for: 5m
+#           labels:
+#             severity: warning
+#           annotations:
+#             summary: "Velero has not made any backups yet"
+#             description: "Velero has been broken since cluster initialization because there is no successful backups around"
+#             dashboard: "OVH:<MONITORING>/velero"
 
 server:
   affinity:

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

@@ -2,9 +2,9 @@
 # Backup schedules to create.
 #
 schedules:
-  postgresql:
+  psql:
     disabled: false
-    schedule: "0 2 * * *"
+    schedule: "0 7 * * *"
     template:
       ttl: "720h"
       snapshotVolumes: true
@@ -13,9 +13,9 @@ schedules:
           release: "postgres"
           app: "postgresql"
 
-  timescale:
+  tsdb:
     disabled: false
-    schedule: "0 3 * * *"
+    schedule: "0 8 * * *"
     template:
       ttl: "720h"
       snapshotVolumes: true
@@ -24,6 +24,12 @@ schedules:
           release: "timescale-db"
           app: "postgresql"
 
+  full:
+    disabled: false
+    schedule: "0 11 * * *"
+    template:
+      ttl: "168h"
+
   mysql:
     disabled: true
     schedule: "0 4 * * *"
@@ -69,7 +75,8 @@ labels: {}
 
 # Additional pod labels for Velero deployment's template. Optional
 # ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
-podLabels: {}
+podLabels:
+  shedule-version: "2.0"
 
 # Tolerations to use for the Velero deployment. Optional.
 tolerations: []

package/src/system-charts/velero.hup

@@ -2,8 +2,6 @@
 
 addHelmRepo vmware-tanzu https://vmware-tanzu.github.io/helm-charts
 
-createNamespaceIfNeeded
-
 [ -z "$VELERO_HELM_CHART" ] && VELERO_HELM_CHART="3"
 #
 # Build the bucket, region and SA email variables and use --set to mod the
@@ -17,6 +15,11 @@ 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"
 
+# Get rid of the previous schedules since we will be defining new schedules
+# in the chart, otherwise any modified pod labels could end up attached to
+# older metrics.
+velero schedule delete --all --confirm &> /dev/null
+
 helm upgrade \
      --install velero vmware-tanzu/velero --namespace velero \
      --values velero/velero-local.yaml \
@@ -32,8 +35,8 @@ cat<<DONE_VELERO
 
   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'`
+  `color g 'velero backup create --from-schedule velero-psql'`
+  `color g 'velero backup create --from-schedule velero-tsdb'`
 
   This will create initial backups from the defined schedules which should
   avoid alerts from prometheus about backups failing on new installations.

package/src/unleash.js

@@ -17,9 +17,20 @@ const getCurrentBranchName = async () => {
 }
 
 const isProtected = async () => {
-  const protectedBranches = [ 'main', 'master', 'development', ...process.argv.slice( 2 ) ]
   const theBranch = await getCurrentBranchName()
-  return protectedBranches.includes( theBranch )
+
+  const protectedBranches = [ 'main', 'master', 'development' ]
+  const additionalProtectedBranches = [ ...process.argv.slice( 2 ) ]
+
+  // Check if the current branch starts with any of the additional
+  // protected branch name
+  let matchesAdditionalBranch = false
+  for ( let i = 0; i < additionalProtectedBranches.length; i++ ) {
+    matchesAdditionalBranch = matchesAdditionalBranch ||
+      theBranch.startsWith( additionalProtectedBranches[i] )
+  }
+
+  return protectedBranches.includes( theBranch ) || matchesAdditionalBranch
 }
 
 const npmRunner = async ( script ) => {