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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.86.0-beta.1",
+  "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,7 +580,7 @@ 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 deploymentTarget = closestPackageJson?.leverege.deploymentTarget || rootPyProjectToml?.leverege['deployment-target'] || [ 'k8s' ]
+  const requiresHelmChart = closestPackageJson?.leverege.requiresHelmChart || rootPyProjectToml?.leverege['requires-helm-chart'] || [ 'k8s' ]
 
   const currentDir = process.cwd()
   const closestPkg = await packageUp()
@@ -603,7 +603,7 @@ export const analyzeRepository = async ( giveGuidance ) => {
     artifactProject,
     artifactRegistry,
     buildToolsVersion,
-    deploymentTarget,
+    requiresHelmChart,
     containerName,
     imagePlatform,
     currentDir,

package/src/docker-to-registry.mjs

@@ -90,7 +90,7 @@ if ( semver.lt( semver.coerce( repoDescr.buildToolsVersion ), minimumBuildToolsV
 const {
   artifactProject,
   artifactRegistry,
-  deploymentTarget,
+  requiresHelmChart,
   packageVersion,
   containerName,
   imagePlatform,
@@ -101,9 +101,7 @@ const {
   isPythonProject,
 } = repoDescr
 
-const deploymentTargetIncludesK8s = deploymentTarget.includes( 'k8s' )
-
-if ( deploymentTargetIncludesK8s ) {
+if ( requiresHelmChart ) {
   if ( !fs.existsSync( './helm' ) ) {
     log( `
     ${chalk.red.bold( '***Error: docker-to-registry requires a helm chart directory' )}
@@ -204,7 +202,7 @@ if ( giveGuidance ) {
 
 // do chart checks too
 let chart
-if ( deploymentTargetIncludesK8s && options?.helmChecks !== 'false' ) {
+if ( requiresHelmChart && options?.helmChecks !== 'false' ) {
   chart = helmChart?.yaml['Chart.yaml']
   const values = helmChart?.yaml['values.yaml']
   const expectedChartRegistry = `${artifactRegistry}/images`
@@ -311,7 +309,7 @@ if ( willGitTag && !repoInfo.upstream ) {
 }
 
 if ( willGitTag ) {
-  if ( deploymentTargetIncludesK8s ) {
+  if ( requiresHelmChart ) {
     if ( chart.appVersion !== imageVersion ) {
       log( `
     ${chalk.yellow.bold( '***WARNING: the helm/Chart.yaml appVersion does not align with the build version' )}