@leverege/build-tools 2.49.0 → 2.50.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.49.0",
+  "version": "2.50.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -16,7 +16,7 @@
     "build-tools": "src/build-tools.mjs",
     "chart-to-registry": "src/chart-to-registry.mjs",
     "circleate": "src/circleate.sh",
-    "cnpg-snapshot": "src/cnpg-snapshot.mjs",
+    "cnpg-backup": "src/cnpg-backup.mjs",
     "decrypt-secrets": "src/decrypt-secrets.sh",
     "dirty-git": "src/dirty-git.sh",
     "dockreate": "src/dockreate.sh",
@@ -54,7 +54,7 @@
   "author": "Leverege Devs",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@google-cloud/artifact-registry": "^3.2.0",
+    "@google-cloud/artifact-registry": "^3.3.0",
     "ansi-colors": "^4.1.3",
     "chalk": "^5.3.0",
     "command-line-args": "^5.2.1",
@@ -64,20 +64,20 @@
     "execa": "^8.0.1",
     "glob": "^10.3.12",
     "handlebars": "^4.7.8",
-    "inquirer": "^9.2.16",
+    "inquirer": "^9.2.18",
     "js-yaml": "^4.1.0",
     "ms": "^2.1.3",
-    "npm-registry-fetch": "^16.1.0",
+    "npm-registry-fetch": "^16.2.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",
     "simple-git": "^3.24.0",
-    "zx": "^7.2.3"
+    "zx": "^8.0.1"
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^4.2.0",
-    "npm": "^10.5.0"
+    "npm": "^10.5.2"
   }
 }

package/src/helm-charts/cnpg-db-pgbench/helmup.plugin

@@ -1,3 +1,3 @@
 #!/bin/bash
 #
-kubectl apply -f cnpg-db-pgbench/cnpg-db-pgbench.yaml $K8S_WHAT
+kubectl apply -f cnpg-db-pgbench/cluster.yaml $K8S_WHAT

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

@@ -10,7 +10,7 @@ spec:
 # logLevel: debug
 
   description: "Leverege Stack PostgreSQL DB"
-  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.1-cnpg-tsdb2-beta.10
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.2-cnpg-tsdb2-beta.4
   bootstrap:
     initdb:
       database: imagine
@@ -35,10 +35,10 @@ spec:
   # to the default ones to make the cluster work
   postgresql:
     parameters:
+      max_connections: "123"
 #     max_worker_processes: "60"
 #     max_worker_processes: "8"
 #     max_parallel_workers: "8"
-      max_connections: "500"
 #     shared_buffers: 2GB
 #     effective_cache_size: 6GB
 #     maintenance_work_mem: 1GB
@@ -90,3 +90,17 @@ spec:
   method: volumeSnapshot
   backupOwnerReference: self
   immediate: true
+---
+apiVersion: postgresql.cnpg.io/v1
+kind: ScheduledBackup
+metadata:
+  name: cnpg-db-psql-stack-volsnap
+  namespace: cnpg-operands
+spec:
+  # https://pkg.go.dev/github.com/robfig/cron#hdr-CRON_Expression_Format
+  schedule: "0 0 */4 * * *"
+  cluster:
+    name: cnpg-db-psql-stack
+  method: volumeSnapshot
+  backupOwnerReference: self
+  immediate: true

package/src/helm-charts/cnpg-db-psql-stack/helmup.plugin

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-kubectl apply -f cnpg-db-psql-stack/cnpg-db-psql-stack.yaml $K8S_WHAT
+kubectl apply -f cnpg-db-psql-stack/cluster.yaml $K8S_WHAT

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

@@ -9,8 +9,11 @@ spec:
   instances: 1
   logLevel: info # warning debug
 
+  monitoring:
+    enablePodMonitor: false # set true once monitoring is setup
+
   description: "Leverege Plain Timescale DB"
-  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.1-cnpg-tsdb2-beta.6
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.2-cnpg-tsdb2-beta.4
   bootstrap:
     initdb:
       postInitTemplateSQL:
@@ -26,8 +29,16 @@ spec:
     name: cnpg-db-tsdb-basic-postgres-pw # postgres db pw
 
   affinity:
-#   enablePodAntiAffinity: true
-#   topologyKey: failure-domain.beta.kubernetes.io/zone
+    enablePodAntiAffinity: true
+    topologyKey: failure-domain.beta.kubernetes.io/zone
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: target-env
+            operator: In
+            values:
+            - database
     tolerations:
       - key: "database"
         operator: "Equal"
@@ -41,19 +52,19 @@ spec:
       - timescaledb
       - jsquery
     parameters:
+      max_connections: "123"
 #     max_worker_processes: "60"
-      max_worker_processes: "8"
-      max_parallel_workers: "8"
-      shared_buffers: 2GB
-      effective_cache_size: 6GB
-      maintenance_work_mem: 1GB
-      work_mem: 20MB
+#     max_worker_processes: "8"
+#     max_parallel_workers: "8"
+#     shared_buffers: 2GB
+#     effective_cache_size: 6GB
+#     maintenance_work_mem: 1GB
+#     work_mem: 20MB
     pg_hba:
       # To access through TCP/IP you will need to get username
       # and password from the secret cluster-example-custom-app
       - host all all all md5
 
-
   # Example of rolling update strategy:
   # - unsupervised: automated update of the primary once all
   #                 replicas have been upgraded (default)
@@ -66,10 +77,9 @@ spec:
       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
+    size: 76Gi
 
   backup:
     volumeSnapshot:
@@ -88,11 +98,11 @@ spec:
 apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup
 metadata:
-  name: cnpg-db-tsdb-basic-backup
+  name: cnpg-db-tsdb-basic-volsnap
   namespace: cnpg-operands
 spec:
   # https://pkg.go.dev/github.com/robfig/cron#hdr-CRON_Expression_Format
-  schedule: "0 0 * * * *"
+  schedule: "0 0 */8 * * *"
   cluster:
     name: cnpg-db-tsdb-basic
   method: volumeSnapshot

package/src/helm-charts/cnpg-db-tsdb-basic/helmup.plugin

@@ -1,3 +1,3 @@
 #!/bin/bash
 #
-kubectl apply -f cnpg-db-tsdb-basic/cnpg-db-tsdb-basic.yaml $K8S_WHAT
+kubectl apply -f cnpg-db-tsdb-basic/cluster.yaml $K8S_WHAT

package/src/helm-charts/cnpg-db-tsdb-dense/{cnpg-db-tsdb-dense.yaml.ovh → cluster.yalm.ovh}

@@ -7,10 +7,13 @@ metadata:
   namespace: cnpg-operands
 spec:
   instances: 1
-  logLevel: debug
+  logLevel: info # warning debug
+
+  monitoring:
+    enablePodMonitor: false # set true once monitoring is setup
 
   description: "Leverege Dense Timescale DB"
-  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.1-cnpg-tsdb2-beta.6
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.2-cnpg-tsdb2-beta.4
   bootstrap:
     initdb:
       postInitTemplateSQL:
@@ -26,8 +29,16 @@ spec:
     name: cnpg-db-tsdb-dense-postgres-pw # postgres db pw
 
   affinity:
-#   enablePodAntiAffinity: true
-#   topologyKey: failure-domain.beta.kubernetes.io/zone
+    enablePodAntiAffinity: true
+    topologyKey: failure-domain.beta.kubernetes.io/zone
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: target-env
+            operator: In
+            values:
+            - database
     tolerations:
       - key: "database"
         operator: "Equal"
@@ -53,7 +64,6 @@ spec:
       # and password from the secret cluster-example-custom-app
       - host all all all md5
 
-
   # Example of rolling update strategy:
   # - unsupervised: automated update of the primary once all
   #                 replicas have been upgraded (default)
@@ -66,10 +76,9 @@ spec:
       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
+    size: 77Gi
 
   backup:
     volumeSnapshot:
@@ -88,11 +97,11 @@ spec:
 apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup
 metadata:
-  name: cnpg-db-tsdb-dense-backup
+  name: cnpg-db-tsdb-dense-volsnap
   namespace: cnpg-operands
 spec:
   # https://pkg.go.dev/github.com/robfig/cron#hdr-CRON_Expression_Format
-  schedule: "0 0 * * * *"
+  schedule: "0 0 */8 * * *"
   cluster:
     name: cnpg-db-tsdb-dense
   method: volumeSnapshot

package/src/helm-charts/cnpg-db-tsdb-dense/helmup.plugin

@@ -1,5 +1,3 @@
 #!/bin/bash
 #
-#bindWorkloadIdentity cnpg-operands-sa cnpg-operands cnpg-db-tsdb-dense
-
-kubectl apply -f cnpg-db-tsdb-dense/cnpg-db-tsdb-dense.yaml $K8S_WHAT
+kubectl apply -f cnpg-db-tsdb-dense/cluster.yaml $K8S_WHAT