@leverege/build-tools 2.85.0 → 2.86.0-beta.2

package/package.json

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

package/src/Utils.mjs

@@ -580,6 +580,8 @@ export const analyzeRepository = async ( giveGuidance ) => {
   const artifactProject = closestPackageJson?.artifactRegistry.project || rootPyProjectToml?.artifactRegistry.project || 'unknown'
   const packageVersion = `v${closestPackageJson?.version || rootPyProjectToml?.project.version}`
   const generateDockerfile = ( closestPackageJson?.leverege.generateDockerfile || rootPyProjectToml?.leverege['generate-dockerfile'] ) ?? true
+  const requiresHelmChart = closestPackageJson?.leverege.requiresHelmChart || rootPyProjectToml?.leverege['requires-helm-chart'] || [ 'k8s' ]
+
   const currentDir = process.cwd()
   const closestPkg = await packageUp()
 
@@ -601,6 +603,7 @@ export const analyzeRepository = async ( giveGuidance ) => {
     artifactProject,
     artifactRegistry,
     buildToolsVersion,
+    requiresHelmChart,
     containerName,
     imagePlatform,
     currentDir,

package/src/docker-to-registry.mjs

@@ -78,18 +78,6 @@ 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( giveGuidance )
 debug( { repoDescr }, '<==The Repo Description' )
 
@@ -102,6 +90,7 @@ if ( semver.lt( semver.coerce( repoDescr.buildToolsVersion ), minimumBuildToolsV
 const {
   artifactProject,
   artifactRegistry,
+  requiresHelmChart,
   packageVersion,
   containerName,
   imagePlatform,
@@ -112,6 +101,20 @@ const {
   isPythonProject,
 } = repoDescr
 
+if ( requiresHelmChart ) {
+  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 leveregeStanza = isNodeJsProject ? repoDescr.closestPackageJson.leverege : repoDescr.rootPyProjectToml.leverege
 
 const dockerfileOptions = {
@@ -136,6 +139,8 @@ if ( generateDockerfile ) {
   dockerInfo = { ...dockerfileOptions }
 }
 
+const projectFilename = isPythonProject ? 'pyproject.toml' : 'package.json'
+
 if ( giveGuidance ) {
   await docker.validateCloudBuildBucket( artifactProject )
 }
@@ -197,37 +202,37 @@ if ( giveGuidance ) {
 
 // do chart checks too
 let chart
-if ( options?.helmChecks !== 'false' ) {
+if ( requiresHelmChart && options?.helmChecks !== 'false' ) {
   chart = helmChart?.yaml['Chart.yaml']
   const values = helmChart?.yaml['values.yaml']
   const expectedChartRegistry = `${artifactRegistry}/images`
 
   if ( expectedChartRegistry !== values.image?.registry ) {
     log( `
-  ${chalk.red.bold( '***Error: mismatched package.json registry and helm/values.yaml' )}
+    ${chalk.red.bold( `***Error: mismatched ${projectFilename} registry and helm/values.yaml` )}
 
-  The registry specified in the package.json leverege stanza does not line up
-  with the image registry in helm/values.yaml. The naming convention expects
-  the '/images' suffix to be added to the package.json registry string and then
-  stored as the image.registry in the helm/values.yaml file.
+    The registry specified in the ${projectFilename} leverege stanza does not line up
+    with the image registry in helm/values.yaml. The naming convention expects
+    the '/images' suffix to be added to the ${projectFilename} registry string and then
+    stored as the image.registry in the helm/values.yaml file.
 
-    Current settings:
-      package.json registry => ${chalk.yellow.bold( artifactRegistry )}
-      values.yaml  registry => ${chalk.red.bold( values.image?.registry )}
+      Current settings:
+        ${projectFilename} registry => ${chalk.yellow.bold( artifactRegistry )}
+        values.yaml  registry => ${chalk.red.bold( values.image?.registry )}
 
-    Expected settings:
-      values.yaml  registry => ${chalk.green.bold( expectedChartRegistry )}
-  ` )
+      Expected settings:
+        values.yaml  registry => ${chalk.green.bold( expectedChartRegistry )}
+    ` )
 
     if ( !values.image ) {
       log( `
-  ${chalk.yellow.bold( '***DEPRECATED: legacy helm charts detected' )}
+    ${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.
+    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 )
@@ -269,11 +274,12 @@ if ( isPythonProject ) {
 }
 
 if ( imageVersion !== packageVersion ) {
+
   log( `
-  ${chalk.yellow.bold( '***WARNING: specified version does not match package.json version' )}
-        package.json => ${chalk.green.bold( packageVersion )}
-        specified    => ${chalk.red.bold( imageVersion )}
-  ` )
+      ${chalk.yellow.bold( `***WARNING: specified version does not match ${projectFilename} version` )}
+            ${projectFilename} => ${chalk.green.bold( packageVersion )}
+            specified    => ${chalk.red.bold( imageVersion )}
+      ` )
 
   if ( willGitTag ) {
     log( chalk.red.bold( '... and you are attempting to release so NOPE!\n' ) )
@@ -303,13 +309,16 @@ if ( willGitTag && !repoInfo.upstream ) {
 }
 
 if ( willGitTag ) {
-  if ( chart.appVersion !== imageVersion ) {
-    log( `
-  ${chalk.yellow.bold( '***WARNING: the helm/Chart.yaml appVersion does not align with the build version' )}
-    chart appVersion => ${chalk.yellow.bold( chart.appVersion )}
-    build version    => ${chalk.green.bold( imageVersion )}
-  ` )
+  if ( requiresHelmChart ) {
+    if ( chart.appVersion !== imageVersion ) {
+      log( `
+    ${chalk.yellow.bold( '***WARNING: the helm/Chart.yaml appVersion does not align with the build version' )}
+      chart appVersion => ${chalk.yellow.bold( chart.appVersion )}
+      build version    => ${chalk.green.bold( imageVersion )}
+    ` )
+    }
   }
+  
 }
 
 if ( process.env.DRY_RUN !== '1' ) {