@leverege/build-tools 2.66.1 → 2.66.3

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

@@ -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/velero/helmup.plugin

@@ -4,7 +4,7 @@ showInstalling "Velero Backup System"
 
 addHelmRepo vmware-tanzu https://vmware-tanzu.github.io/helm-charts
 
-[ -z "$VELERO_CHART_VERSION" ] && VELERO_CHART_VERSION="8"
+[ -z "$VELERO_CHART_VERSION" ] && VELERO_CHART_VERSION="9"
 #
 # Build the bucket, region and SA email variables and use --set to mod the
 # chart values as opposed to using an OVH:<label> approach. This eliminates

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

@@ -113,7 +113,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() {
@@ -791,7 +791,7 @@ function installVeleroEnvironment() {
   gcloud config set project $GCP_PROJECT_ID
 
   ## The major chart version will determine the bucket suffix
-  [ -z "$VELERO_CHART_VERSION" ] && VELERO_CHART_VERSION="8"
+  [ -z "$VELERO_CHART_VERSION" ] && VELERO_CHART_VERSION="9"
 
   ## Create a bucket
   BUCKET="$GCP_PROJECT_ID-velero-$VELERO_CHART_VERSION"
@@ -933,13 +933,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"
@@ -1049,7 +1068,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 +1271,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 )
   }
 }
 

package/src/awesome-fetch.mjs

@@ -1,44 +0,0 @@
-#!/usr/bin/env node
-
-import fs from 'node:fs'
-import yaml from 'js-yaml'
-
-const SOURCE_URL = 'https://raw.githubusercontent.com/samber/awesome-prometheus-alerts/master/dist/rules/kubernetes/kubestate-exporter.yml'
-const OUTPUT_FILE = 'converted-alerts.yaml'
-
-async function fetchAndConvert() {
-  /* eslint-disable no-console */
-  try {
-    console.log( `Fetching YAML from ${SOURCE_URL}...` )
-    const response = await fetch( SOURCE_URL )
-    if ( !response.ok ) throw new Error( `Failed to fetch: ${response.statusText}` )
-
-    const rawYaml = await response.text()
-    const parsedYaml = yaml.load( rawYaml )
-    if ( !parsedYaml.groups ) throw new Error( 'Invalid YAML structure, missing "groups"' )
-
-    // Reformat into PrometheusRule CRD format
-    const prometheusRule = {
-      apiVersion : 'monitoring.coreos.com/v1',
-      kind : 'PrometheusRule',
-      metadata : {
-        name : 'node-alerts', // Adjust based on the source
-      },
-      spec : {
-        groups : parsedYaml.groups.map( group => ( {
-          name : `${group.name}-rules`,
-          rules : group.rules,
-        } ) ),
-      },
-    }
-
-    // Convert back to YAML with proper formatting
-    const formattedYaml = yaml.dump( prometheusRule, { noRefs : true, indent : 0 } )
-    fs.writeFileSync( OUTPUT_FILE, formattedYaml, 'utf8' )
-    console.log( `Converted YAML written to ${OUTPUT_FILE}` )
-  } catch ( error ) {
-    console.error( 'Error processing YAML:', error.message )
-  }
-}
-
-fetchAndConvert()

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

@@ -1,15 +0,0 @@
-#!/bin/bash
-#
-# Load the standard helper functions
-. `build-tools --bashfun`
-
-overwhelm
-
-RULES_DIR="prom-operator/rules"
-
-[ ! -d "$RULES_DIR" ] && errorExit "Missing rules directory [$RULES_DIR]"
-
-for ruleset in $RULES_DIR/*.yaml; do
-  printf "  Applying rules => `color g $ruleset`\n"
-  kubectl apply -n prometheus -f $ruleset
-done

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

@@ -1,2 +0,0 @@
-prometheus-stack.yaml
-stackdriver-exporter.yaml