@leverege/build-tools 2.62.0-alpha.5 → 2.62.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.62.0-alpha.5",
+  "version": "2.62.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -16,9 +16,9 @@
   "bin": {
     "build-tools": "src/build-tools.mjs",
     "build-and-push": "src/build-and-push.sh",
+    "build-cnpg-image": "src/build-cnpg-image.mjs",
     "chart-to-registry": "src/chart-to-registry.mjs",
     "circleate": "src/circleate.sh",
-    "cnpg-backup": "src/cnpg-backup.mjs",
     "decrypt-secrets": "src/decrypt-secrets.sh",
     "dirty-git": "src/dirty-git.sh",
     "dockreate": "src/dockreate.sh",
@@ -38,9 +38,7 @@
     "helminit": "src/helmup.sh",
     "helmwhat": "src/helmup.sh",
     "hook-and-release": "src/hook-and-release.mjs",
-    "k8cryo": "src/k8cryo.sh",
     "k8scale": "src/k8scale.sh",
-    "k8thaw": "src/k8cryo.sh",
     "k8x": "src/k8x.sh",
     "klog": "src/klog.sh",
     "npm-link": "src/npm-link.sh",
@@ -54,6 +52,7 @@
     "refresh-npm-token": "src/refresh-npm-token.mjs",
     "refresh-py-idx": "src/refresh-py-idx.sh",
     "send-to-slack": "src/send-to-slack.mjs",
+    "snapshot-cnpg": "src/snapshot-cnpg.mjs",
     "tag-release": "src/tag-release.mjs",
     "unleash": "src/unleash.mjs"
   },
@@ -62,31 +61,29 @@
   "dependencies": {
     "@google-cloud/artifact-registry": "^3.5.0",
     "@leverege/jsdoc-template": "^1.0.1",
-    "ansi-colors": "^4.1.3",
     "chalk": "^5.4.1",
     "command-line-args": "^6.0.1",
     "command-line-usage": "^7.0.3",
     "deepmerge": "^4.3.1",
     "enquirer": "^2.4.1",
     "execa": "^9.5.2",
-    "glob": "^11.0.0",
+    "glob": "^11.0.1",
     "handlebars": "^4.7.8",
-    "inquirer": "^12.3.0",
+    "inquirer": "^12.4.2",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.4",
     "ms": "^2.1.3",
     "npm-registry-fetch": "^18.0.2",
     "package-up": "^5.0.0",
     "parse-gitignore": "^2.0.0",
-    "read-pkg": "^9.0.1",
     "readline-sync": "^1.4.10",
-    "semver": "^7.6.3",
+    "semver": "^7.7.1",
     "simple-git": "^3.27.0",
     "toml": "^3.0.0",
-    "zx": "^8.3.0"
+    "zx": "^8.3.2"
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.0.1",
-    "npm": "^11.0.0"
+    "npm": "^11.1.0"
   }
 }

package/src/Docker.mjs

@@ -24,7 +24,7 @@ const dockerfileNodeVersion = 'jod-alpine'
 // the build-tools repository, but it just became simpler to pull the contents
 // directly into these variables and forego the file loading.
 //
-const pluginTemplate = `
+const dockerfilePluginTemplate = `
 # Dockerfile.plugin - optionally extend the service Docker image
 #
 # This file may be used to run additional docker commands during the image
@@ -38,6 +38,14 @@ const pluginTemplate = `
 # Keep in mind that the Alpine Linux base image is used to keep image
 # footprints small, so adding packages "just because" is not considered
 # a best practice.
+`
+const bashrcPluginTemplate = `
+
+# Bashrc.plugin - optionally extend the image .bashrc file
+#
+# This plugin file may contain additional .bashrc settigns / functions to
+# provide on the target image.
+
 `
 const dockerfileTemplate = fs.readFileSync( path.join( DIRNAME, './templates/dockerfileTemplate.hbs' ), 'utf8' )
 const bashrcTemplate = fs.readFileSync( path.join( DIRNAME, './templates/bashrcTemplate.hbs' ), 'utf8' )
@@ -66,9 +74,10 @@ const setPreviousBuild = ( version ) => {
   fs.writeFileSync( previousFile, version )
 }
 
-const generateDockerfile = ( options ) => {
+const generateDockerfile = async ( options ) => {
 
-  const settings = { ...defaultSettings, ...options }
+  const gitReference = await shellCmd( 'git rev-parse --short HEAD' )
+  const settings = { gitReference, ...defaultSettings, ...options }
 
   // defaults to the current "official" version of node unless it gets
   // overridden in the leverege.nodeimg package.json stanza
@@ -85,24 +94,31 @@ const generateDockerfile = ( options ) => {
     fs.mkdirSync( './docker' ) // TODO: blindly assumes the mkdir succeeds
   }
 
+  // Create a bashrc plugin file if one does not already exist
+  const bashrcPluginFile = './docker/Bashrc.plugin'
+  if ( !fs.existsSync( bashrcPluginFile ) ) {
+    warning( `creating the missing ${bashrcPluginFile} file in the docker directory\n` )
+    fs.writeFileSync( bashrcPluginFile, bashrcPluginTemplate )
+  }
+  const bashrcPlugin = fs.readFileSync( bashrcPluginFile )
+
+  // Build the target bashrc file by using the template plus Bashrc.plugin
   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 ) ) {
-    let bf = bashrcTemplate
-    const bashrcFilePlugin = './docker/Bashrc.plugin'
-    if ( fs.existsSync( bashrcFilePlugin ) ) {
-      const bashrcAdditions = fs.readFileSync( bashrcFilePlugin )
-      bf = `${bf}\n${bashrcAdditions}`
-    }
-    warning( `creating the missing ${bashrcFile} file in the docker directory` )
-    fs.writeFileSync( bashrcFile, bf )
+  if ( fs.existsSync( bashrcFile ) ) {
+    fs.rmSync( bashrcFile ) // start with a clean bashrc
+  }
+
+  try {
+    fs.writeFileSync( bashrcFile, bashrcTemplate )
+    fs.appendFileSync( bashrcFile, bashrcPlugin )
+  } catch ( err ) {
+    errorExit( `***ERROR: failed creation of the ${bashrcFile} file` )
   }
 
   const dockerfilePlugin = './docker/Dockerfile.plugin'
   if ( !fs.existsSync( dockerfilePlugin ) ) {
     warning( `creating the missing ${dockerfilePlugin} file in the docker directory` )
-    fs.writeFileSync( dockerfilePlugin, pluginTemplate )
+    fs.writeFileSync( dockerfilePlugin, dockerfilePluginTemplate )
   }
 
   try {
@@ -114,7 +130,7 @@ const generateDockerfile = ( options ) => {
     errorExit( `***ERROR: expected the ./build directory to exist - ${chalk.yellow( 'npm run build' )}` )
   }
 
-  // At this point the plugin template better exist.
+  // At this point the docker plugin file better exist.
   if ( fs.existsSync( dockerfilePlugin ) ) {
     settings.pluginfile = fs.readFileSync( dockerfilePlugin )
   } else {
@@ -173,12 +189,22 @@ const buildContainerImage = async ( {
   // TODO: This is janky - I'll clean it up later
   // NOTE: this is dealing with raw filesystem interactions, meaning there
   //   isn't a shell performing file globbing and what not
+  //
+  // Steps taken here attempt to minimize impact on legacy build setups
+  //   1. rename build dir to workspace
+  //   2. create the actual build dir and move workspace into it
+  //   3. move the Dockerfile into build and make a copy for image root
+  //   4. copy the bashrc file into build and .bashrc on the image root
+  //   5. drop a copy of dev's npmrc to use for build process
+  //   6. drop a copy of package.json and the lock into the image root
+  //
   fs.renameSync( './build', './workspace' )
   fs.mkdirSync( './build' )
   fs.renameSync( './workspace', buildWorkspace )
   fs.renameSync( './docker/Dockerfile', './build/Dockerfile' )
+  fs.cpSync( './build/Dockerfile', `${buildWorkspace}/Dockerfile` )
+  fs.renameSync( './docker/bashrc', './build/bashrc' )
   fs.cpSync( `${process.env.HOME}/.npmrc`, './build/.npmrc' )
-  fs.cpSync( './docker/bashrc', './build/bashrc' )
   fs.cpSync( './package.json', `${buildWorkspace}/package.json` )
   fs.cpSync( './package-lock.json', `${buildWorkspace}/package-lock.json` )
   if ( isNpmWorkspace ) {
@@ -188,7 +214,7 @@ const buildContainerImage = async ( {
   setPreviousBuild( imageVersion ) // update docker/.previous file
 
   const { fullName : builderName } = await getGcpAccount()
-  const gcloudBuild = `time gcloud builds submit --project ${artifactProject}`
+  const gcloudBuild = `gcloud builds submit --project ${artifactProject}`
   const gcloudLogs = `--gcs-log-dir ${formCloudBuildBucketName( artifactProject )}/log`
   let gcloudTags = `--tag ${imageName}:${imageVersion}`
   

package/src/Utils.mjs

@@ -54,6 +54,10 @@ export const isString = ( s ) => {
  * General "yes" to proceed function.
  */
 export const proceed = async ( query = 'Do you wish to proceed?' ) => {
+  if ( process.env.CICD_PIPELINE === '1' ) {
+    log( '\n*** CICD Pipeline - skipping user prompts' )
+    return
+  }
   await inquirer.prompt( [
     {
       type : 'confirm',
@@ -399,6 +403,7 @@ export const getRepositoryDescr = async () => {
   const currentDir = process.cwd()
   const workingDir = process.env.PWD
   const gitRoot = await getGitRootDirectory()
+  const isGitRepo = gitRoot !== undefined
   const gitHooksPath = await getGitHooksPath()
   const { branch : gitBranch, upstream : gitUpstream } = await getGitBranchAndUpstream()
   const subPkgs = await glob( `${gitRoot}/packages/**/package.json`, { ignore : '/**/node_modules/**' } )
@@ -420,6 +425,7 @@ export const getRepositoryDescr = async () => {
     gitRoot,
     gitUpstream,
     helmChart,
+    isGitRepo,
     isMonoRepo,
     isNpmWorkspace,
     rootPackageJson,

package/src/bash-funcs

@@ -42,6 +42,10 @@ function clearlyWarn() {
 CLEARWARN
 }
 
+function warning() {
+  clearlyWarn DO_NOT_CLEAR
+}
+
 function warnOnError() {
   [ $1 -ne 0 ] && printf "\n$YELO_WARN $2\n"
 }

package/src/build-cnpg-image.mjs

@@ -0,0 +1,176 @@
+#!/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 resultant image will be tagged with a label comprised of the PG version,
+the specified --sub-tag and a fixed string:
+
+    {yellow <PG ver>-cnpg-lvrg-<sub tag>}
+
+For example, version {yellow 16.6} with a sub tag of {yellow rel.1} will be tagged:
+
+    {yellow 16.6-cnpg-lvrg-rel.1}}`
+  },
+]
+const args = cliArgs( optionList, { camelCase : true, partial : true } )
+const help = cliHelp( sections )
+
+debug( { args, help }, '<==Command Line Info?' )
+
+// Show help if needed
+if ( args.help ) {
+  log( help )
+  process.exit( 0 )
+}
+
+// Define defaults
+const PG_VERSION = args.pgVersion || '16.6'
+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
+  log( chalk.yellow( '\nBuilding Docker image...' ) )
+  await shellCmd( `docker build --file ${dockerfilePath} --tag ${LEVEREGE_IMAGE_NAME_WITH_TAG} .`, { stdio : 'inherit' } )
+
+  // Push the image
+  log( chalk.green( '\nPushing Docker image...' ) )
+  await shellCmd( `docker push ${LEVEREGE_IMAGE_NAME_WITH_TAG}`, { stdio : 'inherit' } )
+
+  // Clean up the temporary Dockerfile
+  fs.unlinkSync( dockerfilePath )
+}
+
+// Main execution flow
+try {
+  if ( await checkExistingImage( LEVEREGE_IMAGE_NAME_WITH_TAG ) ) {
+    err(
+      `${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 )
+  }
+
+  log( `${chalk.cyan( '\nAbout to build a new Docker image:\n' )}
+    PostgreSQL   => ${chalk.green( PG_VERSION )}
+    Image Name   => ${chalk.green( LEVEREGE_IMAGE_NAME_WITH_TAG )}\n` )
+
+  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' ) {
+    log( chalk.red( 'Aborted by user.' ) )
+    process.exit( 1 )
+  }
+
+  await buildAndPushImage()
+  log(
+    chalk.green( '\nImage built and successfully pushed - tagged => ' ) +
+    chalk.yellow( `${LEVEREGE_IMAGE_TAG}` )
+  )
+  process.exit( 0 )
+} catch ( error ) {
+  err( chalk.red( 'An error occurred:' ), error.message )
+  process.exit( 1 )
+}

package/src/chart-compass.mjs

@@ -0,0 +1,97 @@
+#!/usr/bin/env node
+/* eslint-disable */
+/*
+ * 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
+   
+  {
+    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}',
+  },
+   
+]
+
+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' )

package/src/docker-to-registry-py.mjs

@@ -5,7 +5,6 @@
 import fs from 'node:fs'
 import toml from 'toml'
 import chalk from 'chalk'
-import semver from 'semver'
 
 import {
   debug, log,

package/src/docker-to-registry.mjs

@@ -272,7 +272,9 @@ if ( willGitTag ) {
   }
 }
 
-await proceed()
+if ( process.env.DRY_RUN !== '1' ) {
+  await proceed()
+}
 
 if ( isNpmWorkspace ) {
   log( chalk.yellow.bold( 'Generating an NPM workspace package-lock.json file' ) )

package/src/docker-to-registry.sh

@@ -19,7 +19,7 @@ cat<<DEPRECATED_TOOL
   `color y "***DEPRECATED docker-to-registry.sh - upgrade to docker-to-registry.mjs***"`
 
 DEPRECATED_TOOL
-sleep 3
+exit 1
 
 PKGTOP="$npm_config_local_prefix"
 cd $PKGTOP/docker

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

@@ -1,5 +1,3 @@
-# Artifact Chart  => https://artifacthub.io/packages/helm/cloudnative-pg/cloudnative-pg
-# Examples Charts => https://cloudnative-pg.io/documentation/current/samples/
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
@@ -10,7 +8,7 @@ spec:
   logLevel: info # warning debug
 
   description: "Leverege PG Bench Timescale DB"
-  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.1-cnpg-tsdb2-beta.6
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:17.2-cnpg-lvrg-rel.2
   bootstrap:
     initdb:
       postInitTemplateSQL:
@@ -60,6 +58,7 @@ spec:
   # - supervised: requires manual supervision to perform
   #               the switchover of the primary
   primaryUpdateStrategy: unsupervised
+  primaryUpdateMethod: switchover
 
   serviceAccountTemplate:
     metadata:

package/src/helm-charts/cnpg-db-psql-stack/cluster.yaml.ovh

@@ -1,5 +1,3 @@
-# Artifact Chart  => https://artifacthub.io/packages/helm/cloudnative-pg/cloudnative-pg
-# Examples Charts => https://cloudnative-pg.io/documentation/current/samples/
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
@@ -13,7 +11,7 @@ spec:
     enablePodMonitor: false # set true once monitoring is setup
 
   description: "Leverege Stack PostgreSQL DB"
-  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.4-cnpg-tsdb2-rel.1
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:17.2-cnpg-lvrg-rel.2
   bootstrap:
     initdb:
 #     database: models # do not set - let it default to cnpg app db
@@ -66,6 +64,7 @@ spec:
   # - supervised: requires manual supervision to perform
   #               the switchover of the primary
   primaryUpdateStrategy: unsupervised
+  primaryUpdateMethod: switchover
 
   serviceAccountTemplate:
     metadata:

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

@@ -1,5 +1,3 @@
-# Artifact Chart  => https://artifacthub.io/packages/helm/cloudnative-pg/cloudnative-pg
-# Examples Charts => https://cloudnative-pg.io/documentation/current/samples/
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
@@ -13,7 +11,7 @@ spec:
     enablePodMonitor: false # set true once monitoring is setup
 
   description: "Leverege CNPG DB (recovered)"
-  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.4-cnpg-tsdb2-rel.1
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:17.2-cnpg-lvrg-rel.2
   bootstrap:
     recovery:
       volumeSnapshots:
@@ -61,6 +59,7 @@ spec:
   # - supervised: requires manual supervision to perform
   #               the switchover of the primary
   primaryUpdateStrategy: unsupervised
+  primaryUpdateMethod: switchover
 
   serviceAccountTemplate:
     metadata:

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

@@ -1,5 +1,3 @@
-# Artifact Chart  => https://artifacthub.io/packages/helm/cloudnative-pg/cloudnative-pg
-# Examples Charts => https://cloudnative-pg.io/documentation/current/samples/
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
@@ -13,7 +11,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.4-cnpg-tsdb2-rel.1
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:17.2-cnpg-lvrg-rel.2
   bootstrap:
     initdb:
 #     database: imagine # let it default to cnpg app db
@@ -74,6 +72,7 @@ spec:
   # - supervised: requires manual supervision to perform
   #               the switchover of the primary
   primaryUpdateStrategy: unsupervised
+  primaryUpdateMethod: switchover
 
   serviceAccountTemplate:
     metadata:

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

@@ -1,5 +1,3 @@
-# Artifact Chart  => https://artifacthub.io/packages/helm/cloudnative-pg/cloudnative-pg
-# Examples Charts => https://cloudnative-pg.io/documentation/current/samples/
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
@@ -13,7 +11,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.4-cnpg-tsdb2-rel.1
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:17.2-cnpg-lvrg-rel.2
   bootstrap:
     initdb:
       postInitTemplateSQL:
@@ -69,6 +67,7 @@ spec:
   # - supervised: requires manual supervision to perform
   #               the switchover of the primary
   primaryUpdateStrategy: unsupervised
+  primaryUpdateMethod: switchover
 
   serviceAccountTemplate:
     metadata:

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

@@ -4,20 +4,23 @@ 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="67"
+[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="68"
 
 NS="--namespace prometheus"
 
+# https://artifacthub.io/packages/helm/prometheus-community/kube-prometheus-stack
 helm upgrade $NS --install prometheus-stack prometheus-community/kube-prometheus-stack \
                  --values  prom-operator/prometheus-stack.yaml \
                  --version $PROMETHEUS_STACK_CHART_VERSION $HELM_WHAT
 
+# https://artifacthub.io/packages/helm/prometheus-community/prometheus-elasticsearch-exporter
 showInstalling "The Elasticsearch Exporter (prom-operator)"
 [ -z "$ELASTICSEARCH_EXPORTER_CHART_VERSION" ] && ELASTICSEARCH_EXPORTER_CHART_VERSION="6"
 helm upgrade $NS --install elasticsearch8-exporter prometheus-community/prometheus-elasticsearch-exporter \
                  --values prom-operator/elasticsearch-exporter.yaml \
                  --version $ELASTICSEARCH_EXPORTER_CHART_VERSION $HELM_WHAT
 
+# https://artifacthub.io/packages/helm/prometheus-community/prometheus-stackdriver-exporter
 showInstalling "The Stackdriver Exporter (prom-operator)"
 [ -z "$STACKDRIVER_EXPORTER_CHART_VERSION" ] && STACKDRIVER_EXPORTER_CHART_VERSION="4"
 helm upgrade $NS --install stackdriver-exporter prometheus-community/prometheus-stackdriver-exporter \

package/src/hook-and-release/Config.mjs

@@ -128,6 +128,15 @@ export default class Config {
 
   async bootstrapHookAndRelease() {
     const repoDescr = await getRepositoryDescr()
+    if ( !repoDescr.isGitRepo ) {
+      const notGitRepo = `
+  The hook-and-release script only works with git repositories. Try running:
+
+      git init && hook-and-release --init
+
+  to initialize git and hook-and-release.`
+      errorExit( notGitRepo )
+    }
     this.gitRoot = repoDescr.gitRoot
     this.gitBranch = repoDescr.gitBranch
     this.gitHooksPath = repoDescr.gitHooksPath

package/src/templates/bashrcTemplatePy.hbs

@@ -1 +1,5 @@
-export PYTHONPYCACHEPREFIX=/tmp/pycache
+export PYTHONPYCACHEPREFIX=/tmp/pycache
+
+export VIRTUAL_ENV=/usr/src/app/.venv
+export PATH="/usr/src/app/.venv/bin:$PATH"
+

package/src/templates/dockerfileTemplate.hbs

@@ -1,4 +1,4 @@
-# Version {{regvers}} @ {{date}}
+# Version {{regvers}} @ {{date}} / Git Ref: {{gitReference}}
 
 # The FROM directive sets the Base Image for subsequent instructions
 FROM {{image}} as intermediate
@@ -25,11 +25,11 @@ COPY ./.npmrc ${NPM_CONFIG_USERCONFIG}
 RUN if [ "${BUILD_ENV}" = "debian" ]; then \
       apt-get update && \
       apt-get install -y wget openssh-client build-essential && \
-      npm install -g npm@10; \
+      npm install -g {{npmVersion}}; \
     else \
       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 npm@10; \
+      npm install -g {{npmVersion}}; \
     fi
 
 # Use SKIP_PREPARE to disable hook-and-release from running
@@ -58,13 +58,13 @@ COPY ./.npmrc ${NPM_CONFIG_USERCONFIG}
 RUN if [ "$BUILD_ENV" = "debian" ]; then \
       apt-get update && \
       apt-get install -y tini bash curl vim {{apkadds}} && \
-      npm install -g npm@10 && \
+      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; \
     else \
       apk update && \
       apk add --no-cache bash curl tini vim {{apkadds}} && \
-      npm install -g npm@10 && \
+      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; \
     fi
@@ -83,4 +83,4 @@ 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" ]
+CMD [ "/bin/bash", "-c", "source /home/node/.bashrc && node index.js" ]

package/src/templates/dockerfileTemplatePy.hbs

@@ -1,12 +1,17 @@
 # Version {{regvers}} @ {{date}}
 
 # The FROM directive sets the Base Image for subsequent instructions
-FROM {{image}} as intermediate
+FROM {{image}}
 
 ARG BUILD_ENV="{{buildEnv}}"
 
-RUN apt-get update && apt-get install -y \
-    wget git
+RUN useradd -ms /bin/bash {{runuser}} && \
+    mkdir -p /usr/src/app && \
+    chown {{runuser}} /usr/src/app && \
+    apt-get update && apt-get install -y \
+    wget git \
+    && rm -rf /var/lib/apt/lists/*
+
 #    gcc \
 #    git \
 #    libgl1 \
@@ -16,27 +21,22 @@ RUN apt-get update && apt-get install -y \
 # Copy uv binary from the official distroless Docker image.
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /bin/uv
 
-# Define the working directory.
-WORKDIR /usr/src/app
-
-#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/
+COPY --chown={{runuser}}:{{runuser}} ./workspace/ /usr/src/app/
 ENV GRPC_VERBOSITY ERROR
 
-
 # Setup pip.conf for Google Artifact Registry.
-RUN mkdir -p ~/.config/pip
-RUN echo "[global]" >> ~/.config/pip/pip.conf && \
+RUN mkdir -p ~/.config/pip && \
+    echo "[global]" >> ~/.config/pip/pip.conf && \
     echo "break-system-packages = true" >> ~/.config/pip/pip.conf 
 
 
 # Set up the virtual environment.
+USER {{runuser}}
+COPY --chown={{runuser}}:{{runuser}} ./bashrc /home/{{runuser}}/.bashrc
+
 RUN uv venv
 ENV VIRTUAL_ENV=/usr/src/app/.venv
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
@@ -45,31 +45,19 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 RUN uv pip install keyring
 RUN uv pip install keyrings.google-artifactregistry-auth
 
-RUN echo "extra-index-url = https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple" >> ~/.config/pip/pip.conf
-
-ENV UV_EXTRA_INDEX_URL "https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple"
+#RUN echo "extra-index-url = https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple" >> ~/.config/pip/pip.conf
+#ENV UV_EXTRA_INDEX_URL "https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple"
 
 
 {{preInstallPluginfile}}
 
-RUN cat 
-
-RUN ls -al
-# Install uv
 RUN uv sync --keyring-provider subprocess --extra-index-url https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple
 
-
 # Pull in the Dockerfile.plugin file here
 {{pluginfile}}
 
-# Eliminate the sensitive info from the final stage image
-#RUN rm -f ${NPM_CONFIG_USERCONFIG}
-
-# ENTRYPOINT [ "tini", "--" ]
-#WORKDIR /usr/src/app
-
-#COPY --chown=node:node --from=intermediate /usr/src/app /usr/src/app
-
-USER {{runuser}}
-COPY ./bashrc /home/{{runuser}}/.bashrc
-CMD [ "/bin/bash", "-c", "source /home/{{runuser}}/.bashrc && python scripts/server.py" ]
+#USER {{runuser}}
+#COPY ./bashrc /home/{{runuser}}/.bashrc
+RUN ls /usr/src/app/.venv/bin
+CMD [ "/bin/bash", "-c", "source /home/{{runuser}}/.bashrc && python scripts/server.py" ]
+#CMD [ "/bin/bash" ]

package/.har/config.json

@@ -1,11 +0,0 @@
-{
-  "protected-branches": [
-    "development",
-    "main"
-  ],
-  "npm-scripts": [
-    "lint",
-    "test"
-  ],
-  "ignore-packages": []
-}

package/.har/pre-commit

@@ -1 +0,0 @@
-hook-and-release

package/.har/pre-push

@@ -1 +0,0 @@
-hook-and-release