@leverege/build-tools 2.6.6 → 2.6.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -79,6 +79,6 @@
     "@babel/node": "^7.15.4",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^7.22.0"
+    "npm": "^7.23.0"
   }
 }

package/src/dockreate

@@ -52,6 +52,7 @@ create_Dockerfile() {
   local regvers="${1}"
   local nodeimg="${2:-fermium-alpine}"
   local apkadds="${3}"
+
   echo "Creating the Dockerfile for node ${nodeimg}"
   cat<<DOCKERBLD > Dockerfile
 # Version ${regvers} @ `date`
@@ -73,11 +74,11 @@ ENV GRPC_VERBOSITY ERROR
   
 # Install packages to install private repos with ssh keys
 COPY ./.npmrc /usr/src/app/.npmrc
-RUN apk --no-cache add curl git openssh-client && \
+RUN apk --no-cache add openssh-client && \
     apk --update add --no-cache --virtual build-dep g++ gcc libgcc \\
       libstdc++ linux-headers make python ${apkadds} && \
     npm install -g npm@7 && \
-    npm ci --only-production --ignore-scripts --silent && \
+    npm ci --only-production --ignore-scripts ${npmlogging} && \
     rm -f /usr/src/app/.npmrc /root/.ssh/*
  
 # --------------------------------------------------------------
@@ -88,9 +89,11 @@ FROM node:${nodeimg}
  
 # Install tini for PID 1 and replace shell with bash so we can source files
 RUN apk update && \
-    apk add --no-cache tini bash vim ${apkadds} && \
+    apk add --no-cache bash curl tini vim ${apkadds} && \
+    npm install -g npm@7 && \
     rm /bin/sh && ln -s /bin/bash /bin/sh && \
-    mkdir -p /usr/src/app /tmp/levlog
+    mkdir -p /usr/src/app /tmp/levlog && \
+    chown node:node /usr/src/app
 DOCKERBLD
 
   if [ -f "${pluginFile}" ];
@@ -196,6 +199,9 @@ apkadds=$(strip_undefined "`node -p \"require('../package.json').leverege.apkadd
 runuser=$(strip_undefined "`node -p \"require('../package.json').leverege.runuser\"`")
 [ -z "${runuser}" ] && runuser='node'
 
+npmlogging='--silent' # allow for verbose npm logs
+[ "$VERBOSE_DOCKREATE_NPM" == "yes" ] && npmlogging='--ddd'
+
 echo "Updating dependencies and workspace..." && npm install
 
 container="`node -p \"require('../package.json').leverege.container\"`"
@@ -287,6 +293,7 @@ cat<<IMGINFO
   Project:   $(colorize 'green'  "$project")
   Container: $(colorize 'green'  "$container")
   NodeImage: $(colorize 'green'  "$nodeimg")
+  NPM Logs:  $(colorize 'green'  "$npmlogging")
   AddedPkgs: $(colorize 'green'  "$apkadds")
   PluggedIn: ${pluggedIn}
   Version:   $(colorize 'green'  "$version")  $tagstat

package/src/helmup

@@ -31,6 +31,7 @@ SYSTEM=(
   postgres
   timescale-db
   monitoring
+  preemptible-killer
   reloader
   traefik
   velero
@@ -236,6 +237,48 @@ function getManagedSecret() {
   echo $SECRET
 }
 
+function getProjectIdFromK8sContext() {
+  local currContext=`kubectl config current-context`
+   
+  IFS='_'
+  read -ra ADDR <<< "$currContext" 
+
+  echo ${ADDR[1]} # project id is the second string split by _
+}
+
+# https://github.com/estafette/estafette-gke-preemptible-killer
+function installPreemptibleKiller() {
+  PROJECT_ID="$(getProjectIdFromK8sContext)"
+  createNamespaceIfNeeded estafette
+  helm repo add estafette https://helm.estafette.io &>/dev/null
+
+  gcloud iam service-accounts create preemptible-killer \
+    --project=$PROJECT_ID \
+    --display-name preemptible-killer
+
+  gcloud iam roles create preemptible_killer \
+    --project $PROJECT_ID \
+    --title preemptible-killer \
+    --description "Delete compute instances" \
+    --permissions compute.instances.delete
+
+  local service_account_email=$(gcloud iam --project=$PROJECT_ID service-accounts list --filter preemptible-killer --format 'value([email])')
+  gcloud projects add-iam-policy-binding $PROJECT_ID \
+    --member=serviceAccount:${service_account_email} \
+    --role=projects/${PROJECT_ID}/roles/preemptible_killer &>/dev/null
+
+  gcloud iam service-accounts keys create \
+    --project=$PROJECT_ID \
+    --iam-account $service_account_email \
+    google_service_account.json &>/dev/null
+
+  helm upgrade --install estafette-gke-preemptible-killer \
+               estafette/estafette-gke-preemptible-killer \
+               --namespace estafette \
+               --set extraEnv.BLACKLIST_HOURS="10:00-02:00"
+#              --set extraEnv.WHITELIST_HOURS="12:30-13:30"
+}
+
 function installTraefik() {
   createNamespaceIfNeeded traefik
 
@@ -498,6 +541,10 @@ 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")
         # https://github.com/helm/charts/tree/master/stable/redis
         [ -z "$REDIS_HELM_CHART" ] && REDIS_HELM_CHART="v9.1.5"