@leverege/build-tools 2.66.2 → 2.66.4

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

@@ -23,3 +23,6 @@ config:
         }
       }
     }
+
+serviceMonitor:
+  enabled: true

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

@@ -4,7 +4,7 @@ image:
 config:
   CF_TRANSPORT_CONFIG: '{
       "type": "pubsub",
-      "projectId": "OVH:<PROJECT_NAME>" ,
+      "projectId": "${PROJECT_NAME}" ,
       "keyFilename": "/home/node/unused/key.json" ,
       "publisher": {
           "batching": {
@@ -12,3 +12,6 @@ config:
           }
       }
   }'
+
+serviceMonitor:
+  enabled: true

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

@@ -4,8 +4,8 @@ showInstalling "Redis"
 
 OCI_CHART="oci://registry-1.docker.io/bitnamicharts/redis"
 
-[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="20.12.1"
+[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="20.13.4"
 
 helm upgrade --install redis $OCI_CHART       \
-             --values  redis/values.yaml \
+             --values  redis/values-local.yaml \
              --version $REDIS_CHART_VERSION $HELM_WHAT

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

@@ -4,14 +4,19 @@
 #     - npm run sequelizeRunMigrations
 #
 image:
-  tag: # v1.7.0
+  tag: # v1.14.1
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'
 
-  UPLOADER_PROJECT_ID: "OVH:<PROJECT_ID>"
-  UPLOADER_BUCKET: "OVH:<PROJECT_ID>-resource-server"
-  UPLOADER_LOCATION: "OVH:<GCE_REGION>"
+  UPLOADER_PROJECT_ID: "${PROJECT_ID}"
+  UPLOADER_BUCKET: "${PROJECT_ID}-resource-server"
+  UPLOADER_LOCATION: "${GCE_REGION}"
 
   # CNPG override
   SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql
+# SQL_READ_REPLICATION_CONFIG: '[ { "host": "cnpg-db-psql-stack-r.cnpg-operands" } ]'
+# TRANSACTION_MAX_RETRIES: "5"
+
+serviceMonitor:
+  enabled: true

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

@@ -1,8 +1,11 @@
 image:
-  tag: # v2.6.0
+  tag: # v3.6.0
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'
 
   # CNPG override
   MODELS_SEQUELIZE_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql
+
+serviceMonitor:
+  enabled: true

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

@@ -1,7 +1,7 @@
 nameOverride: transponder-bq
 
 image:
-  tag: # v5.3.4
+  tag: # v5.5.1
 
 config:
   TRANSPONDER_RUN_MODE: "bigQueryJson"
@@ -9,7 +9,7 @@ config:
 
   TRANSPORT_CONFIG: '{
     "type": "pubsub",
-    "projectId": "OVH:<PROJECT_ID>",
+    "projectId": "${PROJECT_ID}",
     "publisher": {
         "batching": {
           "maxMilliseconds": 0,
@@ -27,3 +27,6 @@ config:
     },
     "channel": "writer-bq"
   }'
+
+serviceMonitor:
+  enabled: true

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

@@ -1,7 +1,7 @@
 nameOverride: transponder-dh
 
 image:
-  tag: # v5.3.4
+  tag: # v5.5.1
 
 config:
   TRANSPONDER_RUN_MODE: "denseHistoryCombined"
@@ -19,7 +19,7 @@ config:
 
   TRANSPORT_CONFIG: '{
     "type": "pubsub",
-    "projectId": "OVH:<PROJECT_NAME>",
+    "projectId": "${PROJECT_NAME}",
     "publisher": {
         "batching": {
           "maxMilliseconds": 0,
@@ -60,3 +60,6 @@ resources:
   requests:
     cpu: 250m
     memory: 600Mi
+
+serviceMonitor:
+  enabled: true

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

@@ -1,7 +1,7 @@
 nameOverride: transponder-rt
 
 image:
-  tag: # v5.3.4
+  tag: # v5.5.1
 
 config:
   TRANSPONDER_RUN_MODE: "rt"
@@ -10,7 +10,7 @@ config:
   ELASTICSEARCH_DATA_METADATA_ENABLED: "false"
   TRANSPORT_CONFIG: '{
     "type": "pubsub",
-    "projectId": "OVH:<PROJECT_ID>",
+    "projectId": "${PROJECT_ID}",
     "publisher": {
         "batching": {
           "maxMilliseconds": 0,
@@ -28,3 +28,6 @@ config:
     },
     "channel": "writer-rt"
   }'
+
+serviceMonitor:
+  enabled: true

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

@@ -7,7 +7,7 @@
 nameOverride: transponder-tsdb
 
 image:
-  tag: # v5.3.4
+  tag: # v5.5.1
 
 config:
   TRANSPONDER_RUN_MODE: "timescale"
@@ -21,7 +21,7 @@ config:
 
   TRANSPORT_CONFIG: '{
     "type": "pubsub",
-    "projectId": "OVH:<PROJECT_ID>",
+    "projectId": "${PROJECT_ID}",
     "publisher": {
         "batching": {
           "maxMilliseconds": 0,
@@ -39,3 +39,6 @@ config:
     },
     "channel": "writer-tsdb"
   }'
+
+serviceMonitor:
+  enabled: true

package/src/helm-charts/vin-decoder-server/values-local.yaml

@@ -5,3 +5,6 @@ config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'
   PROJECT_ID: "set-in-values-local"
   SYSTEM_ID: "set-in-values-local"
+
+serviceMonitor:
+  enabled: true

package/src/helmup.sh

@@ -49,6 +49,7 @@ AUXILIARY=(
 
 # zombie-killer re-enabled 20240801
 SYSTEM=(
+  prom-operator
   elasticsearch8
   redis
   cnpg-operator
@@ -113,7 +114,7 @@ CATNAMI
 #   bindWorkloadIdentity api-server
 #
 # but in the case of services like transponder which has various flavors but
-# only the single trandponder services account we woul do:
+# only the single transponder service account we would do:
 #   bindWorkloadIdentity transponder default tranponder-rt
 #
 function bindWorkloadIdentity() {
@@ -933,13 +934,32 @@ UPGRADES_DONE
   sleep 3
 }
 
+# TODO: DRY this by coalescing with checkUpgradeNotes
+function displayBanner() {
+  BANNER="helmup-banner.txt"
+
+  [ ! -f "$BANNER" ] && return
+  BANNER_TXT=`cat $BANNER`
+
+  cat<<HELMUP_BANNER
+
+`color g "--- From $BANNER ----------------------------------------------------"`
+
+$BANNER_TXT
+
+`color g "-------------------------------------------------------------------------------"`
+HELMUP_BANNER
+}
+
 function doHelmup() {
+  local culprit="--set helmup.culprit=\"$(gcloud config get account)\""
+  local deployT="--set helmup.deployT=\"$(date -u +'%Y-%m-%dT%H:%M:%SZ')\""
   local helmup="$@"
   local doing="Helming => `color g \"$helmup\"`"
   local from=
   [ ! -z "$FROM_VERSIONS" ] && from="`color y \"<= from Versions.json\"`"
   printf "$doing $from\n"
-  eval $helmup
+  eval "$helmup $culprit $deployT"
   case "$INVOKED_AS" in
     "helmup"|"helmdn")
       sendToSlack "$helmup"
@@ -1030,7 +1050,7 @@ CATBACKUP
       "cnpg-operator")
         installCnpgOperatorEnvironment
         bootstrapLocalSetup $SERVICE
-        installCronCnpgCleanupSnapshot
+        installCnpgCleanupCronjob
         ;;
 
       "cnpg-cronjob")
@@ -1049,7 +1069,7 @@ CATBACKUP
         installDefaultConfigs
         ;;
 
-      db-curator-dh)
+      "db-curator-dh")
         # db-curator-dh is a variant of db-curator with diff controlled in values-local.yaml
         HELMUP="helm upgrade --install $SERVICE leverege/db-curator --values $SERVICE/values.yaml $CHARTVER $HELM_WHAT"
         doHelmup "$HELMUP"
@@ -1252,4 +1272,7 @@ GCP_PROJECT_ID="$(getProjectIdFromK8sContext)"
 GCE_REGION=`overwhelm -k GCE_REGION`
 
 doInstall $@
+
+displayBanner
+
 cd - &> $DEVNULL

package/src/push-my-chart.mjs

@@ -46,20 +46,29 @@ const pushItGood = async () => {
   const version = await shellCmd( 'helm version --short' )
   const pusher = ( semverLt( version, '3.7.0' ) ? 'push' : 'cm-push' )
 
+  let museumStatus = 0
   try {
     log( chalk.green( 'Pushing chart to the Chartmuseum\n' ) )
     const museum = await shellCmd( `helm ${pusher} helm leverege` )
     debug( { museum }, '<==output from helm push' )
-    if ( args.noRegistry ) {
-      log( `${chalk.bold.yellow( '\nskipping the chart push to the artifact registry' )}` )
-    } else {
-      log( chalk.green( 'Pushing chart to the Artifact Registry\n' ) )
-      const registry = await shellCmd( 'chart-to-registry' )
-      debug( { registry }, '<==chart-to-registry' )
-    }
   } catch ( ex ) {
     log( ex.stderr )
-    process.exit( 1 )
+    museumStatus = 1
+  }
+
+  if ( args.noRegistry ) {
+    log( `${chalk.bold.yellow( '\nskipping the chart push to the artifact registry' )}` )
+    process.exit( museumStatus )
+  }
+
+  try {
+    log( chalk.green( 'Pushing chart to the Artifact Registry\n' ) )
+    const registry = await shellCmd( 'chart-to-registry' )
+    debug( { registry }, '<==chart-to-registry' )
+    process.exit( museumStatus )
+  } catch ( ex ) {
+    log( ex.stderr )
+    process.exit( museumStatus + 1 )
   }
 }