@leverege/build-tools 2.63.3 → 2.64.1

package/.vscode/settings.json

@@ -0,0 +1,18 @@
+{
+  "workbench.colorCustomizations": {
+    "commandCenter.border": "#e7e7e799",
+    "sash.hoverBorder": "#065782",
+    "statusBar.background": "#0877b3",
+    "statusBar.border": "#0877b3",
+    "statusBar.foreground": "#e7e7e7",
+    "statusBarItem.hoverBackground": "#0a97e4",
+    "statusBarItem.remoteBackground": "#0877b3",
+    "statusBarItem.remoteForeground": "#e7e7e7",
+    "titleBar.activeBackground": "#0877b3",
+    "titleBar.activeForeground": "#e7e7e7",
+    "titleBar.border": "#0877b3",
+    "titleBar.inactiveBackground": "#0877b399",
+    "titleBar.inactiveForeground": "#e7e7e799"
+  },
+  "peacock.color": "#0877b3"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.63.3",
+  "version": "2.64.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -69,7 +69,7 @@
     "execa": "^9.5.2",
     "glob": "^11.0.1",
     "handlebars": "^4.7.8",
-    "inquirer": "^12.4.2",
+    "inquirer": "^12.4.3",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.4",
     "ms": "^2.1.3",
@@ -80,10 +80,10 @@
     "semver": "^7.7.1",
     "simple-git": "^3.27.0",
     "toml": "^3.0.0",
-    "zx": "^8.3.2"
+    "zx": "^8.4.0"
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.0.1",
-    "npm": "^11.1.0"
+    "npm": "^11.2.0"
   }
 }

package/src/helm-charts/api-server/values-local.yaml

@@ -11,22 +11,22 @@ config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'
 
 # CNPG overrides
-# # stock pgsql
-# MODEL_SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands"
-# PG_MODELS_HOST: "cnpg-db-psql-stack-rw.cnpg-operands"
-# # timescale
-# PG_HOST: "cnpg-db-tsdb-basic-r.cnpg-operands"
+  # stock pgsql
+  MODEL_SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands"
+  PG_MODELS_HOST: "cnpg-db-psql-stack-rw.cnpg-operands"
+  # timescale
+  PG_HOST: "cnpg-db-tsdb-basic-r.cnpg-operands"
 
 # The settings on the left are for the "standard" legacy chart settings which
 # specifiy the old k8s secrets setups and are the defaults values from the
 # api-server helm chart.
-psqlSecurity:                                   # v----- these are for CNPG -----v
-  PSQL_SECRET_NAME: "authz-postgres"            # "cnpg-db-psql-stack-postgres-pw"
-  PSQL_SECRET_KEY: "postgresql-password"        # "password"
-  TSDB_SECRET_NAME: "postgresql-password"       # "cnpg-db-tsdb-basic-postgres-pw"
-  TSDB_SECRET_KEY: "postgresql-password"        # "password"
-  TSDB_DENSE_SECRET_NAME: "postgresql-password" # "cnpg-db-tsdb-dense-postgres-pw"
-  TSDB_DENSE_SECRET_KEY: "postgresql-password"  # "password"
+psqlSecurity:
+  PSQL_SECRET_NAME: "cnpg-db-psql-stack-postgres-pw"
+  PSQL_SECRET_KEY: "password"
+  TSDB_SECRET_NAME: "cnpg-db-tsdb-basic-postgres-pw"
+  TSDB_SECRET_KEY: "password"
+  TSDB_DENSE_SECRET_NAME: "cnpg-db-tsdb-dense-postgres-pw"
+  TSDB_DENSE_SECRET_KEY: "password"
 
 autoscaling:
   minReplicas: 3

package/src/helm-charts/authz-server/values-local.yaml

@@ -10,4 +10,4 @@ config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'
 
   # CNPG override
-# SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql
+  SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql

package/src/helm-charts/cnpg-db-pgbench/pooler.yaml

@@ -10,11 +10,11 @@ spec:
   instances: 1
   type: rw
   pgbouncer:
-    poolMode: session
+    poolMode: transaction
     parameters:
       # https://www.pgbouncer.org/config.html#generic-settings
       max_client_conn: "500"
-      default_pool_size: "10"
+      default_pool_size: "5"
       # https://www.pgbouncer.org/config.html#log-settings
       log_connections: "0"
       log_disconnections: "0"

package/src/helm-charts/cnpg-db-psql-stack/cluster.yaml.ovh

@@ -18,6 +18,8 @@ spec:
     initdb:
 #     database: models # do not set - let it default to cnpg app db
       postInitSQL:
+        # create the extensions
+        - CREATE EXTENSION pg_stat_statements;
         # create the stack databases
         - CREATE DATABASE authz;
         - CREATE DATABASE fota;
@@ -50,6 +52,10 @@ spec:
 #     maintenance_work_mem: 1GB
 #     work_mem: 20MB
 
+  postgresql:
+    shared_preload_libraries:
+      - pg_stat_statements
+
   backup:
     retentionPolicy: 7d # don't think this does anything?
     volumeSnapshot:
@@ -66,6 +72,15 @@ spec:
         compression: gzip
         maxParallel: 4
 
+  # Method to follow to upgrade the primary server during a rolling update procedure,
+  # after all replicas have been successfully updated - default is restart
+  primaryUpdateMethod: switchover
+
+  serviceAccountTemplate:
+    metadata:
+      annotations:
+        iam.gke.io/gcp-service-account: cnpg-operands-sa@${PROJECT_ID}.iam.gserviceaccount.com
+
   # affinity and toleration to control node pool placement, typically on database pool
   affinity:
     enablePodAntiAffinity: true
@@ -84,15 +99,6 @@ spec:
         value: "true"
         effect: "NoSchedule"
 
-  # Method to follow to upgrade the primary server during a rolling update procedure,
-  # after all replicas have been successfully updated - default is restart
-  primaryUpdateMethod: switchover
-
-  serviceAccountTemplate:
-    metadata:
-      annotations:
-        iam.gke.io/gcp-service-account: cnpg-operands-sa@${PROJECT_ID}.iam.gserviceaccount.com
-
 ---
 apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup

package/src/helm-charts/cnpg-db-psql-stack/pooler.yaml

@@ -10,11 +10,11 @@ spec:
   instances: 1
   type: rw
   pgbouncer:
-    poolMode: session
+    poolMode: transaction
     parameters:
       # https://www.pgbouncer.org/config.html#generic-settings
       max_client_conn: "500"
-      default_pool_size: "10"
+      default_pool_size: "5"
       # https://www.pgbouncer.org/config.html#log-settings
       log_connections: "0"
       log_disconnections: "0"

package/src/helm-charts/cnpg-db-recovery/cluster.yaml.ovh

@@ -24,23 +24,6 @@ spec:
   superuserSecret:
     name: <postgres_password> # postgres db pw
 
-  affinity:
-    enablePodAntiAffinity: true
-    topologyKey: kubernetes.io/hostname # default value
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: target-env
-            operator: In
-            values:
-            - database
-    tolerations:
-      - key: "database"
-        operator: "Equal"
-        value: "true"
-        effect: "NoSchedule"
-
   # Parameters and pg_hba configuration will be append
   # to the default ones to make the cluster work
   postgresql:
@@ -54,18 +37,6 @@ spec:
 #     maintenance_work_mem: 1GB
 #     work_mem: 20MB
 
-  # - unsupervised: automated update of the primary once all
-  #                 replicas have been upgraded (default)
-  # - supervised: requires manual supervision to perform
-  #               the switchover of the primary
-  primaryUpdateStrategy: unsupervised
-  primaryUpdateMethod: switchover
-
-  serviceAccountTemplate:
-    metadata:
-      annotations:
-        iam.gke.io/gcp-service-account: cnpg-operands-sa@OVH:<PROJECT_ID>.iam.gserviceaccount.com
-
   # Require 50Gi of space per instance using ssd storage class
   storage:
     storageClass: premium-rwo
@@ -81,14 +52,41 @@ spec:
         snapshotOf: cnpg-db-recovery
       className: cnpg-snapshotclass
     barmanObjectStore:
-      destinationPath: gs://OVH:<PROJECT_ID>-barman
+      destinationPath: gs://${PROJECT_ID}-barman
       googleCredentials:
         gkeEnvironment: true
       tags:
         cnpgCluster: cnpg-db-recovery
       wal:
         compression: gzip
-        maxParallel: 8
+        maxParallel: 4
+
+  # Method to follow to upgrade the primary server during a rolling update procedure,
+  # after all replicas have been successfully updated - default is restart
+  primaryUpdateMethod: switchover
+
+  serviceAccountTemplate:
+    metadata:
+      annotations:
+        iam.gke.io/gcp-service-account: cnpg-operands-sa@${PROJECT_ID}.iam.gserviceaccount.com
+
+  affinity:
+    enablePodAntiAffinity: true
+    topologyKey: kubernetes.io/hostname # default value
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: target-env
+            operator: In
+            values:
+            - database
+    tolerations:
+      - key: "database"
+        operator: "Equal"
+        value: "true"
+        effect: "NoSchedule"
+
 ---
 apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup

package/src/helm-charts/cnpg-db-recovery/pooler.yaml

@@ -10,11 +10,11 @@ spec:
   instances: 1
   type: rw
   pgbouncer:
-    poolMode: session
+    poolMode: transaction
     parameters:
       # https://www.pgbouncer.org/config.html#generic-settings
       max_client_conn: "500"
-      default_pool_size: "10"
+      default_pool_size: "5"
       # https://www.pgbouncer.org/config.html#log-settings
       log_connections: "0"
       log_disconnections: "0"

package/src/helm-charts/cnpg-db-tsdb-basic/pooler.yaml

@@ -10,11 +10,11 @@ spec:
   instances: 1
   type: rw
   pgbouncer:
-    poolMode: session
+    poolMode: transaction
     parameters:
       # https://www.pgbouncer.org/config.html#generic-settings
       max_client_conn: "500"
-      default_pool_size: "10"
+      default_pool_size: "5"
       # https://www.pgbouncer.org/config.html#log-settings
       log_connections: "0"
       log_disconnections: "0"

package/src/helm-charts/cnpg-db-tsdb-dense/pooler.yaml

@@ -10,11 +10,11 @@ spec:
   instances: 1
   type: rw
   pgbouncer:
-    poolMode: session
+    poolMode: transaction
     parameters:
       # https://www.pgbouncer.org/config.html#generic-settings
       max_client_conn: "500"
-      default_pool_size: "10"
+      default_pool_size: "5"
       # https://www.pgbouncer.org/config.html#log-settings
       log_connections: "0"
       log_disconnections: "0"

package/src/helm-charts/db-curator/values-local.yaml

@@ -3,5 +3,5 @@ image:
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'
-  TSDB_CLEANUP_ENABLED: "true"
   FIREBASE_CLEANUP_ENABLED: "true"
+  TSDB_CLEANUP_ENABLED: "false" # no need is new tsdb using autoexpiry

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

@@ -2,7 +2,7 @@
 #
 showInstalling "Elastic Search 8"
 
-[ -z "$ELASTIC_CHART_VERSION" ] && ELASTIC_CHART_VERSION="21.4.5"
+[ -z "$ELASTIC_CHART_VERSION" ] && ELASTIC_CHART_VERSION="21.4.8"
 
 OCI_CHART="oci://registry-1.docker.io/bitnamicharts/elasticsearch"
 

package/src/helm-charts/fota-server/values-local.yaml

@@ -8,7 +8,7 @@ config:
   NETWORK_ID: 'set-me-in-values-local'
 
   # CNPG override
-# SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql
+  SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql
 
 serviceMonitor:
   enabled: false

package/src/helm-charts/prom-operator/prometheus-stack.yaml.ovh

@@ -39,6 +39,13 @@ prometheus:
     ruleSelectorNilUsesHelmValues: false
     serviceMonitorSelectorNilUsesHelmValues: false
     probeSelectorNilUsesHelmValues: false
+    storageSpec:
+      volumeClaimTemplate:
+        spec:
+          accessModes: ["ReadWriteOnce"]
+          resources:
+            requests:
+              storage: 50Gi  # Adjust size as needed
 
 # default is using kube-dns which is usually sufficient for our needs but
 # can be switched over to CoreDNS if the need arises

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

@@ -4,8 +4,8 @@ showInstalling "Redis"
 
 OCI_CHART="oci://registry-1.docker.io/bitnamicharts/redis"
 
-[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="20.7.1"
+[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="20.11.3"
 
 helm upgrade --install redis $OCI_CHART       \
-             --values  redis/redis-local.yaml \
+             --values  redis/values.yaml \
              --version $REDIS_CHART_VERSION $HELM_WHAT

package/src/helm-charts/resource-server/values-local.yaml

@@ -14,4 +14,4 @@ config:
   UPLOADER_LOCATION: "OVH:<GCE_REGION>"
 
   # CNPG override
-# SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql
+  SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql

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

@@ -5,4 +5,4 @@ config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'
 
   # CNPG override
-# MODELS_SEQUELIZE_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql
+  MODELS_SEQUELIZE_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql

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

@@ -5,4 +5,4 @@ config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'
 
   # CNPG override
-# SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql
+  SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql

package/src/helm-charts/transponder-tsdb/values-local.yaml

@@ -14,10 +14,10 @@ config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'
 
 # CNPG override
-# PG_HOST: "cnpg-db-tsdb-basic-rw.cnpg-operands"
-#
-# PG_PASSWORD_SECRET: "cnpg-db-tsdb-basic-postgres-pw"
-# PG_PASSWORD_KEY: "password"
+  PG_HOST: "cnpg-db-tsdb-basic-rw.cnpg-operands"
+
+  PG_PASSWORD_SECRET: "cnpg-db-tsdb-basic-postgres-pw"
+  PG_PASSWORD_KEY: "password"
 
   TRANSPORT_CONFIG: '{
     "type": "pubsub",

package/src/helmup.sh

@@ -58,6 +58,8 @@ SYSTEM=(
   reloader
   traefik
   velero
+  cnpg-db-psql-stack
+  cnpg-db-tsdb-basic
 )
 
 SYSTEM_LEGACY=(

package/src/k8cryo.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Usage: k8cryo <expiry days>
+#
+# Simple script for performing a full cluster backup with a specific expiry
+# period. The default is 60 days.
+#
+. `build-tools --bashfun`
+
+daysToKeep=${1:-60}
+let hoursToKeep="$daysToKeep*24"
+printf "\ncryo backup set to keep for $daysToKeep days / $hoursToKeep hours\n"
+
+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\"`"
+
+printf "\nExecuting = > velero backup create velero-cryo-$DTS --ttl ${hoursToKeep}h\n"
+
+velero backup create velero-cryo-$DTS --ttl ${hoursToKeep}h

package/src/templates/dockerfileTemplatePy.hbs

@@ -9,13 +9,11 @@ RUN useradd -ms /bin/bash {{runuser}} && \
     mkdir -p /usr/src/app && \
     chown {{runuser}} /usr/src/app && \
     apt-get update && apt-get install -y \
-    wget git \
+    wget git libgl1 libglib2.0-0 \
     && rm -rf /var/lib/apt/lists/*
 
 #    gcc \
 #    git \
-#    libgl1 \
-#    libglib2.0-0 \
 #    && rm -rf /var/lib/apt/lists/*
 
 # Copy uv binary from the official distroless Docker image.