@leverege/build-tools 2.11.5 → 2.12.0-john.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.11.5",
+  "version": "2.12.0-john.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
     "repository": {

package/src/dockreate

@@ -4,6 +4,24 @@ if [ -z "$1" ]; then
   exit 1
 fi
 
+# Load common bash functions
+. `build-tools --bashfun`
+GITTOP=`git rev-parse --show-toplevel`
+
+if [ ! -x "$(command -v jq)" ];
+then
+ cat<<NO_JQ
+ 
+  `color r "***ERROR: Missing jq JSON processor"` => `color g 'brew install jq'`
+
+NO_JQ
+ exit 1
+fi
+
+function packageJson() {
+  jq -r $1 $GITTOP/package.json
+}
+
 # Global Vars
 pluginFile="Dockerfile.plugin"
 
@@ -111,7 +129,7 @@ COPY --chown=node:node --from=intermediate /usr/src/app /usr/src/app
 
 USER ${runuser}
 COPY ./bashrc /home/node/.bashrc
-CMD [ "/bin/bash", "-c", "node index.js" ]
+CMD [ "/bin/bash", "-c", "node ${nodeops} index.js" ]
 EODOCKER
 } # end of create_Dockerfile
 
@@ -133,10 +151,11 @@ alias menv='env | sort | less'
 
 alias whatsmyip='wget -qO- ifconfig.co'
 
-alias dbg='wget -q -O- localhost:5111/logLevel/debug'
-alias inf='wget -q -O- localhost:5111/logLevel/info'
 alias err='wget -q -O- localhost:5111/logLevel/error'
 alias wrn='wget -q -O- localhost:5111/logLevel/warn'
+alias inf='wget -q -O- localhost:5111/logLevel/info'
+alias dbg='wget -q -O- localhost:5111/logLevel/debug'
+alias trc='wget -q -O- localhost:5111/logLevel/trace'
 
 cmetrics()
 {
@@ -174,7 +193,7 @@ ROTOKEN
 fi
 
 # Look for leverege specifics, but only require the project name.
-project=$(strip_undefined "`node -p \"require('../package.json').leverege.project\"`")
+project=$(packageJson .leverege.project)
 if [ "$project" == "" ];
 then
   cat<<NOPROJ
@@ -193,10 +212,12 @@ NOPROJ
   exit 1
 fi
 
-nodeimg=$(strip_undefined "`node -p \"require('../package.json').leverege.nodeimg\"`")
+# TODO: these should be combined into one require
+nodeimg=$(packageJson '.leverege.nodeimg')
 nodeimg="${nodeimg:-gallium-alpine}"
-apkadds=$(strip_undefined "`node -p \"require('../package.json').leverege.apkadds\"`")
-runuser=$(strip_undefined "`node -p \"require('../package.json').leverege.runuser\"`")
+nodeops=$(packageJson '.leverege.nodeops')
+apkadds=$(packageJson '.leverege.apkadds')
+runuser=$(packageJson '.leverege.runuser')
 [ -z "${runuser}" ] && runuser='node'
 
 npmlogging='--silent' # allow for verbose npm logs
@@ -224,6 +245,8 @@ NOCONTAINER
   container=$(basename $gitremote .git)
 fi
 gcimage=gcr.io/$project/$container
+artifactory=us-docker.pkg.dev/leverege-registry/artifactory
+registry=$artifactory/$container/images
 
 version=$1
 [[ -f '.previous' ]] && previous=`cat .previous` || previous='FIRST BUILD'
@@ -289,10 +312,11 @@ 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")
+  NopeOps:   $(colorize 'yellow' "$nodeops")
   NPM Logs:  $(colorize 'green'  "$npmlogging")
   AddedPkgs: $(colorize 'green'  "$apkadds")
   PluggedIn: ${pluggedIn}
@@ -301,6 +325,7 @@ cat<<IMGINFO
   Previous:  $(colorize 'yellow' "$previous")
   DateStamp: $(colorize 'green'  "$pckgdts")
   GCImage:   $(colorize 'green'  "$gcimage:$version")
+  Registry:  $(colorize 'yellow' "$registry:$version")
 
 IMGINFO
 
@@ -372,6 +397,7 @@ fi
 
 # Tag the container with the node detailsand the culprit.
 gcloud container images add-tag --quiet $gcimage:$version $gcimage:$pckgdts-$nodeimg-$USER
+[ "$USE_ARTIFACTORY" == "yes" ] && gcloud container images add-tag --quiet $gcimage:$version $registry:$version &
 
 if [ $tagging ];
 then

package/src/helmup

@@ -164,8 +164,7 @@ SA_EXISTS
   helm upgrade --install grafana grafana/grafana \
     --namespace monitoring \
     --values grafana/values-grafana.yaml \
-#   --version 6.11 # 6.11 last of v7 grafana
-    --version 6.21 # latest v8 grafana
+    --version 6.26.5 # latest v8 grafana
 }
 
 function monitoringHelp(){
@@ -275,6 +274,8 @@ function installPreemptibleKiller() {
 }
 
 function installCronZombieKiller() {
+  local BATCH_SYNTAX='batch/v1' # GKE 1.21 and beyond
+  [ ! -z "$PRE_GKE_21" ] && BATCH_SYNTAX='batch/v1beta1'
   cat<<END_OF_ZOMBIE | kubectl apply -f -
 apiVersion: v1
 kind: ServiceAccount
@@ -306,7 +307,7 @@ roleRef:
   name: pod-accessor-role
   apiGroup: ""
 ---
-apiVersion: batch/v1
+apiVersion: $BATCH_SYNTAX
 kind: CronJob
 metadata:
   namespace: default
@@ -334,6 +335,19 @@ spec:
               - "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
+
+  if [[ $? -eq 1 ]];
+  then
+    cat<<OLDER_GKE
+
+  Deployment failed is the GKE version pre 1.21? Try rerunning with PRE_GKE_21 defined:
+
+     $ `color y "PRE_GKE_21=1 helmup zombie-killer"`
+
+
+OLDER_GKE
+  exit 1
+  fi
 }
 
 function installCertManager() {
@@ -680,6 +694,10 @@ function doInstall() {
           --set volumeClaimTemplate.storageClassName="ssd"
         ;;
 
+      "estafette"|"preemptible-killer")
+        installPreemptibleKiller # the gke preemptible node spreader outer
+        ;;
+
       "monitoring")
         installMonitoringCharts
         monitoringHelp
@@ -695,10 +713,6 @@ function doInstall() {
         helm upgrade --install postgres bitnami/postgresql -f postgres/postgres-values.yaml --version 8.9.6
         ;;
 
-      "preemptible-killer")
-        installPreemptibleKiller # the gke preemptible node spreader outer
-        ;;
-
       "redis")
         showInstalling "Redis Network Cache"
         addHelmRepo bitnami https://charts.bitnami.com/bitnami
@@ -799,6 +813,9 @@ NOTRUNNING
 }
 
 # ---------- helmup MAIN ----------
+GITTOP=`git rev-parse --show-toplevel` && cd $GITTOP
+K8S_UTILS="${GITTOP}/k8s-utils"
+
 overwhelm
 [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1