@leverege/build-tools 2.47.0 → 2.47.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.47.0",
+  "version": "2.47.2",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/Docker.mjs

@@ -5,6 +5,7 @@ import handlebars from 'handlebars'
 
 import {
   errorExit,
+  getDateTimestamp,
   getGcpAccount,
   log,
   proceed,
@@ -129,12 +130,9 @@ dunm() {
 }
 `
 
-// Just uses the old dockreate of formatting the date.
-const dateTimestamp = await shellCmd( 'date +%Y%m%d-%H%M' )
-
 const defaultSettings = {
   apkadds : '',
-  date : dateTimestamp,
+  date : getDateTimestamp(),
   nodeimage : 'iron-alpine',
   npmlogging : '--silent',
   pluginfile : '# NO PLUGIN',
@@ -292,7 +290,7 @@ const repoCleanup = async () => {
 
   fs.writeFileSync( 'docker/.gitignore', '.previous\nDockerfile' )
 
-  await shellCmd( 'git add docker' )
+  await shellCmd( 'git add -f docker' )
 
   log( `
   ${chalk.yellow.bold( '***IMPORTANT***' )}

package/src/docker-to-registry.mjs

@@ -131,7 +131,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 +142,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 )
 }
 
@@ -224,9 +235,10 @@ if ( isNpmWorkspace ) {
 await docker.buildContainerImage( { artifactProject, artifactRegistry, containerName, imageVersion, isNpmWorkspace } )
 
 if ( willGitTag ) {
-  log( chalk.green.bold( `Tagging and Pushing ${imageVersion}\n` ) )
   const tagDescription = `docker_${imageVersion}`
-  await shellCmd( `git tag -f ${imageVersion} -m ${tagDescription}` )
+  const fullImageTag = repoDescr.isMonoRepo ? `${repoDescr.containerName}/${imageVersion}` : imageVersion
+  log( chalk.green.bold( `Tagging and Pushing ${fullImageTag}\n` ) )
+  await shellCmd( `git tag -f ${fullImageTag} -m ${tagDescription}` )
   await shellCmd( 'git push --follow-tags' )
 } else {
   log( chalk.yellow.bold( '\n*** Skipped git tagging - beta release' ) )

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