@leverege/build-tools 2.10.1 → 2.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.10.1",
+  "version": "2.11.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
     "repository": {
@@ -51,13 +51,13 @@
     "chalk": "^4.1.2",
     "clipboardy": "^2.3.0",
     "command-line-args": "^5.2.1",
-    "command-line-usage": "^6.1.1",
+    "command-line-usage": "^6.1.2",
     "deepmerge": "^4.2.2",
     "dotenv": "^16.0.0",
     "execa": "^5.1.1",
     "figlet": "^1.5.2",
     "glob": "^7.2.0",
-    "inquirer": "^8.2.1",
+    "inquirer": "^8.2.2",
     "js-yaml": "^4.1.0",
     "ncp": "^2.0.0",
     "npm-registry-fetch": "^11.0.0",
@@ -66,7 +66,7 @@
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
     "semver": "^7.3.5",
-    "simple-git": "^3.4.0"
+    "simple-git": "^3.5.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.17.6",
@@ -74,6 +74,6 @@
     "@babel/node": "^7.16.8",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^8.5.5"
+    "npm": "^8.6.0"
   }
 }

package/src/dirty-git

@@ -3,9 +3,10 @@
 CLEAN="\e[32m✔\e[0m"
 DIRTY="\e[31m✘\e[0m"
 STASH="\e[33;44m$\e[0m"
+AHEAD="\e[34;42m!\e[0m"
 
 clear
-printf "${CLEAN} clean  ${DIRTY} dirty  ${STASH} stashed\n\n"
+printf "${CLEAN} clean  ${DIRTY} dirty  ${STASH} stashed ${AHEAD} unpushed\n\n"
 for dir in $@;
 do
   [ ! -d $dir ] || [ ! -d $dir/.git ] && continue
@@ -14,6 +15,8 @@ do
   [[ `git status --porcelain` ]] && status="$DIRTY" || status="$CLEAN"
   scount=`git stash list | wc -l`
   [ $scount -gt 0 ] && stash="\e[33;44m$\e[0m" || stash=" "
+  ahead=`git rev-list FETCH_HEAD..HEAD --count`
+  [ $ahead -gt 0 ] && ahead="$AHEAD" || ahead=" "
   cd - &>/dev/null
-  printf "${status} %-28s ${stash} %s\n" $dir $branch
+  printf "${status} %-28s ${stash}${ahead} %s\n" $dir $branch
 done

package/src/dockreate

@@ -223,7 +223,9 @@ NOCONTAINER
   fi
   container=$(basename $gitremote .git)
 fi
-gcimage=gcr.io/$project/$container
+#gcimage=gcr.io/$project/$container
+gcimage=us-central1-docker.pkg.dev/$project/kudelski/$container
+gcimage=us-docker.pkg.dev/$project/leverege/$container
 
 version=$1
 [[ -f '.previous' ]] && previous=`cat .previous` || previous='FIRST BUILD'
@@ -289,7 +291,7 @@ pluggedIn=$(colorize 'green' "no")
 [ -f "${pluginFile}" ] && pluggedIn=$(colorize 'yellow' "YES")
 
 cat<<IMGINFO
-
+  LOCAL LOCAL LOCAL
   Project:   $(colorize 'green'  "$project")
   Container: $(colorize 'green'  "$container")
   NodeImage: $(colorize 'green'  "$nodeimg")

package/src/helmup

@@ -31,6 +31,7 @@ SYSTEM=(
   postgres
   timescale-db
   preemptible-killer
+  zombie-killer
   reloader
   cert-manager
   traefik
@@ -273,6 +274,67 @@ function installPreemptibleKiller() {
   [ -f "google_service_account.json" ] && rm google_service_account.json
 }
 
+function installCronZombieKiller() {
+  cat<<END_OF_ZOMBIE | kubectl apply -f -
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: cronjob-sa
+  namespace: default
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: pod-accessor-role
+  namespace: default
+rules:
+- apiGroups: [""]
+  resources: ["pods"]
+  verbs: ["get","delete","watch","list"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: pod-access
+  namespace: default
+subjects:
+- kind: ServiceAccount
+  name: cronjob-sa
+  namespace: default
+roleRef:
+  kind: Role
+  name: pod-accessor-role
+  apiGroup: ""
+---
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  namespace: default
+  name: cron-zombie-killer
+spec:
+  schedule: "*/4 * * * *"
+  successfulJobsHistoryLimit: 1
+  jobTemplate:
+    spec:
+      template:
+        metadata:
+          name: cron-zombie-killer
+          namespace: default
+        spec:
+          serviceAccountName: cronjob-sa
+          restartPolicy: Never
+          containers:
+          - name: cron-zombie-killer
+            image: bitnami/kubectl
+            command:
+              - "/bin/sh"
+            args:
+              - "-c"
+              - "echo Zombie Hunting `date` ; kubectl get pods -n default --field-selector='status.phase==Failed' -o name | xargs kubectl delete -n default 2> /dev/null"
+status: {}
+END_OF_ZOMBIE
+}
+
 function installCertManager() {
   showInstalling "Cert Managment"
   createNamespaceIfNeeded cert-manager
@@ -553,12 +615,12 @@ DEPRECATED_CHART
 }
 
 doHelmup() {
-  local helmup="$1"
-  local doing="Helming => `color g \"$HELMUP\"`"
+  local helmup="$@"
+  local doing="Helming => `color g \"$helmup\"`"
   local from=
   [ ! -z "$FROM_VERSIONS" ] && from="`color y \"<= from Versions.json\"`"
   printf "$doing $from\n"
-  $HELMUP
+  $helmup
 }
 
 # not a fan of global vars but bash forced me to - set by getServiceAndChartVersion
@@ -567,7 +629,7 @@ CHARTVER=
 FROM_VERSIONS=
 function doInstall() {
 
-  helm repo remove stable &> /dev/null # stable was deprecated
+# helm repo remove stable &> /dev/null # stable was deprecated
   helm repo update &> /dev/null
 
   for PARAM in "$@";
@@ -598,6 +660,10 @@ function doInstall() {
         installCertManager
         ;;
 
+      "cronZombieKiller"|"zombie-killer")
+        installCronZombieKiller # eradicate the gke 1.20+ zombies
+        ;;
+
       "custom-metrics")
         kubectl create -f https://raw.githubusercontent.com/GoogleCloudPlatform/k8s-stackdriver/master/custom-metrics-stackdriver-adapter/deploy/production/adapter.yaml
         ;;
@@ -684,6 +750,17 @@ function doInstall() {
         fi
 
         printf "\n--------------------------------------------------------------\nCharting $SERVICE\n"
+        if [ ! -x "$(command -v service-man)" ];
+        then
+          cat<<NO_SERVICE_MAN
+
+$RED_ERROR The Leverege service-man utility is missing - install and rerun helmup
+
+    `color g "npm i -g @leverege/service-man"`
+
+NO_SERVICE_MAN
+          exit 1
+        fi
         service-man --from-helmup --create-service $SERVICE
 
         # By default the museum chart name will be the same as the service, but
@@ -721,55 +798,8 @@ NOTRUNNING
 }
 
 # ---------- helmup MAIN ----------
-GITTOP=`git rev-parse --show-toplevel` && cd $GITTOP
-if [ -d "${GITTOP}/k8-utils" ];
-then
-  cat<<BADK8
-
-$YELO_WARN The k8_utils directory should be renamed to k8s_utils
-
-  This repository has the old k8_util directory name in place. Please rename
-  it to the newer k8s_utils directory that `color c helmup` will be looking for.
-
-  Run this => `color g "git mv k8-utils k8s-utils; git add k8*utils"`
-
-$YELO_WARN Don't forget to commit and push after the renaming.
-
-BADK8
-  exit 1
-fi
-
-K8S_UTILS="${GITTOP}/k8s-utils"
-if [ ! -d "$K8S_UTILS" ];
-then
-  cat<<EOK8S
-
-$RED_ERROR Missing the k8s utils dir => `color y $K8S_UTILS`
-
-  This is a relatively new directory setup that should be copied over from one
-  of the other configuration branches. The new-baseline branch should have this
-  setup in place, so check there.
-
-EOK8S
-
-  exit 1
-fi
-
 overwhelm
 [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1
 
 doInstall $@
 cd - &> /dev/null
-
-OLD_MONITORING="${GITTOP}/values-monitoring.yaml"
-if [ -f "$OLD_MONITORING" ];
-then
-  cat<<OLDMON
-
-$YELO_WARN The old monitoring setup has been detected.
-            Upgrade by running => `color g "helmup monitoring"`
-
-OLDMON
-  exit 1
-fi 
-