@leverege/build-tools 2.16.0 → 2.16.2

package/lib/server/overwhelm.js

@@ -110,6 +110,14 @@ if (!fs.existsSync('overwhelm.yaml')) {
 
 const yaml = YAML.load(fs.readFileSync('overwhelm.yaml', 'utf-8'));
 const over = yaml.default;
+
+if (process.env.OVERWHELM_DEBUG) {
+  console.log({
+    over,
+    yaml
+  }, '<==Contents of the over and yaml structs');
+}
+
 let cfgs = yaml[context]; // If we just need to check context return 0 if cfgs exists, else error.
 
 if (args.checkctx) {
@@ -347,7 +355,6 @@ if (over.PROJECT_NAME === 'minikube') {
   process.exit(0);
 }
 
-console.log(over, `XXXXX=>[${clusterName}]`);
 const projectId = over.PROJECT_ID;
 let zone = over['GCE_REGION'] + (over['GCE_ZONE'] ? `-${over['GCE_ZONE']}` : '');
 

package/lib/web/overwhelm.js

@@ -110,6 +110,14 @@ if (!fs.existsSync('overwhelm.yaml')) {
 
 const yaml = YAML.load(fs.readFileSync('overwhelm.yaml', 'utf-8'));
 const over = yaml.default;
+
+if (process.env.OVERWHELM_DEBUG) {
+  console.log({
+    over,
+    yaml
+  }, '<==Contents of the over and yaml structs');
+}
+
 let cfgs = yaml[context]; // If we just need to check context return 0 if cfgs exists, else error.
 
 if (args.checkctx) {
@@ -347,7 +355,6 @@ if (over.PROJECT_NAME === 'minikube') {
   process.exit(0);
 }
 
-console.log(over, `XXXXX=>[${clusterName}]`);
 const projectId = over.PROJECT_ID;
 let zone = over['GCE_REGION'] + (over['GCE_ZONE'] ? `-${over['GCE_ZONE']}` : '');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.16.0",
+  "version": "2.16.2",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -54,14 +54,12 @@
     "command-line-args": "^5.2.1",
     "command-line-usage": "^6.1.3",
     "deepmerge": "^4.2.2",
-    "dotenv": "^16.0.1",
     "execa": "^5.1.1",
     "figlet": "^1.5.2",
     "glob": "^7.2.3",
     "inquirer": "^8.2.4",
     "js-yaml": "^4.1.0",
     "ncp": "^2.0.0",
-    "npm-check-updates": "^13.1.2",
     "npm-registry-fetch": "^11.0.0",
     "open": "^8.4.0",
     "ora": "^5.4.1",
@@ -71,11 +69,11 @@
     "simple-git": "^3.10.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.18.5",
-    "@babel/node": "^7.18.5",
+    "@babel/cli": "^7.18.6",
+    "@babel/core": "^7.18.6",
+    "@babel/node": "^7.18.6",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^8.13.1"
+    "npm": "^8.13.2"
   }
 }

package/src/bash-funcs

@@ -95,8 +95,6 @@ INSTALLING
 }
 
 function addHelmRepo() {
-  [ ! -z "$HELM_REPO_SKIP" ] && return
-
   local chart=$1
   local url=$2
 
@@ -109,6 +107,6 @@ REPOADD
 }
 
 function removeHelmRepo(){
-  [ ! -z "$HELM_REPO_SKIP" ] && return
+  [ ! -z "$SKIP_RM_HELM_REPO" ] && return
   helm repo remove $1 &>/dev/null
 }

package/src/helmup

@@ -140,13 +140,13 @@ function createNamespaceIfNeeded(){
 function installPrometheus() {
   # Add the community helm repositories
   addHelmRepo prometheus-community https://prometheus-community.github.io/helm-charts
-
+  [ -z "$PROMETHEUS_HELM_CHART" ] && PROMETHEUS_HELM_CHART="13"
   helm upgrade --install prometheus prometheus-community/prometheus \
     --namespace monitoring \
     --values prometheus/values.yaml \
-    --version 13
+    --version $PROMETHEUS_HELM_CHART
 
-# removeHelmRepo prometheus-community
+  removeHelmRepo prometheus-community
 }
 
 function installRedis() {
@@ -208,6 +208,17 @@ replica:
             values:
             - database
 REDIS_CHART_MODS
+  if [[ $? -ne 0 ]];
+  then
+    clearlyWarn noclear
+    cat<<OLDER_REDIS
+  The redis upgrade failed which may mean that the versions are different
+  enough that k8s cannot gracefully upgrade from one version to the next.
+  Try removing the existing deployment and redeploying redis:
+
+     $ `color r "helmdn redis && sleep 5 && helmup redis"`
+OLDER_REDIS
+  fi
   printf "\n\nTo start a specific version => `color g 'REDIS_HELM_CHART="13.0.1" helmup redis'`\n\n"
   removeHelmRepo bitnami
 }
@@ -378,7 +389,7 @@ function getManagedSecret() {
 
 # https://github.com/estafette/estafette-gke-preemptible-killer
 function installPreemptibleKiller() {
-  showInstalling "Preemptible Node Killing Adjusticator"
+  showInstalling "Preemptible Node Killing Coordinator"
   NAMESPACE="estafette"
   PROJECT_ID="$(getProjectIdFromK8sContext)"
   SVC_ACCT="preemptible-killer"
@@ -715,7 +726,7 @@ function installVelero() {
   ## Helpful debugging link => https://github.com/vmware-tanzu/helm-charts/issues/351
   addHelmRepo vmware-tanzu https://vmware-tanzu.github.io/helm-charts
   helm upgrade --install velero vmware-tanzu/velero \
-    --version 2.29 \
+    --version 2 \
     --namespace velero \
     --set credentials.useSecret="false" \
     --set configuration.provider="gcp" \

package/src/overwhelm.js

@@ -64,6 +64,10 @@ if ( !fs.existsSync( 'overwhelm.yaml' ) ) {
 //
 const yaml = YAML.load( fs.readFileSync( 'overwhelm.yaml', 'utf-8' ) )
 const over = yaml.default
+if ( process.env.OVERWHELM_DEBUG ) {
+  console.log( { over, yaml }, '<==Contents of the over and yaml structs' )
+}
+
 let cfgs = yaml[context]
 
 // If we just need to check context return 0 if cfgs exists, else error.
@@ -289,7 +293,6 @@ const clusterName = over.CLUSTER_NAME
 if ( over.PROJECT_NAME === 'minikube' ) {
   process.exit(0)
 }
-console.log( over, `XXXXX=>[${clusterName}]` )
 const projectId = over.PROJECT_ID
 let zone = over['GCE_REGION'] + ( over['GCE_ZONE'] ? `-${over['GCE_ZONE']}` : '' )