@leverege/build-tools 2.55.2 → 2.55.4-pedro.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.55.2",
+  "version": "2.55.4-pedro.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -76,7 +76,7 @@
     "readline-sync": "^1.4.10",
     "semver": "^7.6.3",
     "simple-git": "^3.27.0",
-    "zx": "^8.1.9"
+    "zx": "^8.2.0"
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.0.1",

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

@@ -13,7 +13,7 @@ spec:
     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.3-cnpg-tsdb2-beta.2
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.4-cnpg-tsdb2-rel.1
   bootstrap:
     initdb:
 #     database: imagine # let it default to cnpg app db

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

@@ -13,7 +13,7 @@ spec:
     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.3-cnpg-tsdb2-beta.2
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.4-cnpg-tsdb2-rel.1
   bootstrap:
     initdb:
       postInitTemplateSQL:

package/src/helm-charts/cnpg-operator/helmup.plugin

@@ -1,8 +1,17 @@
 #!/bin/bash
 #
 # See => https://cloudnative-pg.io/documentation/current/installation_upgrade/
+#
+# Legacy terraformed clusters (like sandbox) may need a special firewall rule
+# added to the network layer on k8s. It should look like this:
+#
+# Name   : cnpg-operator
+# Ports  : 8000,9443     <= kubectl cnpg status and webhooks
+# Filters: 172.16.0.0/28 <= k8s control plane
+#
+OPVER="1.24.1"
 
-OPVER="1.24.0"
+createNamespaceIfNeeded cnpg-system
 
 kubectl apply --server-side -f \
     https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/release-${OPVER%.*}/releases/cnpg-${OPVER}.yaml $K8S_WHAT

package/src/helm-charts/prom-operator/apply-rules

@@ -3,6 +3,8 @@
 # Load the standard helper functions
 . `build-tools --bashfun`
 
+overwhelm
+
 RULES_DIR="prom-operator/rules"
 
 [ ! -d "$RULES_DIR" ] && errorExit "Missing rules directory [$RULES_DIR]"

package/src/helm-charts/prom-operator/helmup.plugin

@@ -5,23 +5,23 @@ addHelmRepo prometheus-community https://prometheus-community.github.io/helm-cha
 
 showInstalling "The Prometheus Operator (kube-prometheus-stack)"
 [ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="65"
-helm upgrade --install prometheus-stack prometheus-community/kube-prometheus-stack \
-             --namespace prometheus --create-namespace \
-             --values  prom-operator/prometheus-stack.yaml \
-             --version $PROMETHEUS_STACK_CHART_VERSION $HELM_WHAT
+
+NS="--namespace prometheus"
+
+helm upgrade $NS --install prometheus-stack prometheus-community/kube-prometheus-stack \
+                 --values  prom-operator/prometheus-stack.yaml \
+                 --version $PROMETHEUS_STACK_CHART_VERSION $HELM_WHAT
 
 showInstalling "The Elasticsearch Exporter (prom-operator)"
 [ -z "$ELASTICSEARCH_EXPORTER_CHART_VERSION" ] && ELASTICSEARCH_EXPORTER_CHART_VERSION="6"
-helm upgrade --install elasticsearch8-exporter prometheus-community/prometheus-elasticsearch-exporter \
-             --namespace prometheus --create-namespace \
-             --values prom-operator/elasticsearch-exporter.yaml \
-             --version $ELASTICSEARCH_EXPORTER_CHART_VERSION $HELM_WHAT
+helm upgrade $NS --install elasticsearch8-exporter prometheus-community/prometheus-elasticsearch-exporter \
+                 --values prom-operator/elasticsearch-exporter.yaml \
+                 --version $ELASTICSEARCH_EXPORTER_CHART_VERSION $HELM_WHAT
 
 showInstalling "The Stackdriver Exporter (prom-operator)"
 [ -z "$STACKDRIVER_EXPORTER_CHART_VERSION" ] && STACKDRIVER_EXPORTER_CHART_VERSION="4"
-helm upgrade --install stackdriver-exporter prometheus-community/prometheus-stackdriver-exporter \
-             --namespace prometheus --create-namespace \
-             --values prom-operator/stackdriver-exporter.yaml \
-             --version $STACKDRIVER_EXPORTER_CHART_VERSION $HELM_WHAT
+helm upgrade $NS --install stackdriver-exporter prometheus-community/prometheus-stackdriver-exporter \
+                 --values prom-operator/stackdriver-exporter.yaml \
+                 --version $STACKDRIVER_EXPORTER_CHART_VERSION $HELM_WHAT
 
 removeHelmRepo prometheus-community

package/src/helm-charts/prom-operator/rules/gitignore

@@ -0,0 +1 @@
+*.yaml

package/src/helm-charts/prom-operator/{rules/test-alert.yaml → test-alert.yaml}

@@ -1,3 +1,7 @@
+#
+# test with => kubectl apply  -f prom-operator/test-alert.yaml
+# delete it => kubectl delete -f prom-operator/test-alert.yaml
+#
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

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

@@ -17,7 +17,7 @@ TRAEFIK_NAMESPACE="traefik"
 
 addHelmRepo traefik https://helm.traefik.io/traefik
 
-[ -z "$TRAEFIK_CHART_VERSION" ] && TRAEFIK_CHART_VERSION="32"
+[ -z "$TRAEFIK_CHART_VERSION" ] && TRAEFIK_CHART_VERSION="33"
 helm upgrade --install traefik traefik/traefik \
              --namespace $TRAEFIK_NAMESPACE --create-namespace \
              --values  traefik/traefik-local.yaml \

package/src/refresh-py-idx.sh

@@ -58,7 +58,11 @@ function leveregeBuildToolsRefreshPyIdx() {
 
       if [ -f "$CONFIG_FILE" ]; then
         if grep -q "export UV_EXTRA_INDEX_URL=" "$CONFIG_FILE"; then
-          sed -i '' "s|export UV_EXTRA_INDEX_URL=.*|export UV_EXTRA_INDEX_URL=${UV_EXTRA_INDEX_URL}|" "$CONFIG_FILE"
+          if [[ "$OSTYPE" == "darwin"* ]]; then
+            sed -i '' "s|export UV_EXTRA_INDEX_URL=.*|export UV_EXTRA_INDEX_URL=${UV_EXTRA_INDEX_URL}|" "$CONFIG_FILE"
+          else
+            sed -i "s|export UV_EXTRA_INDEX_URL=.*|export UV_EXTRA_INDEX_URL=${UV_EXTRA_INDEX_URL}|" "$CONFIG_FILE"
+          fi
         else
           echo -e "\nexport UV_EXTRA_INDEX_URL=${UV_EXTRA_INDEX_URL}\n" >> "$CONFIG_FILE"
         fi

package/registry-compass.yaml

@@ -1,20 +0,0 @@
-registry:
-  - root: us-docker.pkg.dev
-  - repositories:
-    - name: stack
-      charts:
-        - api-server
-        - authz-server
-        - emailer
-        - message-processor
-    - name: leverege
-      charts:
-        - pubsub-pulse
-        - pusher
-        - overdose
-    - name: cox-health
-      charts:
-        - actions-server
-        - analytics-server
-        - centrak-healthz
-        - centrak-ingestor

package/src/chart-compass.mjs

@@ -1,96 +0,0 @@
-#!/usr/bin/env node
-/*
- * chart-to-registry will...
- */
-import fs from 'node:fs'
-
-import chalk from 'chalk'
-import commandLineArgs from 'command-line-args'
-import commandLineUsage from 'command-line-usage'
-import { lt as semverLt } from 'semver'
-import YAML from 'js-yaml'
-
-import {
-  condir,
-  debug,
-  errorExit,
-  log,
-  warning,
-  getGitRootDirectory,
-  parsePackageJson,
-  parseHelmChart,
-  shellCmd } from './Utils.mjs'
-
-const commandLineOptions = [ // Use commandLineOptions to tie into the Usage statements
-  /* eslint-disable max-len */
-  {
-    name : 'location',
-    type : String,
-    description : '{green the location of the artifact registry the chart will be pushed to (default us-docker.pkg.dev)}',
-  },
-  {
-    name : 'project',
-    type : String,
-    description : '{green the name of the google project containing the npmrc and slack config secrets (default leverege-registry)}',
-  },
-  {
-    name : 'repository',
-    type : String,
-    description : '{green the target repository to receive the pushed chart}',
-  },
-  {
-    name : 'dry-run',
-    type : Boolean,
-    description : '{yellow perform everything except the actual chart push}',
-  },
-  {
-    name : 'help',
-    type : Boolean,
-    description : '{green display this help screen}',
-  },
-  /* eslint-enable max-len */
-]
-
-const sections = [
-  {
-    header : 'Leverege Helm Chart Compass (for helmup)',
-    content : `{green This tool helps helmup navigate the helm charts stored in the
-artifact-registries.}`
-  },
-  { header : 'Options',
-    optionList : commandLineOptions,
-  },
-]
-
-const args = commandLineArgs( commandLineOptions, { camelCase : true, partial : true } )
-const usage = commandLineUsage( sections )
-
-if ( args.help ) {
-  log( usage )
-  process.exit( 0 )
-}
-
-/* eslint-disable no-underscore-dangle */
-if ( args._unknown ) {
-  log( usage )
-  log( `\nUnrecognized argument [${chalk.bold.red( args._unknown )}]\n` )
-  process.exit( 1 )
-}
-/* eslint-enable no-underscore-dangle */
-
-const minNodejsVersion = '18.0.0'
-if ( semverLt( process.version, minNodejsVersion ) ) {
-  errorExit( `\n***ERROR: must be running at least node ${minNodejsVersion}\n` )
-}
-
-// First of all, fail if we are not in a git repository
-let gitRoot
-try {
-  gitRoot = await getGitRootDirectory()
-} catch ( error ) {
-  errorExit( chalk.red.bold( error ), { errorCode : 5 } )
-}
-
-const chartCompass = YAML.load( fs.readFileSync( './registry-compass.yaml', 'utf8' ) )
-
-condir( { chartCompass }, '<==Navigation' )