@leverege/build-tools 2.50.8 → 2.50.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.50.8",
+  "version": "2.50.10",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -54,7 +54,7 @@
   "author": "Leverege Devs",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@google-cloud/artifact-registry": "^3.3.0",
+    "@google-cloud/artifact-registry": "^3.4.0",
     "ansi-colors": "^4.1.3",
     "chalk": "^5.3.0",
     "command-line-args": "^5.2.1",
@@ -62,22 +62,22 @@
     "deepmerge": "^4.3.1",
     "enquirer": "^2.4.1",
     "execa": "^8.0.1",
-    "glob": "^10.3.12",
+    "glob": "^10.3.16",
     "handlebars": "^4.7.8",
-    "inquirer": "^9.2.20",
+    "inquirer": "^9.2.22",
     "js-yaml": "^4.1.0",
     "ms": "^2.1.3",
-    "npm-registry-fetch": "^17.0.0",
+    "npm-registry-fetch": "^17.0.1",
     "package-up": "^5.0.0",
     "parse-gitignore": "^2.0.0",
     "read-pkg": "^9.0.1",
     "readline-sync": "^1.4.10",
-    "semver": "^7.6.0",
+    "semver": "^7.6.2",
     "simple-git": "^3.24.0",
-    "zx": "^8.0.2"
+    "zx": "^8.1.0"
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^4.2.0",
-    "npm": "^10.7.0"
+    "npm": "^10.8.0"
   }
 }

package/src/Utils.mjs

@@ -76,7 +76,11 @@ export const getDateTimestamp = () => {
 
 export const getGcpAccount = async () => {
   const fullAccount = await shellCmd( 'gcloud config get account' )
-  const [ fullName, domain ] = fullAccount.split( '@' )
+  const [ principal, domain ] = fullAccount.split( '@' )
+
+  // for non-email principals, such as Workforce Identity federated users
+  const nameFields = principal.split( '/' )
+  const fullName = nameFields[nameFields.length - 1]
   return { fullAccount, fullName, domain }
 }
 
@@ -345,6 +349,10 @@ export const parseHelmChart = async ( helmroot = './helm' ) => {
   const chartVersion = chartYaml.version
   const chartPackage = `${chartName}-${chartVersion}.tgz`
   const valuesYaml = YAML.load( readFileSync( `${helmroot}/values.yaml`, 'utf8' ) )
+  debug( valuesYaml, '<== helm/values.yaml' )
+  if ( !valuesYaml.image ) {
+    errorExit( 'Error: legacy helm chart detected - must upgrade to latest ignition template to proceed' )
+  }
   const imageRegistry = valuesYaml.image?.registry
   const registryComponents = imageRegistry.split( '/' )
   /* eslint-enable security/detect-non-literal-fs-filename */

package/src/bash-funcs

@@ -169,13 +169,20 @@ function ifPluggedIn() {
   local INVOKED_AS=`basename $0`
   local PLUGIN=
   case "$INVOKED_AS" in
-    "helmup"|"helmwhat" )
+    "helmup"|"helmwhat"|"helmcycle" )
       PLUGIN="$1/helmup.plugin"
       ;;
     "helmdn" )
       PLUGIN="$1/helmdn.plugin"
       ;;
     *)
+      cat<<PLUGIN_INVOKED_AS_ERROR
+
+
+  $RED_ERROR bash-funcs ifPluggedIn: unknown INVOKED_AS=[`color r $INVOKED_AS`]
+
+PLUGIN_INVOKED_AS_ERROR
+      exit 1
       ;;
   esac
 

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

@@ -12,5 +12,9 @@ spec:
   pgbouncer:
     poolMode: session
     parameters:
+      # https://www.pgbouncer.org/config.html#generic-settings
       max_client_conn: "500"
       default_pool_size: "10"
+      # 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

@@ -13,24 +13,35 @@ spec:
   imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.2-cnpg-tsdb2-beta.4
   bootstrap:
     initdb:
-      database: models
+#     database: models
       postInitSQL:
+#       - CREATE DATABASE app;       # operator expects this
+#       - CREATE ROLE app;           #   and this to exist on restore
+        # create the stack databases
         - CREATE DATABASE authz;
         - CREATE DATABASE fota;
         - CREATE DATABASE geotile;
         - CREATE DATABASE models;
         - CREATE DATABASE scheduler;
-      owner: imagine
-      secret:
-        name: cnpg-db-psql-stack-imagine-pw # imagine db pw
+#     owner: imagine
+#     secret:
+#       name: cnpg-db-psql-stack-imagine-pw # imagine db pw
 
   enableSuperuserAccess: true
   superuserSecret:
     name: cnpg-db-psql-stack-postgres-pw # postgres db pw
 
   affinity:
-#   enablePodAntiAffinity: true
-#   topologyKey: kubernetes.io/hostname # default value
+    enablePodAntiAffinity: true
+    topologyKey: kubernetes.io/hostname # default value
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: target-env
+            operator: In
+            values:
+            - database
     tolerations:
       - key: "database"
         operator: "Equal"
@@ -83,6 +94,7 @@ spec:
         cnpgCluster: cnpg-db-psql-stack
       wal:
         compression: gzip
+        maxParallel: 4
 ---
 apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup
@@ -91,8 +103,9 @@ metadata:
   namespace: cnpg-operands
 spec:
   # https://pkg.go.dev/github.com/robfig/cron#hdr-CRON_Expression_Format
-  schedule: "0 0 * * * *"
+  schedule: "0 0 */12 * * *"
   cluster:
-  method: volumeSnapshot
+    name: cnpg-db-psql-stack
+  method: barmanObjectStore # volumeSnapshot
   backupOwnerReference: self
   immediate: true

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

@@ -12,5 +12,9 @@ spec:
   pgbouncer:
     poolMode: session
     parameters:
+      # https://www.pgbouncer.org/config.html#generic-settings
       max_client_conn: "500"
       default_pool_size: "10"
+      # https://www.pgbouncer.org/config.html#log-settings
+      log_connections: "0"
+      log_disconnections: "0"

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

@@ -19,6 +19,8 @@ spec:
       postInitTemplateSQL:
         - CREATE EXTENSION timescaledb;
         - CREATE EXTENSION jsquery;
+        - CREATE DATABASE app; # for the operator restores
+        - CREATE ROLE app;     # same
       database: imagine
       owner: imagine
       secret:
@@ -94,6 +96,7 @@ spec:
         cnpgCluster: cnpg-db-tsdb-basic
       wal:
         compression: gzip
+        maxParallel: 4
 ---
 apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup

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

@@ -12,5 +12,9 @@ spec:
   pgbouncer:
     poolMode: session
     parameters:
+      # https://www.pgbouncer.org/config.html#generic-settings
       max_client_conn: "500"
       default_pool_size: "10"
+      # https://www.pgbouncer.org/config.html#log-settings
+      log_connections: "0"
+      log_disconnections: "0"

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

@@ -19,6 +19,8 @@ spec:
       postInitTemplateSQL:
         - CREATE EXTENSION timescaledb;
         - CREATE EXTENSION jsquery;
+        - CREATE DATABASE app; # for the operator restores
+        - CREATE ROLE app;     # same
       database: imagine
       owner: imagine
       secret:
@@ -93,6 +95,7 @@ spec:
         cnpgCluster: cnpg-db-tsdb-dense
       wal:
         compression: gzip
+        maxParallel: 4
 ---
 apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup

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

@@ -12,5 +12,9 @@ spec:
   pgbouncer:
     poolMode: session
     parameters:
+      # https://www.pgbouncer.org/config.html#generic-settings
       max_client_conn: "500"
       default_pool_size: "10"
+      # https://www.pgbouncer.org/config.html#log-settings
+      log_connections: "0"
+      log_disconnections: "0"

package/src/helmup.sh

@@ -794,7 +794,13 @@ doHelmup() {
   [ ! -z "$FROM_VERSIONS" ] && from="`color y \"<= from Versions.json\"`"
   printf "$doing $from\n"
   eval $helmup
-  sendToSlack "$helmup"
+  case "$INVOKED_AS" in
+    "helmup"|"helmdn")
+      sendToSlack "$helmup"
+      ;;
+    *)
+      ;;
+  esac
 }
 
 # not a fan of global vars but bash forced me to - set by getServiceAndChartVersion
@@ -814,7 +820,7 @@ function doInstall() {
     # slap additional helm syntax in there if the version is set
     [ ! -z "$CHARTVER" ] && CHARTVER="--version $CHARTVER"
 
-    local INVOKED_AS=`basename $0`
+    INVOKED_AS=`basename $0`
     # set the dry-run flag on what
     [ "$INVOKED_AS" == "helmwhat" ] && HELM_WHAT="--dry-run --debug" && K8S_WHAT="--dry-run=server -o yaml"