@leverege/build-tools 2.35.0-john.1 → 2.35.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.35.0-john.1",
+  "version": "2.35.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -57,7 +57,7 @@
     "command-line-usage": "^6.1.3",
     "deepmerge": "^4.3.1",
     "dotenv": "^16.3.1",
-    "enquirer": "^2.3.6",
+    "enquirer": "^2.4.1",
     "execa": "^5.1.1",
     "get-bin-path": "^10.0.0",
     "glob": "^8.1.0",
@@ -75,6 +75,6 @@
     "@babel/core": "^7.22.9",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^9.8.0"
+    "npm": "^9.8.1"
   }
 }

package/src/bash-funcs

@@ -137,7 +137,7 @@ function postToSlack() {
   local dts="`date +\"%c\"`"
   local slackURL="https://hooks.slack.com/services/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"
   local channel="#dev-ops-helm"
-  local slackmsg="\n--- $running \`$GCP_PROJECT_ID\` => $USER / `node --version` @ $dts\n \`$toPost\`"
+  local slackmsg="\n--- $running by \`$USER\` in \`$GCP_PROJECT_ID\` @ $dts\n \`$toPost\`\n node `node --version` / `build-tools --version` /  helm `helm version --short`\n"
 
   curl -X POST -H 'Content-type: application/json' \
            --data "{\"text\":\"$slackmsg\",\"channel\":\"$channel\"}" \

package/src/helmdn

@@ -94,7 +94,6 @@ function annihilateVelero() {
 function helmDown() {
   local namespace=${2:-default}
   local helmdn="helm uninstall $1 -n $namespace"
-  printf "Gonna=>[$helmdn]\n"
   eval $helmdn
   postToSlack $helmdn
 }
@@ -111,15 +110,15 @@ function doNuking() {
         ;;
 
       "elastic"|"elasticsearch")
-        helm uninstall elasticsearch
+        helmDown elasticsearch
         ;;
 
       "estafette"|"preemptible-killer")
-        helm uninstall -n estafette estafette-gke-preemptible-killer
+        helmDown estafette-gke-preemptible-killer estafette
         ;;
 
       "traefik")
-        helm uninstall -n traefik traefik
+        helmDown traefik traefik
         ;;
 
       "monitoring")
@@ -158,7 +157,6 @@ NOGRESS
 
       *)
         helmDown $SERVICE "default"
-        #helm -n default uninstall $SERVICE
     esac
   done
 }

package/src/helmup

@@ -119,7 +119,7 @@ function bootstrapLocalSetup() {
   then
     mkdir $SERVICE
   else
-    # If the service dir already exists but the nghelmup.plugin file is missing
+    # If the service dir already exists but the helmup.plugin file is missing
     # then this is most likely a legacy setup - for example, an older setup for
     # elasticsearch that only had an es-values.yaml file. Note that we cannot
     # get to this logic if the helmup.plugin file exists so no need to check

package/src/k8scale

@@ -1,22 +1,13 @@
 #!/bin/bash
 
-# Simple ANSI color coded string generator.
-function color() {
-  local color=
-  case "$1" in
-    'g') color="92m" ;; # green
-    'c') color="96m" ;; # lt blue
-    'y') color="93m" ;; # yellow
-    'r') color="91m" ;; # red
-    'toast') color="1;3;7;91;103;5m" ;;
-  esac
-  printf "\e[$color$2\e[0m"
-}
+# Load the standard helper functions
+. `build-tools --bashfun`
 
 GITTOP=`git rev-parse --show-toplevel` && cd $GITTOP
 
 overwhelm
 [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1
+GCP_PROJECT_ID="$(getProjectIdFromK8sContext)"
 
 REPLICAS=
 DIRECTION=$1 && shift
@@ -40,5 +31,6 @@ do
   kubectl scale --replicas=$REPLICAS deployment $SERVICE &>/dev/null
   [ $? -eq 1 ] && RESULTS="`color r FAILURE`"
   printf "  $RESULTS => $SERVICE\n"
+  postToSlack "k8scale $DIRECTION $SERVICE"
 done
 printf "\n\n"