@leverege/build-tools 2.98.0 → 2.98.1

package/.vscode/launch.json

@@ -18,6 +18,16 @@
       },
       "outputCapture": "std"
     },
+    {
+      "name": "push-my-chart rsrc-srvr",
+      "type": "node",
+      "request": "launch",
+      "program": "${workspaceFolder}/src/push-my-chart.mjs",
+      "args": [],
+      "cwd": "/Users/john/Work/leverege/cicd/@plt/resource-server",
+      "runtimeExecutable": "node",
+      "console": "integratedTerminal"
+    },
     {
       "name": "ingestor in monorepo",
       "type": "node",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.98.0",
+  "version": "2.98.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -21,7 +21,6 @@
     "build-tools": "src/build-tools.mjs",
     "change-up": "src/change-up.sh",
     "chart-compass": "src/chart-compass.mjs",
-    "chart-to-museum": "src/chart-to-museum.mjs",
     "chart-to-registry": "src/chart-to-registry.mjs",
     "circleate": "src/circleate.sh",
     "clone-cnpg-from-snapshot": "src/clone-cnpg-from-snapshot.mjs",
@@ -104,7 +103,7 @@
     "readline-sync": "^1.4.10",
     "semver": "^7.7.4",
     "shell-quote": "^1.8.3",
-    "simple-git": "^3.32.3",
+    "simple-git": "^3.33.0",
     "sloc": "^0.3.2",
     "superstruct": "^2.0.2",
     "tmp": "^0.2.5",
@@ -116,6 +115,6 @@
     "@leverege/eslint-config-leverege": "^5.1.2",
     "chai": "^6.2.2",
     "mocha": "^11.7.5",
-    "npm": "^11.11.0"
+    "npm": "^11.11.1"
   }
 }

package/src/Utils.mjs

@@ -10,6 +10,7 @@ import { glob } from 'glob'
 import { packageUp } from 'package-up'
 import { parse } from 'shell-quote'
 import toml from 'toml'
+import semver from 'semver'
 import YAML from 'js-yaml'
 
 // __dirname goes away with ESM so we take this approach instead and
@@ -544,15 +545,14 @@ export const parseHelmChart = async ( helmroot = './helm' ) => {
   let depsOutOfSync = hasDependencies // assume unsynced if dependencies
   if ( chartFiles.includes( 'Chart.lock' ) ) {
     const chartLock = YAML.load( fs.readFileSync( `${helmroot}/Chart.lock`, 'utf8' ) )
-    // Using Object.fromEntries will be able to handle multiple dependencies if ever needed
-    const chartDeps = Object.fromEntries(
-      chartYaml.dependencies.map( d => [ d.name, d.version ] )
-    )
+
     const lockDeps = Object.fromEntries(
       chartLock.dependencies.map( d => [ d.name, d.version ] )
     )
-    const mismatches = Object.entries( chartDeps ).filter( ( [ name, version ] ) => {
-      return lockDeps[name] !== version
+
+    const mismatches = chartYaml.dependencies.filter( ( { name, version } ) => {
+      const lockedVersion = lockDeps[name]
+      return !lockedVersion || !semver.satisfies( lockedVersion, version )
     } )
     
     depsOutOfSync = mismatches.length > 0

package/src/chart-to-museum.mjs

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
-
+// *** DEPRECATED: this goes away when we move away from the chart museum and
+// push-my-chart already handles this a artifact pushes
+//
 import chalk from 'chalk'
 import commandLineArgs from 'command-line-args'
 import commandLineUsage from 'command-line-usage'

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

@@ -8,7 +8,7 @@ showInstalling "The Prometheus Operator (kube-prometheus-stack)"
 
 # https://artifacthub.io/packages/helm/prometheus-community/kube-prometheus-stack
 OCI_CHART="oci://ghcr.io/prometheus-community/charts/kube-prometheus-stack"
-[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="82.9.0"
+[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="82.10.3"
 helm upgrade $NS --install prometheus-stack $OCI_CHART \
                  --values  prom-operator/prometheus-stack.yaml \
                  --version $PROMETHEUS_STACK_CHART_VERSION $HELM_WHAT

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

@@ -146,7 +146,7 @@ extraManifests:
         - websecure
       routes:
       - kind: Rule
-        match: Host(`${PROJECT_ID}-prometheus.${HOST}.com`)
+        match: Host(`${PROJECT_NAME}-prometheus.${HOST}.com`)
         middlewares:
           - name: basic-auth
         services:
@@ -224,7 +224,7 @@ alertmanager:
         slack_configs:
           - channel: "${SLACK_CHANNEL}"
             api_url: "${SLACK_HOOK_URL}"
-            username: "${PROJECT_ID}"
+            username: "${PROJECT_NAME}"
             send_resolved: true
             title: '{{ .CommonLabels.alertname }} alert'
             title_link: '#'
@@ -261,7 +261,7 @@ alertmanager:
               {{- end }}
 
               {{- if .Labels.pod }}
-              *Pod Link:* *<https://console.cloud.google.com/kubernetes/pod/${GCE_REGION}/${CLUSTER_NAME}/{{ .Labels.namespace }}/{{ .Labels.pod }}?project=${PROJECT_ID}|`{{ .Labels.pod }}`>*
+              *Pod Link:* *<https://console.cloud.google.com/kubernetes/pod/${GCE_REGION}/${CLUSTER_NAME}/{{ .Labels.namespace }}/{{ .Labels.pod }}?project=${PROJECT_NAME}|`{{ .Labels.pod }}`>*
               {{- end }}
 
               *Status:* `{{ .Status }}` | *Severity:* `{{ .Labels.severity }}` {{- if .Labels.container }} *Container:* `{{ .Labels.container }}` {{- end }}

package/src/helm-charts/prom-operator/stackdriver-exporter.yaml.ovh

@@ -5,7 +5,7 @@
 fullnameOverride: "prometheus-stack-stackdriver-metrics"
 
 stackdriver:
-  projectId: "${PROJECT_NAME}"
+  projectId: "${PROJECT_ID}"
   metrics:
     typePrefixes:  >
       agent.googleapis.com/cpu/utilization,

package/src/helm-charts/valkey/valkey-local.yaml

@@ -18,7 +18,7 @@ primary:
   replicaCount: 1
 
 # https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
-  resourcesPreset: "small"
+  resourcesPreset: "medium"
 # resources:
 #   requests:
 #     cpu: 250m
@@ -54,7 +54,7 @@ replica:
   replicaCount: 1
 
 # https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
-  resourcesPreset: "micro"
+  resourcesPreset: "medium"
 # resources:
 #   requests:
 #     cpu: 250m

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

@@ -5,8 +5,8 @@ showInstalling "Velero Backup System"
 # We use a specific version for the velero chart because we need to control
 # the version of the locally installed velero client application.
 #
-VELERO_CHART_VERSION="11.3.2"
-EXPECTED_CLIENT_VERSION="v1.17.2"
+VELERO_CHART_VERSION="11.4.0"
+EXPECTED_CLIENT_VERSION="v1.18.0"
 
 addHelmRepo vmware-tanzu https://vmware-tanzu.github.io/helm-charts
 

package/src/helmup.sh

@@ -522,7 +522,6 @@ function getServiceAndChartInfo() {
     CHARTVER="$(jq -r --arg svc "$SERVICE" '.[$svc].chart // empty' "$versions_file")"
     [[ -n "$CHARTVER" ]] && FROM_VERSIONS=1
   fi
-
   return 0
 }
 
@@ -687,6 +686,7 @@ REBOOTSTRAP
       transponder-*)
         # transponders use the same chart but different deployment name
         [ ! -d $SERVICE ] && bootstrapLocalSetup $SERVICE
+        CHARTLOC="oci://us-docker.pkg.dev/leverege-registry/stack/charts/transponder" # always use art-reg
         HELMUP="helm upgrade --install $SERVICE $CHARTLOC --values $SERVICE/values.yaml $CHARTVER $HELM_WHAT"
         doHelmup "$HELMUP"
         ;;

package/src/init-my-chart/Chartwright.mjs

@@ -31,9 +31,16 @@ const PRESERVE_SECTIONS = new Set( [
 ] )
 
 // Helper functions
-const warnDeprecatedSections = ( doc, sections ) => {
+const OBSOLETE_SECTIONS = [
+  'ingressRoute',
+  'loadbalancer',
+  'udploadbalancer',
+  'podAnnotations',
+  'workloadIdentity'
+]
+const warnDeprecatedSections = ( doc ) => {
   let deprecationWarningShown = false
-  for ( const key of sections ) {
+  for ( const key of OBSOLETE_SECTIONS ) {
     if ( !doc.has( key ) ) continue
     Utils.log( `${chalk.yellow.bold( '⚠️  WARNING:' )} Deprecated values.yaml section detected => ${chalk.red.bold( key )}` )
     deprecationWarningShown = true
@@ -138,10 +145,10 @@ export class Chartwright {
     // Now we need to smart merge the values.yaml template while preserving existing sections
     const baseValuesDoc = YAML.parseDocument( this.templates.Values )
     const existingValuesDoc = YAML.parseDocument( ValuesText )
-    // prune obsolete sections and write the merged values.yaml back to disk, preserving formatting and comments
-    const OBSOLETE_SECTIONS = [ 'ingressRoute', 'loadbalancer', 'udploadbalancer' ]
-    warnDeprecatedSections( existingValuesDoc, OBSOLETE_SECTIONS )
-
+    // warn about obsolete sections
+    warnDeprecatedSections( existingValuesDoc )
+    
+    // Merge legacy values.yaml with new base, preserving formatting and comments
     this.mergeTopLevelAddMissing( baseValuesDoc, existingValuesDoc )
     this.applyPreserveSections( baseValuesDoc, existingValuesDoc )
 

package/src/init-my-chart/values.yaml.hbs

@@ -104,7 +104,3 @@ affinity: {}
 tolerations: []
 
 nodeSelector: {}
-
-podAnnotations: {}
-
-workloadIdentity: {}

package/src/push-my-chart.mjs

@@ -3,9 +3,14 @@
 import chalk from 'chalk'
 import commandLineArgs from 'command-line-args'
 import commandLineUsage from 'command-line-usage'
-import { lt as semverLt } from 'semver'
 
-import { debug, log, shellCmd } from './Utils.mjs'
+import {
+  debug,
+  errorExit,
+  log,
+  parseHelmChart,
+  shellCmd
+} from './Utils.mjs'
 
 const commandLineOptions = [
   {
@@ -48,34 +53,46 @@ if ( args.help ) {
   process.exit( 0 )
 }
 
-const pushItGood = async () => {
-  const version = await shellCmd( 'helm version --short' )
-  const pusher = ( semverLt( version, '3.7.0' ) ? 'push' : 'cm-push' )
+const {
+  chartName,
+  chartVersion,
+  depsOutOfSync,
+} = await parseHelmChart( args.chart )
 
-  let museumStatus = 0
+log( chalk.green( `Chart   => ${chalk.bold.yellow( chartName )}` ) )
+log( chalk.green( `Version => ${chalk.bold.yellow( chartVersion )}` ) )
+
+if ( depsOutOfSync ) {
   try {
-    log( chalk.green( 'Pushing chart to the Chartmuseum\n' ) )
-    const museum = await shellCmd( `helm ${pusher} ${args.chart} leverege` )
-    debug( { museum }, '<==output from helm push' )
-  } catch ( ex ) {
-    log( ex.stderr )
-    museumStatus = 1
+    log( chalk.yellow.bold( '\nChart dependedencies are out of sync - updating...\n' ) )
+    await shellCmd( 'helm dependency update ./helm', { stdio : 'inherit' } )
+  } catch ( error ) {
+    errorExit( error )
   }
+}
 
-  if ( args.noRegistry ) {
-    log( `${chalk.bold.yellow( '\nskipping the chart push to the artifact registry' )}` )
-    process.exit( museumStatus )
-  }
+let museumStatus = 0
+try {
+  log( chalk.green( '  ... pushing to the Museum' ) )
+  const museum = await shellCmd( `helm cm-push ${args.chart} leverege` )
+  debug( { museum }, '<==output from helm push' )
+} catch ( ex ) {
+  // log( ex.stderr )
+  log( ex.message )
+  museumStatus = 1
+}
 
-  try {
-    log( chalk.green( 'Pushing chart to the Artifact Registry\n' ) )
-    const registry = await shellCmd( `chart-to-registry --chart ${args.chart}` )
-    debug( { registry }, '<==chart-to-registry' )
-    process.exit( museumStatus )
-  } catch ( ex ) {
-    log( ex.stderr )
-    process.exit( museumStatus + 1 )
-  }
+if ( args.noRegistry ) {
+  log( `${chalk.bold.yellow( '\nskipping the chart push to the artifact registry' )}` )
+  process.exit( museumStatus )
 }
 
-pushItGood()
+try {
+  log( chalk.green( '  ... pushing to the Artifact Registry' ) )
+  const registry = await shellCmd( `chart-to-registry --chart ${args.chart}` )
+  debug( { registry }, '<==chart-to-registry' )
+  process.exit( museumStatus )
+} catch ( ex ) {
+  log( ex.stderr )
+  process.exit( museumStatus + 1 )
+}