@leverege/build-tools 2.83.2 → 2.83.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.83.2",
+  "version": "2.83.4",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -75,13 +75,13 @@
     "glob": "^11.0.3",
     "handlebars": "^4.7.8",
     "ignore": "^7.0.5",
-    "inquirer": "^12.9.3",
+    "inquirer": "^12.9.4",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.4",
     "ms": "^2.1.3",
     "npm-registry-fetch": "^19.0.0",
     "ora": "^8.2.0",
-    "p-limit": "^7.1.0",
+    "p-limit": "^7.1.1",
     "package-up": "^5.0.0",
     "readline-sync": "^1.4.10",
     "semver": "^7.7.2",
@@ -93,6 +93,6 @@
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.0.1",
-    "npm": "^11.5.2"
+    "npm": "^11.6.0"
   }
 }

package/src/bash-funcs

@@ -61,7 +61,8 @@ ERREXIT
 }
 
 function exitOnError() {
-  [ $1 -ne 0 ] && errorExit "$2"
+  (( $1 )) && errorExit "$2"
+  return 0 # reset that pesky $?
 }
 
 function yesOrSkipToContinue() {
@@ -153,7 +154,8 @@ REPOADD
 # *** DEPRECATED *** REMOVE AFTER BITNAMI ERADICATED ***
 # *** DEPRECATED *** REMOVE AFTER BITNAMI ERADICATED ***
 #
-function addBitnamiRepoDEPRECATED() {
+function addBitnamiRepo() {
+  warning '*** the addBitnamiRepo function should be removed - DEPRECATED ***'
   if [ ! -z "$BITNAMI_LATEST" ] || [ "$1" == "latest" ];
   then
     BITNAMI_URL="https://charts.bitnami.com/bitnami"

package/src/build-cnpg-image.mjs

@@ -92,8 +92,18 @@ USER root
 
 RUN set -xe; \\
     apt-get update; \\
+    apt-get install -y --no-install-recommends ca-certificates gnupg wget; \\
+    . /etc/os-release; \
+    install -d /usr/share/keyrings; \
+    wget -qO- https://www.postgresql.org/media/keys/ACCC4CF8.asc \\
+      | gpg --dearmor -o /usr/share/keyrings/postgresql.gpg; \\
+    echo "deb [signed-by=/usr/share/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt \${VERSION_CODENAME}-pgdg main" \\
+      > /etc/apt/sources.list.d/pgdg.list; \\
+    apt-get update; \\
     apt-get install -y --no-install-recommends \\
-        "postgresql-\${PG_MAJOR}-jsquery"; \\
+        "postgresql-\${PG_MAJOR}-jsquery" \\
+        "postgresql-\${PG_MAJOR}-repack"; \\
+        ln -s /usr/lib/postgresql/\${PG_MAJOR}/bin/pg_repack /usr/local/bin/pg_repack || true; \\
     rm -fr /tmp/*; \\
     rm -rf /var/lib/apt/lists/*;
 

package/src/clone-cnpg-from-snapshot.mjs

@@ -16,6 +16,7 @@ import {
   errorExit,
   log,
   mkdirSafe,
+  proceed,
   shellCmd,
   warning,
 } from './Utils.mjs'
@@ -295,6 +296,8 @@ const main = async () => {
 
   if ( dryRun ) {
     warning( 'Dry run enabled — no gcloud commands will run.' )
+  } else {
+    await proceed( `\n\n***NOTE => Your k8s context ${chalk.red( 'MUST NOT BE CHANGED WHILE THIS RUNS!!!!' )}` )
   }
 
   // STEP 1: Resolve volume handle from k8s VolumeSnapshotContent
@@ -383,12 +386,6 @@ const main = async () => {
   ] )
 
   await emitCloningArtifacts()
-
-  log( `
-  ✅ Done. Snapshot: ${chalk.cyan( destSnapshot )}
-           Recovery YAMLs written to: ${chalk.cyan( emitYamlDir )}
-           Run '${chalk.yellow( './apply-volumesnapshots.sh' )}' to prep the cluster for recovery.
-  ` )
 }
 
 const cleanupResources = async () => {
@@ -448,4 +445,11 @@ if ( cleanup ) {
   await cleanupResources()
 }
 
-log( chalk.green( `  [✓] Cloning complete - recovery image name is => ${chalk.bold.yellow( k8sSnapshotName )}\n` ) )
+const emitYamlCommand = `${emitYamlDir}/apply-volumesnapshots.sh`
+log( `
+  ✅ Cloning Operation Complete!
+
+     Move recovery YAML dir ${chalk.cyan( emitYamlDir )} to the target project branch
+     From the target, run ${chalk.yellow( emitYamlCommand )} to prep the cluster for recovery
+     CNPG recovery image name is => ${chalk.bold.yellow( k8sSnapshotName )}
+` )

package/src/helm-charts/prom-operator/rules/velero-rules.yaml

@@ -16,6 +16,14 @@ spec:
       annotations:
         summary: "Velero schedule {{ $labels.schedule }} backup failed to execute properly"
         description: "It has been over 30 hours since the last successful backup"
+    - alert: VeleroBackupEmpty
+      expr: velero_backup_items_total{schedule=~"velero-.*"} == 0
+      for: 25h # 5m for testing
+      labels:
+        severity: warning
+      annotations:
+        summary: "Velero schedule {{ $labels.schedule }} backed up 0 items - check PVC labels"
+        description: "The backup schedule {{ $labels.schedule }} is misconfigured"
     - alert: NoVeleroBackups
       expr: velero_backup_success_total{schedule!=""}  == 0
       for: 30h

package/src/helm-charts/rule-engine/values-local.yaml

@@ -6,6 +6,14 @@ config:
 
   # CNPG override
   MODELS_SEQUELIZE_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql
+  # MODELS_SEQUELIZE_HOST: "cnpg-db-psql-stack-pool-rw.cnpg-operands" # cnpg pooled (pgbouncer)
+
+  # Limit the SQL connections from the defaults of 10
+  MODELS_SEQUELIZE_POOL_CONNECTION_LIMIT: "1" # max connection prob
+  MODELS_SEQUELIZE_POOL_MAX_CONNECTIONS: "1" # max connection prob
+
+  SQL_POOL_CONNECTION_LIMIT: "1" # max connection prob
+  SQL_POOL_MAX_CONNECTION: "1" # max connection prob
 
 serviceMonitor:
   enabled: true

package/src/helm-charts/traefik/values-local.yaml

@@ -32,18 +32,42 @@ metrics:
       interval: 30s
       namespace: prometheus
 
+# To enable the trafik dashboard uncomment the --api-secure switch, uncomment
+# the ports statment and the first block that defines the traefik port at 9000.
+# Redploy traefik and once it is stable port-forward:
+#   kubectl port-forward -n traefik deployment/traefik 9000:9000
+# and open the dashboard on a browser:
+#   http://localhost:9000/dashboard/
+# For more info:
+#   https://doc.traefik.io/traefik/operations/api/
+#
 additionalArguments:
-  # this will enable the dashboard on port 8080 in v3 - https://doc.traefik.io/traefik/operations/api/
-  - "--api.insecure=true"
+# - "--api.insecure=true" # uncomment for dashboard
+
+  # enable read response timeouts
 # - "--entrypoints.web.transport.respondingTimeouts.readTimeout=300"
 
-# Custom entry points may be added here - the first two are port definitions
+# Custom entry points may be added here - the first one is for the traefik
+# dashboard (see comment above)two are port definitions
 # for both unsecured and secured MQTT ports used by connect. Note that the
 # mqtts port has TLS termination performed by traefik and both ports are then
 # forwarded to one open port (1883) on the target service. The vernemq service
 # chart provides the IngressRouteTCP chart to make this happen.
 #
 #ports:
+#  traefik: # dashboard access!
+#    port: 9000
+#    expose:
+#      default: true
+#    eposedPort: 9000
+#    protocol: TCP
+#
+# These port definitions are for both unsecured and secured MQTT ports used by
+# connect. Note that the mqtts port has TLS termination performed by traefik
+# and both ports are then forwarded to one open port (1883) on the target
+# service. The vernemq service chart provides the IngressRouteTCP chart to make
+# this happen.
+#
 #  websecure:
 #    forwardedHeaders:
 #      insecure: true # enables true source IP of request

package/src/helm-charts/velero/helmup.plugin

@@ -55,6 +55,7 @@ cat<<DONE_VELERO
   `color y 'Wait at least 1 minute before kicking off the following backups:'`
 
   `color g 'velero backup create --from-schedule velero-full'`
+  `color g 'velero backup create --from-schedule velero-es8'`
   `color g 'velero backup create --from-schedule velero-psql'`
   `color g 'velero backup create --from-schedule velero-tsdb'`
 
@@ -65,6 +66,8 @@ cat<<DONE_VELERO
 
   `color g 'overwhelm && velero get backups'`
 
+  `color y 'prom-operator metrics are enabled by default (serviceMonitor)'`
+  
 DONE_VELERO
 
 removeHelmRepo vmware-tanzu

package/src/helm-charts/velero/values-local.yaml

@@ -2,7 +2,40 @@
 # Backup schedules to create.
 #
 schedules:
-  psql:
+  cnpg-psql:
+    disabled: true
+    schedule: "0 7 * * *"
+    template:
+      ttl: "720h"
+      snapshotVolumes: true
+      labelSelector:
+        matchLabels:
+          cnpg.io/cluster: "cnpg-db-psql-stack"
+          cnpg.io/instanceRole: "primary"
+
+  cnpg-tsdb:
+    disabled: true
+    schedule: "0 7 * * *"
+    template:
+      ttl: "720h"
+      snapshotVolumes: true
+      labelSelector:
+        matchLabels:
+          cnpg.io/cluster: "cnpg-db-tsdb-basic"
+          cnpg.io/instanceRole: "primary"
+
+  cnpg-dense:
+    disabled: true
+    schedule: "0 7 * * *"
+    template:
+      ttl: "720h"
+      snapshotVolumes: true
+      labelSelector:
+        matchLabels:
+          cnpg.io/cluster: "cnpg-db-tsdb-dense"
+          cnpg.io/instanceRole: "primary"
+
+  psql: # legacy non-cnpg
     disabled: false
     schedule: "0 7 * * *"
     template:
@@ -10,10 +43,23 @@ schedules:
       snapshotVolumes: true
       labelSelector:
         matchLabels:
-          release: "postgres"
-          app: "postgresql"
+          app.kubernetes.io/instance: "postgres"
+          app.kubernetes.io/name: "postgresql"
+          role: "primary"
 
-  elasticsearch:
+  psql-scheduler: # legacy non-cnpg
+    disabled: true # enable on recovr
+    schedule: "0 7 * * *"
+    template:
+      ttl: "720h"
+      snapshotVolumes: true
+      labelSelector:
+        matchLabels:
+          app.kubernetes.io/instance: scheduler-psql
+          app.kubernetes.io/name: postgresql
+          role: primary
+
+  es8:
     disabled: false
     schedule: "0 6 * * *"
     template:
@@ -23,7 +69,7 @@ schedules:
         matchLabels:
           app.kubernetes.io/name: elasticsearch
 
-  tsdb:
+  tsdb: # legacy non-cnpg
     disabled: false
     schedule: "0 8 * * *"
     template:
@@ -40,17 +86,6 @@ schedules:
     template:
       ttl: "168h"
 
-  mysql:
-    disabled: true
-    schedule: "0 4 * * *"
-    template:
-      ttl: "720h"
-      snapshotVolumes: true
-      labelSelector:
-        matchLabels:
-          release: "mysql"
-          app: "mysql"
-
   redis:
     disabled: true
     schedule: "*/30 * * * *"