@leverege/build-tools 2.15.0 → 2.16.1

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) {
@@ -342,6 +350,11 @@ glob.sync('**/*.ovh').forEach(cfgmap => {
 }); // Set the GCP context for safety!
 
 const clusterName = over.CLUSTER_NAME;
+
+if (over.PROJECT_NAME === 'minikube') {
+  process.exit(0);
+}
+
 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) {
@@ -342,6 +350,11 @@ glob.sync('**/*.ovh').forEach(cfgmap => {
 }); // Set the GCP context for safety!
 
 const clusterName = over.CLUSTER_NAME;
+
+if (over.PROJECT_NAME === 'minikube') {
+  process.exit(0);
+}
+
 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.15.0",
+  "version": "2.16.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -68,7 +68,7 @@
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
     "semver": "^7.3.7",
-    "simple-git": "^3.9.0"
+    "simple-git": "^3.10.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.17.10",
@@ -76,6 +76,6 @@
     "@babel/node": "^7.18.5",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^8.12.2"
+    "npm": "^8.13.1"
   }
 }

package/src/dockreate

@@ -44,6 +44,7 @@ pluginFile="Dockerfile.plugin"
 
 # cleanup trapper for gracefully killing, which doesn't do much right now
 cleanup() {
+  [ ! -z "$DOCKER_SKIP_CLEANUP" ] && printf "\nSkipping clean up\n\n" && exit 1
   printf "\nCleaning up and exiting...\n\n"
   rm -rf ./workspace $SSHDIR .npmrc
   exit 0

package/src/helmup

@@ -44,7 +44,7 @@ SYSTEM=(
 
 # support for legacy bitnami charts
 function addBitnamiRepo() {
-  if [ ! -z "$BITNAMI_LATEST" ];
+  if [ ! -z "$BITNAMI_LATEST" ] || [ "$1" == "latest" ];
   then
     BITNAMI_URL="https://charts.bitnami.com/bitnami"
   else
@@ -149,6 +149,69 @@ function installPrometheus() {
 # removeHelmRepo prometheus-community
 }
 
+function installRedis() {
+  showInstalling "Redis Network Cache"
+  addBitnamiRepo latest
+  [ -z "$REDIS_HELM_CHART" ] && REDIS_HELM_CHART="16" # latest breaks us => "v14+"
+  helm upgrade --install redis bitnami/redis \
+    --version $REDIS_HELM_CHART \
+    -f - <<REDIS_CHART_MODS
+auth:
+  enabled: false
+
+global:
+  storageClass: ssd
+
+metrics:
+  enabled: true
+
+networkPolicy:
+  enabled: true
+
+master:
+  persistence:
+    size: 8Gi # 8Gi is default
+
+  tolerations:
+  - key: "database"
+    operator: "Equal"
+    value: "true"
+    effect: "NoSchedule"
+
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: target-env
+            operator: In
+            values:
+            - database
+
+replica:
+  persistence:
+    size: 8Gi # 8Gi is default
+
+  tolerations:
+  - key: "database"
+    operator: "Equal"
+    value: "true"
+    effect: "NoSchedule"
+
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: target-env
+            operator: In
+            values:
+            - database
+REDIS_CHART_MODS
+  printf "\n\nTo start a specific version => `color g 'REDIS_HELM_CHART="13.0.1" helmup redis'`\n\n"
+  removeHelmRepo bitnami
+}
+
 function installMonitoringCharts(){
   showInstalling "Monitoring Components"
   createNamespaceIfNeeded monitoring
@@ -326,6 +389,8 @@ function installPreemptibleKiller() {
   printf "\nCreating the gcloud $SVC_ACCT service account (SA)\n"
   gcloud iam service-accounts create $SVC_ACCT \
     --project $PROJECT_ID \
+    --description "Estafette Node Killer SA" \
+    --display-name "Estafette Node Killer SA"
   warnOnError $? "SA creation may have failed or it already exists"
 
   printf "\nCreate the $SVC_ACCT IAM role\n"
@@ -836,15 +901,7 @@ function doInstall() {
         ;;
 
       "redis")
-        showInstalling "Redis Network Cache"
-        addBitnamiRepo
-        [ -z "$REDIS_HELM_CHART" ] && REDIS_HELM_CHART="13.0.1" # latest breaks us => "v14+"
-        helm upgrade --install redis bitnami/redis \
-          -f redis/redis-values.yaml \
-          --set auth.enabled=false \
-          --version $REDIS_HELM_CHART
-        printf "\n\nTo start a specific version => `color g 'REDIS_HELM_CHART="13.0.1" helmup redis'`\n\n"
-        removeHelmRepo bitnami
+        installRedis
         ;;
 
       "reloader")

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.
@@ -286,6 +290,9 @@ glob.sync( '**/*.ovh' ).forEach( ( cfgmap ) => {
 
 // Set the GCP context for safety!
 const clusterName = over.CLUSTER_NAME
+if ( over.PROJECT_NAME === 'minikube' ) {
+  process.exit(0)
+}
 const projectId = over.PROJECT_ID
 let zone = over['GCE_REGION'] + ( over['GCE_ZONE'] ? `-${over['GCE_ZONE']}` : '' )