@leverege/build-tools 2.63.2 → 2.63.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.63.2",
+  "version": "2.63.3",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

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

@@ -4,20 +4,20 @@ metadata:
   name: cnpg-db-psql-stack
   namespace: cnpg-operands
 spec:
+  # https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-ClusterSpec
   instances: 1
   logLevel: info # warning debug
 
   monitoring:
     enablePodMonitor: false # set true once monitoring is setup
 
-  description: "Leverege Stack PostgreSQL DB"
+  # https://console.cloud.google.com/artifacts/docker/leverege-registry/us/system/images%2Fleverege-pgsql?project=leverege-registry
   imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:17.2-cnpg-lvrg-rel.2
+  description: "Leverege Stack PostgreSQL DB"
   bootstrap:
     initdb:
 #     database: models # do not set - let it default to cnpg app db
       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;
@@ -25,29 +25,20 @@ spec:
         - CREATE DATABASE models;
         - CREATE DATABASE scheduler;
 
+  # we use superuser access for backwards compatibility with legacy (aka lazy)
   enableSuperuserAccess: true
   superuserSecret:
-    name: cnpg-db-psql-stack-postgres-pw # postgres db pw
+    name: cnpg-db-psql-stack-postgres-pw # postgres db pw created by helmup
 
-  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"
+  # Require 50Gi of space per instance using ssd storage class
+  storage:
+    storageClass: premium-rwo
+    size: 50Gi
+# walStorage:
+#   storageClass: premium-rwo
+#   size: 1Gi
 
-  # Parameters and pg_hba configuration will be append
-  # to the default ones to make the cluster work
+  # customize psql settings - be careful - should be tuned
   postgresql:
     parameters:
 #     max_connections: "100"
@@ -59,26 +50,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
-    size: 50Gi
-# walStorage:
-#   storageClass: premium-rwo
-#   size: 1Gi
-
   backup:
     retentionPolicy: 7d # don't think this does anything?
     volumeSnapshot:
@@ -86,7 +57,7 @@ spec:
         snapshotOf: cnpg-db-psql-stack
       className: cnpg-snapshotclass
     barmanObjectStore:
-      destinationPath: gs://OVH:<PROJECT_ID>-barman
+      destinationPath: gs://${PROJECT_ID}-barman
       googleCredentials:
         gkeEnvironment: true
       tags:
@@ -94,6 +65,34 @@ spec:
       wal:
         compression: gzip
         maxParallel: 4
+
+  # affinity and toleration to control node pool placement, typically on database pool
+  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"
+
+  # 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-operator/helmup.plugin

@@ -2,7 +2,7 @@
 #
 # See => https://cloudnative-pg.io/documentation/current/installation_upgrade/
 #
-OPVER="1.25.0"
+OPVER="1.25.1"
 
 createNamespaceIfNeeded cnpg-system
 

package/src/helmup.sh

@@ -1160,7 +1160,13 @@ $RED_ERROR The Leverege service-man utility is missing - install and rerun helmu
 NO_SERVICE_MAN
           exit 1
         fi
-        service-man --from-helmup --create-service $SERVICE
+
+        if [[ "$SERVICE" == *-canary ]];
+        then
+          printf "\n$YELO_WARN Canary detected - skipping service-man SA creation\n\n"
+        else
+          service-man --from-helmup --create-service $SERVICE
+        fi
 
         checkUpgradeNotes $SERVICE