@leverege/build-tools 2.59.0-beta.4 → 2.59.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.59.0-beta.4",
+  "version": "2.59.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -27,6 +27,7 @@
     "encrypt-secrets": "src/encrypt-secrets.sh",
     "firebaseDeploy": "src/firebaseDeploy.mjs",
     "firebaseServe": "src/firebaseServe.mjs",
+    "generate-docs": "src/generate-docs.mjs",
     "getfbcfg": "src/getfbcfg.mjs",
     "getjson": "src/getjson.mjs",
     "git-tar": "src/git-tar.sh",
@@ -59,8 +60,9 @@
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
     "@google-cloud/artifact-registry": "^3.5.0",
+    "@leverege/jsdoc-template": "^1.0.1",
     "ansi-colors": "^4.1.3",
-    "chalk": "^5.3.0",
+    "chalk": "^5.4.1",
     "command-line-args": "^6.0.1",
     "command-line-usage": "^7.0.3",
     "deepmerge": "^4.3.1",
@@ -68,8 +70,9 @@
     "execa": "^9.5.2",
     "glob": "^11.0.0",
     "handlebars": "^4.7.8",
-    "inquirer": "^12.2.0",
+    "inquirer": "^12.3.0",
     "js-yaml": "^4.1.0",
+    "jsdoc": "^4.0.4",
     "ms": "^2.1.3",
     "npm-registry-fetch": "^18.0.2",
     "package-up": "^5.0.0",
@@ -78,10 +81,10 @@
     "readline-sync": "^1.4.10",
     "semver": "^7.6.3",
     "simple-git": "^3.27.0",
-    "zx": "^8.2.4"
+    "zx": "^8.3.0"
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.0.1",
-    "npm": "^10.9.2"
+    "npm": "^11.0.0"
   }
 }

package/src/Docker.mjs

@@ -1,6 +1,4 @@
 import fs from 'node:fs'
-import path from 'node:path'
-import url from 'node:url'
 
 import chalk from 'chalk'
 import handlebars from 'handlebars'
@@ -15,15 +13,80 @@ import {
   warning
 } from './Utils.mjs'
 
-const DIRNAME = path.dirname( url.fileURLToPath( import.meta.url ) )
-
 // TODO: change default to node 22 (jod) after 01/01/25
-const dockerfileNodeVersion = process.env.USE_NODEJS_22 ? 'jod-alpine' : 'iron-alpine'
+const dockerfileNodeVersion = 'jod-alpine'
 
 // The contents of these variables were initially located in files that live in
 // the build-tools repository, but it just became simpler to pull the contents
 // directly into these variables and forego the file loading.
 //
+const dockerfileTemplate = `
+# Version {{regvers}} @ {{date}}
+#
+# The FROM directive sets the Base Image for subsequent instructions
+FROM node:{{nodeimage}} as intermediate
+ENV NODE_ENV production
+ENV NPM_CONFIG_USERCONFIG /usr/src/app/.npmrc
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+# Install app dependencies
+COPY ./workspace/ /usr/src/app/
+ENV GRPC_VERBOSITY ERROR
+
+# --------------------------------------------------------------
+# copy the ssh keys into place, npm install, and remove them
+# --------------------------------------------------------------
+
+# Install packages to install private repos with ssh keys
+COPY ./.npmrc \${NPM_CONFIG_USERCONFIG}
+RUN apk --no-cache add openssh-client && \
+    apk --update add --no-cache --virtual build-dep g++ gcc libgcc \\
+      libstdc++ linux-headers make {{apkadds}} && \
+    npm install -g {{npmVersion}}
+
+{{preInstallPluginfile}}
+
+# Use SKIP_PREPARE to disable hook-and-release from running
+ENV SKIP_PREPARE=true
+
+# Do the clean install and remove the npm token and ssh keys from the image
+RUN npm ci --only=production --no-optional {{npmlogging}} && \
+    rm -f \${NPM_CONFIG_USERCONFIG} /root/.ssh/*
+
+# --------------------------------------------------------------
+# Docker Final Stage
+# --------------------------------------------------------------
+
+FROM node:{{nodeimage}}
+ENV NPM_CONFIG_USERCONFIG /usr/src/app/.npmrc
+
+# Copy .npmrc for private registry access for access to any @leverege packages
+COPY ./.npmrc \${NPM_CONFIG_USERCONFIG}
+
+# Install tini for PID 1 and replace shell with bash so we can source files
+RUN apk update && \
+    apk add --no-cache bash curl tini vim {{apkadds}} && \
+    npm install -g {{npmVersion}} && \
+    rm /bin/sh && ln -s /bin/bash /bin/sh && \
+    mkdir -p /usr/src/app /tmp/levlog && \
+    chown node:node /usr/src/app
+
+# Pull in the Dockerfile.plugin file here
+{{pluginfile}}
+
+# Eliminate the sensitive info from the final stage image
+RUN rm -f \${NPM_CONFIG_USERCONFIG}
+
+ENTRYPOINT [ "/sbin/tini", "--" ]
+WORKDIR /usr/src/app
+
+COPY --chown=node:node --from=intermediate /usr/src/app /usr/src/app
+
+USER {{runuser}}
+COPY ./bashrc /home/node/.bashrc
+CMD [ "/bin/bash", "-c", "source /home/node/.bashrc && node index.js" ]`
 
 const pluginTemplate = `
 # Dockerfile.plugin - optionally extend the service Docker image
@@ -40,16 +103,74 @@ const pluginTemplate = `
 # footprints small, so adding packages "just because" is not considered
 # a best practice.
 `
-const dockerfileTemplate = fs.readFileSync( path.join( DIRNAME, './templates/dockerfileTemplate.hbs' ), 'utf8' )
-const bashrcTemplate = fs.readFileSync( path.join( DIRNAME, './templates/bashrcTemplate.hbs' ), 'utf8' )
-const cloudBuildSteps = fs.readFileSync( path.join( DIRNAME, './templates/cloudBuildSteps.hbs' ), 'utf8' )
+
+const bashrcTemplate = `#!/bin/bash
+#
+alias h=history
+
+alias ls='ls -CF --color=auto'
+alias ll='ls -lh'
+alias lla='ls -lha'
+alias glep='grep -l -s'
+alias m=less
+alias menv='env | sort | less'
+
+alias whatsmyip='wget -qO- ifconfig.co'
+
+alias err='wget -q -O- localhost:5111/logLevel/error'
+alias wrn='wget -q -O- localhost:5111/logLevel/warn'
+alias inf='wget -q -O- localhost:5111/logLevel/info'
+alias dbg='wget -q -O- localhost:5111/logLevel/debug'
+alias trc='wget -q -O- localhost:5111/logLevel/trace'
+
+socks()
+{
+  netstat -ant | awk '{print }' | sort | uniq -c | sort -n
+}
+
+cmetrics()
+{
+  wget -qO- localhost:5111/metrics
+}
+
+cmstat()
+{
+  wget -qO- localhost:5111
+}
+
+cmclear()
+{
+  # Future me - thinking this should call cmstat and pass in the endpoint as
+  # a parameter? Well don't do it - without escaping the dollar 1 in cmstat
+  # the port will end up being 51111, and escaping causes linting to complain
+  # about unnecessary escaping.
+  wget -qO- localhost:5111/status/clear
+}
+
+dunm() {
+  du -sh /usr/src/app/node_modules/* | sort -sh
+}
+`
+const cloudBuildSteps = `
+steps:
+  - name: 'gcr.io/cloud-builders/docker'
+    args:
+      - 'build' 
+      - '--network=cloudbuild'
+      - '-t'
+      - '{{imageName}}:{{imageVersion}}'
+      - '.'
+    
+images:
+  - '{{imageName}}:{{imageVersion}}'
+`
 
 const defaultSettings = {
   apkadds : '',
   date : getDateTimestamp(),
-  nodeimage : process.env.USE_NODEJS_22 ? 'jod-alpine' : 'iron-alpine',
-  imageBase : process.env.USE_NODEJS_22 ? 'node:jod-alpine' : 'node:iron-alpine',
+  nodeimage : 'jod-alpine',
   npmlogging : process.env.VERBOSE_NPM_LOGGING ? '--ddd' : '--silent',
+  npmVersion : 'npm@11',
   pluginfile : '# NO PLUGIN',
   preInstallPluginfile : '# NO PRE-INSTALL PLUGIN',
   regvers : 'package.version',
@@ -75,7 +196,7 @@ const generateDockerfile = ( options ) => {
   if ( !settings.nodeimage ) {
     settings.nodeimage = dockerfileNodeVersion
   }
-  settings.image = settings.imageBase || `node:${settings.nodeimage}`
+
   // Ensure the presence of the docker dir with plugin and bashrc - this code
   // could probably be tightened up a little.
   try {
@@ -86,9 +207,7 @@ const generateDockerfile = ( options ) => {
   }
 
   const bashrcFile = './docker/bashrc'
-  // DISABLING exists check. With addition of Bashrc.plugin, the file needs to
-  // always be created or we encounter errors
-  if ( true ) { // !fs.existsSync( bashrcFile ) ) {
+  if ( !fs.existsSync( bashrcFile ) ) {
     let bf = bashrcTemplate
     const bashrcFilePlugin = './docker/Bashrc.plugin'
     if ( fs.existsSync( bashrcFilePlugin ) ) {

package/src/Utils.mjs

@@ -1,4 +1,6 @@
 import { existsSync, readdirSync, readFileSync } from 'node:fs'
+import path from 'node:path'
+import url from 'node:url'
 
 import chalk from 'chalk'
 import { $ } from 'execa'
@@ -7,6 +9,10 @@ import { glob } from 'glob'
 import { packageUp } from 'package-up'
 import YAML from 'js-yaml'
 
+// __dirname goes away with ESM so we take this approach instead and
+// this assumes this file lives in the src dir of the build-tools repo
+export const BUILD_TOOLS_ROOT = path.dirname( url.fileURLToPath( import.meta.url ) )
+
 let debugEnabled = process.env.BUILD_TOOLS_DEBUG === '1'
 
 export const enableDebug = () => { debugEnabled = true }
@@ -471,7 +477,7 @@ export const analyzeRepository = async ( giveGuidance ) => {
     await shellCmd( 'npm run build' )
   }
 
-  const buildToolsVersion = closestPackageJson.devDependencies['@leverege/build-tools']
+  const buildToolsVersion = closestPackageJson.devDependencies['@leverege/build-tools'] || closestPackageJson.dependencies['@leverege/build-tools']
   if ( !buildToolsVersion ) {
     errorExit( 'Error: missing devDependency for @leverege/build-tools in package.json' )
   }

package/src/build-cnpg-image.mjs

@@ -0,0 +1,167 @@
+#!/usr/bin/env node
+
+// A simple utility for easily building CNPG based psql images. The resultant
+// image will contain PostgreSQL, the JS query and Timescale extensions, and
+// the extensions that are required by CNPG like barman, pgaudit, pgvector and
+// pg-failover-slots.
+//
+// Latest Versions:
+//   postgres    => https://www.postgresql.org/
+//   timescale   => https://docs.timescale.com/about/latest/
+//   CNPG images => https://github.com/cloudnative-pg/postgres-containers/pkgs/container/postgresql
+
+import fs from 'node:fs'
+import path from 'node:path'
+
+import chalk from 'chalk'
+import cliArgs from 'command-line-args'
+import cliHelp from 'command-line-usage'
+import Handlebars from 'handlebars'
+
+import {
+  debug,
+  log,
+  err,
+  errorExit,
+  shellCmd,
+} from './Utils.mjs'
+
+// Define CLI options
+const optionList = [
+  { name : 'sub-tag', type : String, description : '{green sub-tag to add to the image tag (required)}', defaultOption : true },
+  { name : 'pg-version', type : String, description : '{green pgsql version (default: 16.6)}' },
+  { name : 'version', type : Boolean, description : '{green show script version}' },
+  { name : 'help', type : Boolean, description : '{green display this help screen}' },
+]
+
+const sections = [
+  {
+    header : 'Leverege CNPG Docker Image Builder',
+    content : `{green   This tool will build a PostgreSQL based image that is suitable for
+deployment by the CNPG operator. It builds the docker image by using an
+official CNPG docker image as a base and added the jsquery and timescale
+extensions for use within a Leverege k8s cluster. The resultant image may be
+used in the standard PostgreSQL configuration which is used by the stack
+components, as well as timescale based services like transponder tsdb and
+dense history.}`
+  },
+  {
+    header : 'Options',
+    optionList
+  },
+  {
+    header : 'Leverege Registry Image Tag',
+    content : `{green The full registry image tag that is used for tagging the docker image in the artifact registry}`,
+  },
+]
+const args = cliArgs( optionList, { partial : true } )
+const help = cliHelp( sections )
+
+debug( { args, help }, '<==Command Line Info?' )
+
+// Show help if needed
+if ( args.help ) {
+  console.log( help )
+  process.exit( 0 )
+}
+
+// Define defaults
+const PG_VERSION = args.pgVersion || '16.4'
+const { subTag } = args
+if ( !subTag ) {
+  errorExit( `Error: An image version must be specified.` )
+}
+
+const LEVEREGE_REGISTRY = 'us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql'
+const LEVEREGE_IMAGE_TAG = `${PG_VERSION}-cnpg-lvrg-${subTag}`
+const LEVEREGE_IMAGE_NAME_WITH_TAG = `${LEVEREGE_REGISTRY}:${LEVEREGE_IMAGE_TAG}`
+
+const DOCKERFILE_TEMPLATE = `
+FROM ghcr.io/cloudnative-pg/postgresql:{{PG_VERSION}}-bookworm
+
+USER root
+
+RUN set -xe; \\
+    apt-get update; \\
+    apt-get install -y --no-install-recommends \\
+        "postgresql-\${PG_MAJOR}-jsquery"; \\
+    rm -fr /tmp/*; \\
+    rm -rf /var/lib/apt/lists/*;
+
+RUN apt-get update \\
+    && apt-get install -y lsb-release wget \\
+    && echo "deb https://packagecloud.io/timescale/timescaledb/debian/ \$(lsb_release -c -s) main" | tee /etc/apt/sources.list.d/timescaledb.list \\
+    && wget --quiet -O - https://packagecloud.io/timescale/timescaledb/gpgkey | apt-key add - \\
+    && apt-get update \\
+    && apt-get install -y "timescaledb-2-postgresql-\${PG_MAJOR}" \\
+    && apt-get remove -y lsb-release wget \\
+    && rm -fr /tmp/* \\
+    && rm -rf /var/lib/apt/lists/*;
+
+RUN usermod -u 26 postgres
+USER 26
+`
+
+// Check for existing image
+const checkExistingImage = async ( imageName ) => {
+  const dockerResults= await shellCmd( `docker image list ${imageName} --quiet` )
+  debug( { imageName, dockerResults }, '<==docker image list' )
+  return dockerResults !== ''
+}
+
+// Build and push Docker image
+const buildAndPushImage = async () => {
+  const template = Handlebars.compile( DOCKERFILE_TEMPLATE )
+  const renderedDockerfile = template( { PG_VERSION } )
+  debug( { renderedDockerfile }, '<==Dockerfile' )
+
+  // Write the Dockerfile to a temporary location
+  const dockerfilePath = path.resolve( 'Dockerfile.temp' )
+  fs.writeFileSync( dockerfilePath, renderedDockerfile )
+
+  // Build the image
+  console.log( chalk.yellow( 'Building Docker image...' ) )
+  await shellCmd( `docker build --file ${dockerfilePath} --tag ${LEVEREGE_IMAGE_NAME_WITH_TAG} .` )
+
+  // Push the image
+  console.log( chalk.green( 'Pushing Docker image...' ) )
+  await shellCmd( `docker push ${LEVEREGE_IMAGE_NAME_WITH_TAG}` )
+
+  // Clean up the temporary Dockerfile
+  fs.unlinkSync( dockerfilePath )
+}
+
+// Main execution flow
+try {
+  if ( await checkExistingImage( LEVEREGE_IMAGE_NAME_WITH_TAG ) ) {
+    console.error(
+      `${chalk.red( '*** ERROR ***' ) 
+        } The image already exists:\n` +
+      `  Image   : ${chalk.yellow( LEVEREGE_IMAGE_NAME_WITH_TAG )}\n` +
+      `  Registry: ${chalk.green( LEVEREGE_REGISTRY )}\n` +
+      `  Tag     : ${chalk.green( LEVEREGE_IMAGE_TAG )}\n`
+    )
+    process.exit( 1 )
+  }
+
+  console.log( `${chalk.cyan( 'About to build a new Docker image:\n' ) 
+    }  PostgreSQL   => ${chalk.green( PG_VERSION )}\n` +
+    `  Image Name   => ${chalk.green( LEVEREGE_IMAGE_NAME_WITH_TAG )}\n` )
+
+  console.log( `Enter "${chalk.green( 'yes' )}" to proceed or anything else to exit.` )
+  const confirmation = await new Promise( ( resolve ) => {
+    process.stdin.once( 'data', data => resolve( data.toString().trim() ) )
+  } )
+
+  if ( confirmation !== 'yes' ) {
+    console.log( chalk.red( 'Aborted by user.' ) )
+    process.exit( 1 )
+  }
+
+  await buildAndPushImage()
+  console.log( chalk.green( 'Docker image build and push completed successfully!' ) )
+  process.exit( 0 )
+} catch ( error ) {
+  console.error( chalk.red( 'An error occurred:' ), error.message )
+  process.exit( 1 )
+}

package/src/circleate.sh

@@ -128,7 +128,7 @@ jobs:
           at: ~/project
       - run:
           name: Generate docs
-          command: npx jsdoc -r src -R README.md -d docs
+          command: npm run docs
       - store_artifacts:
           path: docs
           prefix: docs
@@ -347,7 +347,7 @@ jobs:
           at: ~/project
       - run:
           name: Generate docs
-          command: npx jsdoc -r src -R README.md -d docs
+          command: npm run docs
       - store_artifacts:
           path: docs
           prefix: docs

package/src/docker-to-registry.mjs

@@ -96,8 +96,6 @@ if ( semver.lt( semver.coerce( repoDescr.buildToolsVersion ), minimumBuildToolsV
 
 const dockerInfo = await docker.generateDockerfile( {
   regvers : repoDescr.packageVersion,
-  imageBase : repoDescr.closestPackageJson.leverege?.imageBase,
-  buildEnv : repoDescr.closestPackageJson.leverege?.buildEnv || 'alpine',
   nodeimage : repoDescr.closestPackageJson.leverege?.nodeimg, // left as nodeimg in package.json for backwards compat
 } )
 debug( { dockerInfo }, '<==The Docker Info' )
@@ -218,13 +216,13 @@ log( `
     NPM Workspace: ${chalk.green.bold( isNpmWorkspace )}
 
   ${chalk.green.bold( 'Docker Information:' )}
-    NodeImage:     ${chalk.green.bold( dockerInfo.imageBase || `node:${dockerInfo.nodeimage}` )}
-    Docker Env:    ${chalk.green.bold( dockerInfo.buildEnv || 'alpine' )}
+    NodeImage:     ${chalk.green.bold( dockerInfo.nodeimage )}
     AddedPkgs:     ${chalk.green.bold( dockerInfo.apkadds )}
     Run User:      ${chalk.green.bold( dockerInfo.runuser )}
     Previous:      ${chalk.yellow.bold( dockerInfo.previousBuild )}
     DateStamp:     ${chalk.green.bold( dockerInfo.date )}
     NPM Logs:      ${chalk.green.bold( dockerInfo.npmlogging )}
+    NPM Version:   ${chalk.green.bold( dockerInfo.npmVersion )}
 ` )
 
 if ( imageVersion !== packageVersion ) {

package/src/generate-docs-conf.json

@@ -0,0 +1,41 @@
+{
+  "tags": {
+    "allowUnknownTags": false
+  },
+  "source": {
+    "includePattern": "\\.(js|mjs|jsx)$",
+    "excludePattern": "(node_modules/|docs)"
+  },
+  "plugins": [],
+  "templates": {
+    "cleverLinks": true,
+    "monospaceLinks": false,
+    "preserveDescriptions": true,
+    "default": {
+      "useLongnameInNav": true,
+      "outputSourceFiles": false
+    }
+  },
+  "opts": {
+    "encoding": "utf8",
+    "lenient": false,
+    "markdown": true
+  },
+  "docdash": {
+    "static": true,
+    "sort": false,
+    "search": true,
+    "collapse": true,
+    "typedefs": true,
+    "removeQuotes": "none",
+    "scripts": [],
+    "menu":{
+      "Bitbucket": {
+        "href":"https://bitbucket.org/leverege/IF_THIS_MAKES_SENSE",
+        "target":"_blank",
+        "class":"menu-item",
+        "id":"repository"
+      }
+    }
+  }
+}

package/src/generate-docs.mjs

@@ -0,0 +1,51 @@
+#!/usr/bin/env node
+/*
+ * Encapsulates the rather lengthy jsdoc / md docs npm script:
+ *
+ *   npx jsdoc -c ./jsdoc.json -R README.md -d docs src && \
+ *   mkdir -p docs/md && \
+ *   npx --package=jsdoc-to-markdown jsdoc2md --files src/*.js --configure ./jsdoc.json > docs/md/API.md
+ *
+ */
+import fs from 'node:fs'
+
+import {
+  BUILD_TOOLS_ROOT,
+  debug,
+  err,
+  getRepositoryDescr,
+  shellCmd,
+} from './Utils.mjs'
+
+const jsdocConfig = `${BUILD_TOOLS_ROOT}/generate-docs-conf.json`
+
+// build the location of the template file from the build-tools root
+// in order to avoid hardcoding in the jsdoc config file - this is
+// important in order to support running generate-docs from a user's
+// laptop or deployed to the doc-creator service on k8s
+const jsdocTemplate = `${BUILD_TOOLS_ROOT}/../../jsdoc-template`
+
+if ( !fs.existsSync( jsdocConfig ) ) { // eslint-disable-line security/detect-non-literal-fs-filename
+  err( `cannot find the jsdoc config file: ${jsdocConfig}` )
+  process.exit( 1 )
+}
+
+const repoDescr = await getRepositoryDescr()
+
+debug( { jsdocConfig, repoDescr }, '<==The Repo' )
+
+// blow away any existing docs before recreating the docs dir
+if ( fs.existsSync( 'docs' ) ) {
+  fs.rmSync( 'docs', { recursive : true } )
+}
+fs.mkdirSync( 'docs/md', { recursive : true } )
+
+try {
+  await shellCmd( `npx --yes jsdoc -c ${jsdocConfig} -t ${jsdocTemplate} -R README.md -d docs src` )
+  await shellCmd(
+    `npx --yes --package=jsdoc-to-markdown jsdoc2md --files src/*.js --configure ${jsdocConfig}`,
+    { stdout : { file : 'docs/md/API.md' } }
+  )
+} catch ( error ) {
+  err( error )
+}

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

@@ -2,6 +2,13 @@
 #
 # See => https://cloudnative-pg.io/documentation/current/installation_upgrade/
 #
+OPVER="1.25.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
+
 # Legacy terraformed clusters (like sandbox) may need a special firewall rule
 # added to the network layer on k8s. It should look like this:
 #
@@ -9,13 +16,6 @@
 # Ports  : 8000,9443     <= kubectl cnpg status and webhooks
 # Filters: 172.16.0.0/28 <= k8s control plane
 #
-OPVER="1.24.1"
-
-createNamespaceIfNeeded cnpg-system
-
-kubectl apply --server-side -f \
-    https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/release-${OPVER%.*}/releases/cnpg-${OPVER}.yaml $K8S_WHAT
-
 # Old approach used the helm chart.
 #
 #addHelmRepo cnpg https://cloudnative-pg.github.io/charts

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

@@ -2,7 +2,7 @@
 #
 showInstalling "Elastic Search 8"
 
-[ -z "$ELASTIC_CHART_VERSION" ] && ELASTIC_CHART_VERSION="21.3.22"
+[ -z "$ELASTIC_CHART_VERSION" ] && ELASTIC_CHART_VERSION="21.4.1"
 
 OCI_CHART="oci://registry-1.docker.io/bitnamicharts/elasticsearch"
 

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

@@ -4,7 +4,7 @@ showInstalling "The Prometheus Operator and Components"
 addHelmRepo prometheus-community https://prometheus-community.github.io/helm-charts
 
 showInstalling "The Prometheus Operator (kube-prometheus-stack)"
-[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="66"
+[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="67"
 
 NS="--namespace prometheus"
 

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

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

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="7"
+[ -z "$VELERO_CHART_VERSION" ] && VELERO_CHART_VERSION="8"
 #
 # 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/velero/velero-local.yaml

@@ -129,6 +129,10 @@ serviceAccount:
     create: false
     name: velero
 
+metrics:
+  serviceMonitor:
+    enabled: true
+
 # Workload Identity Federation (WIF) uses service accounts and IAM roles to
 # define a service's permissions - the useSecret setting will be set to false
 # for WIF enabled clusters.