@leverege/build-tools 2.97.0 → 2.98.0

package/src/init-my-chart/{leaf-chart-templates/values.yaml.hbs → values.yaml.hbs}

@@ -3,7 +3,7 @@
 # Declare variables to be passed into your templates.
 image:
   pullPolicy: IfNotPresent
-  registry: {{artifactRegistry}}
+  registry: {{hbsArtifactRegistry}}
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
@@ -32,12 +32,12 @@ fullnameOverride: ""
 # When multiple charts or pieces of software are used together to make one
 # application. For example, application software and a database to produce
 # a website. This can be set to the top level application being supported.
-partOf: "{{partOf}}"
+partOf: {{hbsPartOf}} # leverege-stack or project-x - OPTIONAL
 
 # overwhelm will auto inject project_id, host and ingress into service
 service:
   project_id: set-in-values-yaml
-  preemptible: false
+  preemptible: {{hbsServicePreemptible}} # true or false - OPTIONAL
   type: ClusterIP
 
 serviceAccount:
@@ -51,36 +51,17 @@ serviceAccount:
 
 # enable the service monitor for providing metrics to the prometheus operator
 serviceMonitor:
-  enabled: false
+  enabled: true
   interval: "60s"
   namespace: "default" # namespace where service to scrape resides
 
-# can be used to set load balancer to registered static IP
-loadbalancer:
-  ip: ""
-
-udploadbalancer:
-  ip: ""
-
 # liveness and readiness probe to prove k8s health
 probes:
   enabled: true
-  livenessProbe:
-    httpGet:
-      path: /livenessProbe
-      port: http
-    initialDelaySeconds: 30
-    periodSeconds: 60
-  readinessProbe:
-    httpGet:
-      path: /healthz
-      port: http
-    initialDelaySeconds: 30
-    periodSeconds: 10
 
 # this tells calico that redis access is needed
 redis:
-  enabled: {{redisEnabled}}
+  enabled: {{hbsRedisEnabled}}
 
 # setting to false will allow pod disk to mount read/write
 # setting this to false should only be done for debugging
@@ -101,7 +82,7 @@ resources:
 
 # use auto scaling for dynamically sized workloads
 autoscaling:
-  enabled: false # set to false for static scaling
+  enabled: {{hbsAutoscalingEnabled}} # set to false for static scaling
   minReplicas: 2
   maxReplicas: 8
   averageCPU: 75
@@ -120,16 +101,10 @@ pdb:
 
 affinity: {}
 
-# typically handled by traefik, but not always
-ingressRoute:
-  host: ""
+tolerations: []
 
 nodeSelector: {}
 
 podAnnotations: {}
 
-tolerations: []
-
 workloadIdentity: {}
-
-canary: {}

package/src/k8scale.sh

@@ -36,6 +36,8 @@ else
   overwhelm || { printf "\n\n***Aborting helmup...\n\n"; exit 1; }
 fi
 
+GCP_PROJECT_ID="$(getProjectIdFromK8sContext)"
+
 printf "   scaled => `color g $DIRECTION`\n\n"
 for DEPLOYMENT in "$@";
 do

package/src/init-my-chart/init-my-chart-v1.mjs

@@ -1,124 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable security/detect-non-literal-fs-filename */
-
-// failed first attempt just keeping for reference - see Chartwright
-//
-import fs from 'node:fs'
-import path from 'node:path'
-
-import { program } from 'commander'
-import chalk from 'chalk'
-import handlebars from 'handlebars'
-
-import {
-  BUILD_TOOLS_ROOT,
-  analyzeRepository,
-  condir,
-  debug,
-  enableDebug,
-  errorExit,
-  log, 
-} from '../Utils.mjs'
-
-program
-  .name( 'init-my-chart' )
-  .description( 'Initialize a helm chart based on the latest Leverege leaf template' )
-  .option( '--dry-run', 'Print output to console instead of generating the char' )
-  .option( '--debug', 'Enable debug logging - use BUILD_TOOLS_DEBUG=1 for global' )
-  .parse()
-  
-const options = program.opts()
-
-const DEFAULT_LIVENESS = {
-  httpGet : {
-    path : '/livenessProbe',
-    port : 'http'
-  },
-  initialDelaySeconds : 30,
-  periodSeconds : 60
-} 
-const DEFAULT_READINESS = {
-  httpGet : {
-    path : '/healthz',
-    port : 'http'
-  },
-  initialDelaySeconds : 30,
-  periodSeconds : 10
-}
-
-const initMyChartRoot = `${BUILD_TOOLS_ROOT}/init-my-chart`
-const repo = await analyzeRepository()
-
-if ( !repo.isGitRepo ) {
-  errorExit( '***ERROR: This command must be run inside a git repository - run "git init" to proceed' )
-}
-
-if ( options.debug ) {
-  enableDebug()
-}
-
-if ( !repo.helmChart ) {
-  log( '*** Bootstrap with the Default Helm Template' ) // TODO: finish this
-  process.exit( 1 )
-}
-
-const { Chart, Values, Registry, } = repo.helmChart
-const gitRoot = repo.gitRoot
-
-if ( fs.existsSync( `${gitRoot}/helm-old` ) ) {
-  errorExit( '***ERROR: An old helm chart structure already exists - cannot proceed' )
-}
-
-let movedOldHelm = false
-if ( fs.existsSync( `${gitRoot}/helm` ) && !options.dryRun ) {
-  fs.renameSync( `${gitRoot}/helm`, `${gitRoot}/helm-old` )
-  movedOldHelm = true
-}
-
-debug( { initMyChartRoot, movedOldHelm, repo }, '<==InitMyChart Root Variables' )
-
-// initialize the chart templating engine
-const helmTemplates = `${initMyChartRoot}/leaf-chart-templates`
-const chartTemplateContent = fs.readFileSync( `${helmTemplates}/Chart.yaml.hbs`, 'utf8' )
-const chartTemplate = handlebars.compile( chartTemplateContent )
-const valuesTemplateContent = fs.readFileSync( `${helmTemplates}/values.yaml.hbs`, 'utf8' )
-const valuesTemplate = handlebars.compile( valuesTemplateContent )
-
-// perform handlebars replacements
-const chartOutput = chartTemplate( { 
-  containerName : Chart.name,
-  chartVersion : Chart.version || '0.1.0',
-  chartAppVersion : Chart.appVersion || 'v0.1.0',
-} )
-
-const valuesOutput = valuesTemplate( { 
-  artifactRegistry : repo.helmChart.imageRegistry,
-  partOf : repo.helmChart.partOf,
-  redisEnabled : repo.redisEnabled,
-} )
-
-if ( options.dryRun ) {
-  condir( { Chart, Values, Registry, }, chalk.green( '=== Analyzed Repository Helm Chart Info ===' ) )
-  condir( { chartOutput, valuesOutput }, chalk.green( '=== Generated Helm Chart Outputs ===' ) )
-  log( { chartOutput }, chalk.green( '=== Chart.yaml ===' ) )
-  log( { valuesOutput }, chalk.green( '=== values.yaml ===' ) )
-  process.exit( 0 )
-}
-
-// Start building up the new chart structure
-const helmDir = `${gitRoot}/helm`
-if ( !fs.existsSync( helmDir ) ) {
-  fs.mkdirSync( helmDir )
-}
-
-// Copy over all the template files and then apply customizations to Chart and values
-fs.cpSync( helmTemplates, helmDir, {
-  recursive : true, 
-  filter : ( src, dest ) => path.extname( src ) !== '.hbs', // ignore handlebars templates
-} )
-fs.writeFileSync( `${helmDir}/Chart.yaml`, chartOutput, 'utf8' )
-fs.writeFileSync( `${helmDir}/values.yaml`, valuesOutput, 'utf8' )
-
-if ( movedOldHelm ) {
-  log( chalk.yellow( 'An existing helm chart was detected and moved to helm-old. Please review and migrate any customizations as needed.' ) )
-}