@leverege/build-tools 2.99.0 → 2.99.2-quinn.1

package/lib/web/unleash.js

@@ -0,0 +1,50 @@
+#!/usr/bin/env node
+"use strict";
+
+var _execa = _interopRequireDefault(require("execa"));
+var _simpleGit = _interopRequireDefault(require("simple-git"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const git = new _simpleGit.default();
+const getCurrentBranchName = async () => {
+  const branchInfo = await git.branch();
+
+  // first check to see if there are no branches - new repo?
+  if (Object.keys(branchInfo.branches).length === 0) {
+    return '';
+  }
+  return Object.entries(branchInfo.branches).find(([name, info]) => info.current)[0];
+};
+const isProtected = async () => {
+  const theBranch = await getCurrentBranchName();
+  const protectedBranches = ['main', 'master', 'development'];
+  const additionalProtectedBranches = [...process.argv.slice(2)];
+
+  // Check if the current branch starts with any of the additional
+  // protected branch name
+  let matchesAdditionalBranch = false;
+  for (let i = 0; i < additionalProtectedBranches.length; i++) {
+    matchesAdditionalBranch = matchesAdditionalBranch || theBranch.startsWith(additionalProtectedBranches[i]);
+  }
+  return protectedBranches.includes(theBranch) || matchesAdditionalBranch;
+};
+const npmRunner = async script => {
+  try {
+    const results = await (0, _execa.default)('npm', ['run', script], {
+      stdio: 'inherit'
+    });
+    return results;
+  } catch (err) {
+    process.exit(1);
+  }
+  return undefined;
+};
+(async () => {
+  if (await isProtected()) {
+    const script = ['test', 'lint'];
+    for (let i = 0; i < script.length; i++) {
+      await npmRunner(script[i]); // eslint-disable-line no-await-in-loop
+    }
+  } else {
+    process.exit(0);
+  }
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.99.0",
+  "version": "2.99.2-quinn.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -16,7 +16,6 @@
     "prepack": "npm exec prepack"
   },
   "bin": {
-    "build-and-push": "src/build-and-push.sh",
     "build-cnpg-image": "src/build-cnpg-image.mjs",
     "build-tools": "src/build-tools.mjs",
     "change-up": "src/change-up.sh",
@@ -29,7 +28,6 @@
     "dirty-git": "src/dirty-git.sh",
     "docker-to-registry": "src/docker-to-registry.mjs",
     "docker-to-registry-py": "src/docker-to-registry-py.mjs",
-    "docker-to-registry.sh": "src/docker-to-registry.sh",
     "dockreate": "src/dockreate.sh",
     "encrypt-secrets": "src/encrypt-secrets.sh",
     "firebaseDeploy": "src/firebaseDeploy.mjs",
@@ -80,6 +78,8 @@
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
     "@leverege/jsdoc-template": "^1.0.1",
+    "@yarnpkg/core": "^4.5.0",
+    "@yarnpkg/fslib": "^3.1.4",
     "chalk": "^5.6.2",
     "command-line-args": "^6.0.1",
     "command-line-usage": "^7.0.4",

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

@@ -12,10 +12,10 @@ config:
 
 # CNPG overrides
   # stock pgsql
-  MODEL_SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands"
-  PG_MODELS_HOST: "cnpg-db-psql-stack-rw.cnpg-operands"
+  MODEL_SQL_HOST: "cnpg-db-psql-stack-pool-rw.cnpg-operands"
+  PG_MODELS_HOST: "cnpg-db-psql-stack-pool-rw.cnpg-operands"
   # timescale
-  PG_HOST: "cnpg-db-tsdb-basic-r.cnpg-operands"
+  PG_HOST: "cnpg-db-tsdb-basic-pool-r.cnpg-operands"
   # imagine db is legacy - newer setups use timescale as the db name
   PG_DATABASE: "timescale"
   PG_DENSE_HISTORY_DATABASE: "timescale"

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

@@ -10,7 +10,7 @@ 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-pool-rw.cnpg-operands" # vs postgres-postgresql
 
 serviceMonitor:
   enabled: true

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

@@ -118,3 +118,26 @@ spec:
   method: volumeSnapshot # barmanObjectStore
   backupOwnerReference: self
   immediate: true
+---
+apiVersion: postgresql.cnpg.io/v1
+kind: Pooler
+metadata:
+  name: cnpg-db-psql-stack-pool-rw
+  namespace: cnpg-operands
+spec:
+  cluster:
+    name: cnpg-db-psql-stack
+
+  instances: 2
+  type: rw
+  pgbouncer:
+    poolMode: transaction
+    parameters:
+      # https://www.pgbouncer.org/config.html#generic-settings
+      max_client_conn: "500"
+      default_pool_size: "5"
+      # https://www.pgbouncer.org/config.html#log-settings
+      log_connections: "0"
+      log_disconnections: "0"
+  monitoring:
+    enablePodMonitor: true

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

@@ -117,3 +117,26 @@ spec:
   method: volumeSnapshot # barmanObjectStore
   backupOwnerReference: self
   immediate: true
+---
+apiVersion: postgresql.cnpg.io/v1
+kind: Pooler
+metadata:
+  name: cnpg-db-tsdb-basic-pool-rw
+  namespace: cnpg-operands
+spec:
+  cluster:
+    name: cnpg-db-tsdb-basic
+
+  instances: 2
+  type: rw
+  pgbouncer:
+    poolMode: transaction
+    parameters:
+      # https://www.pgbouncer.org/config.html#generic-settings
+      max_client_conn: "500"
+      default_pool_size: "5"
+      # https://www.pgbouncer.org/config.html#log-settings
+      log_connections: "0"
+      log_disconnections: "0"
+  monitoring:
+    enablePodMonitor: true

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-pool-rw.cnpg-operands" # vs postgres-postgresql
 
 serviceMonitor:
-  enabled: false
+  enabled: true

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

@@ -7,7 +7,7 @@ config:
   UPLOADER_BUCKET: "${PROJECT_ID}-geotile-server"
 
   # CNPG override
-  SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql
+  SQL_HOST: "cnpg-db-psql-stack-pool-rw.cnpg-operands" # vs postgres-postgresql
   SQL_PASSWORD_SECRET: "cnpg-db-psql-stack-postgres-pw"
   SQL_PASSWORD_KEY: "password"
 

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

@@ -44,12 +44,22 @@ crds:
   enabled: true
   upgradeJob:
     enabled: true
-    forceConflicts: true # See README-CRD-UPGRADES.md
+    forceConflicts: false # See README-CRD-UPGRADES.md
 
 kubeControllerManager:
   enabled: false
 nodeExporter:
   enabled: false
+
+kubelet:
+  serviceMonitor:
+    metricRelabelings:
+      # prober_probe_duration_seconds is high-cardinality (1 histogram per
+      # container probe × node) and not referenced by any alerts or dashboards
+      - sourceLabels: [__name__]
+        regex: prober_probe_duration_seconds.*|kubelet_runtime_operations_duration_seconds.*
+        action: drop
+
 defaultRules:
   create: true
   rules:
@@ -61,7 +71,7 @@ defaultRules:
     kubeApiserver: true  # GPT Keep an eye on API server availability
     kubeApiserverAvailability: false
     kubeApiserverSlos: false
-    kubelet: true  # GPT Consider monitoring kubelet status, especially on scaled nodes
+    kubelet: false # GKE manages node/kubelet health; no fat nodes so pod limit irrelevant
     kubeProxy: false
     kubePrometheusGeneral: false
     kubePrometheusNodeRecording: false

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

@@ -306,8 +306,8 @@ spec:
                 VALUE = {{ $value }}
                 LABELS = {{ $labels }}
         - alert: PrometheusTimeseriesCardinality
-          expr: label_replace(count by(__name__) ({__name__=~".+"}), "name", "$1", "__name__", "(.+)") > 10000
-          for: 0m
+          expr: label_replace(count by(__name__) ({__name__=~".+"}), "name", "$1", "__name__", "(.+)") > 15000
+          for: 10m
           labels:
             severity: warning
           annotations:

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

@@ -15,7 +15,7 @@ config:
   UPLOADER_LOCATION: "${GCE_REGION}"
 
   # CNPG override
-  SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql
+  SQL_HOST: "cnpg-db-psql-stack-pool-rw.cnpg-operands" # vs postgres-postgresql
 # SQL_READ_REPLICATION_CONFIG: '[ { "host": "cnpg-db-psql-stack-r.cnpg-operands" } ]'
 # TRANSACTION_MAX_RETRIES: "5"
 

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

@@ -5,7 +5,7 @@ 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-pool-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

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

@@ -5,7 +5,7 @@ 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-pool-rw.cnpg-operands" # vs postgres-postgresql
 
 serviceMonitor:
   enabled: true

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

@@ -15,12 +15,11 @@ showInstalling "Traefik v3 Load Balancer / Router"
 
 TRAEFIK_NAMESPACE="traefik"
 
-addHelmRepo traefik https://helm.traefik.io/traefik
+OCI_CHART="oci://ghcr.io/traefik/helm/traefik"
 
-[ -z "$TRAEFIK_CHART_VERSION" ] && TRAEFIK_CHART_VERSION="38"
-helm upgrade --install traefik traefik/traefik \
+[ -z "$TRAEFIK_CHART_VERSION" ] && TRAEFIK_CHART_VERSION="38.0.2"
+
+helm upgrade --install traefik $OCI_CHART \
              --namespace $TRAEFIK_NAMESPACE --create-namespace \
              --values  traefik/values.yaml \
              --version $TRAEFIK_CHART_VERSION $HELM_WHAT
-
-removeHelmRepo traefik

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

@@ -28,7 +28,7 @@ resources:
 metrics:
   prometheus:
     serviceMonitor:
-      enabled: true # initially disabled until prometheus operator is installed
+      enabled: false # initially disabled until prometheus operator is installed
       interval: 30s
       namespace: prometheus
 

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

@@ -10,7 +10,7 @@ config:
   DENSE_HISTORY_TDB_CACHE_KEY_PREFIX: "timescale-dh"
   DENSE_HISTORY_MIGRATE_PAGE_SIZE_LIMIT: "50"
 
-  PG_HOST: "cnpg-db-tsdb-dense-rw.cnpg-operands"
+  PG_HOST: "cnpg-db-tsdb-dense-pool-rw.cnpg-operands"
 # PG_HOST: "cnpg-db-tsdb-dense-pool-rw.cnpg-operands"
 # PG_DATABASE: "timescale" # "imagine" is legacy and default
 

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

@@ -14,8 +14,8 @@ config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'
 
 # CNPG override
-  PG_HOST: "cnpg-db-tsdb-basic-rw.cnpg-operands"
-# PG_DATABASE: "timescale" # "imagine" is legacy and default
+  PG_HOST: "cnpg-db-tsdb-basic-pool-rw.cnpg-operands"
+  PG_DATABASE: "timescale" # "imagine" is legacy and default
 
   PG_PASSWORD_SECRET: "cnpg-db-tsdb-basic-postgres-pw"
   PG_PASSWORD_KEY: "password"

package/src/helmup.sh

@@ -617,6 +617,8 @@ function doHelmup() {
   local from=
   [ ! -z "$FROM_VERSIONS" ] && from="`color y \"<= from Versions.json\"`"
   printf "$doing $from\n"
+  # plugins pass HELMUP as a single quoted string - split it into args without using eval
+  [[ $# -eq 1 ]] && set -- $1
   "$@" --set "helmup.culprit=$culprit" --set "helmup.deployT=$deployT"
   
   # usually the helm command will run without error but a common failure is caused

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

@@ -1,22 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: Pooler
-metadata:
-  name: cnpg-db-psql-stack-pool-rw
-  namespace: cnpg-operands
-spec:
-  cluster:
-    name: cnpg-db-psql-stack
-
-  instances: 1
-  type: rw
-  pgbouncer:
-    poolMode: transaction
-    parameters:
-      # https://www.pgbouncer.org/config.html#generic-settings
-      max_client_conn: "500"
-      default_pool_size: "5"
-      # https://www.pgbouncer.org/config.html#log-settings
-      log_connections: "0"
-      log_disconnections: "0"
-  monitoring:
-    enablePodMonitor: true

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

@@ -1,22 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: Pooler
-metadata:
-  name: cnpg-db-tsdb-basic-pool-rw
-  namespace: cnpg-operands
-spec:
-  cluster:
-    name: cnpg-db-tsdb-basic
-
-  instances: 1
-  type: rw
-  pgbouncer:
-    poolMode: transaction
-    parameters:
-      # https://www.pgbouncer.org/config.html#generic-settings
-      max_client_conn: "500"
-      default_pool_size: "5"
-      # https://www.pgbouncer.org/config.html#log-settings
-      log_connections: "0"
-      log_disconnections: "0"
-  monitoring:
-    enablePodMonitor: true