@leverege/build-tools 2.47.1 → 2.47.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.47.1",
+  "version": "2.47.3",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -61,7 +61,7 @@
     "execa": "^8.0.1",
     "glob": "^10.3.10",
     "handlebars": "^4.7.8",
-    "inquirer": "^9.2.14",
+    "inquirer": "^9.2.15",
     "js-yaml": "^4.1.0",
     "ms": "^2.1.3",
     "npm-registry-fetch": "^16.1.0",

package/src/Utils.mjs

@@ -320,6 +320,7 @@ https://console.cloud.google.com/artifacts/browse/leverege-registry?project=leve
 
 export const parseHelmChart = async ( helmroot = './helm' ) => {
   /* eslint-disable security/detect-non-literal-fs-filename */
+  if ( !existsSync( helmroot ) ) { return undefined }
   const chartFiles = readdirSync( helmroot, { encoding : 'utf8', recursive : true } )
   const chartYaml = YAML.load( readFileSync( `${helmroot}/Chart.yaml`, 'utf8' ) )
   const valuesYaml = YAML.load( readFileSync( `${helmroot}/values.yaml`, 'utf8' ) )

package/src/docker-to-registry.mjs

@@ -2,6 +2,8 @@
 /*
  * docker-to-registry will...
  */
+import fs from 'node:fs'
+
 import chalk from 'chalk'
 
 import {
@@ -53,6 +55,18 @@ if ( willGitTag && repoIsDirty ) {
   process.exit( 1 )
 }
 
+if ( !fs.existsSync( './helm' ) ) {
+  log( `
+  ${chalk.red.bold( '***Error: docker-to-registry requires a helm chart directory' )}
+
+  The docker-to-registry script expects to run in the root directory of a k8s
+  service, which requires a helm chart directory. It also expects a docker
+  directory but will build that if it does not exist.
+
+  ` )
+  process.exit( 1 )
+}
+
 const repoDescr = await analyzeRepository()
 debug( { repoDescr }, '<==The Repo Description' )
 
@@ -131,7 +145,7 @@ const chart = helmChart?.yaml['Chart.yaml']
 const values = helmChart?.yaml['values.yaml']
 const expectedChartRegistry = `${artifactRegistry}/images`
 
-if ( expectedChartRegistry !== values.image.registry ) {
+if ( expectedChartRegistry !== values.image?.registry ) {
   log( `
   ${chalk.red.bold( '***Error: mismatched package.json registry and helm/values.yaml' )}
 
@@ -142,12 +156,23 @@ if ( expectedChartRegistry !== values.image.registry ) {
 
     Current settings:
       package.json registry => ${chalk.yellow.bold( artifactRegistry )}
-      values.yaml  registry => ${chalk.red.bold( values.image.registry )}
+      values.yaml  registry => ${chalk.red.bold( values.image?.registry )}
 
     Expected settings:
       values.yaml  registry => ${chalk.green.bold( expectedChartRegistry )}
   ` )
 
+  if ( !values.image ) {
+    log( `
+  ${chalk.yellow.bold( '***DEPRECATED: legacy helm charts detected' )}
+
+  The helm chart structure appears to be based on the pre-ignition helm chart
+  layouts. The charts must be upgraded before docker-to-registry can complete
+  its job.
+
+    ` )
+  }
+
   process.exit( 1 )
 }
 

package/src/k8cryo.sh

@@ -2,6 +2,10 @@
 #
 . `build-tools --bashfun`
 
+daysToKeep=${1:-60}
+let hoursToKeep="$daysToKeep*24"
+printf "\ncryo backup set to keep for $daysToKeep days / $hoursToKeep hours\n"
+
 if [ "`basename $0`" == "k8thaw" ];
 then
   errorExit "k8thaw - UNDER CONSTRUCTION"
@@ -11,5 +15,6 @@ fi
 # generating the Date Time Stamp for scheduled backups.
 DTS="`date -u +\"%Y%m%d%H%M%S\"`"
 
-# The 1440h specifies the number of hours to keep the backup - 60 days
-velero backup create velero-cryo-$DTS --ttl 1440h
+printf "\nExecuting = > velero backup create velero-cryo-$DTS --ttl ${hoursToKeep}h\n"
+
+velero backup create velero-cryo-$DTS --ttl ${hoursToKeep}h