@leverege/build-tools 2.6.5 → 2.6.7

package/lib/server/repo-init/templates/ToBuildSpec.js

@@ -1,7 +1,5 @@
 "use strict";
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 const {
   Transform
 } = require('stream');
@@ -17,79 +15,76 @@ class ToBuildSpec extends Transform {
     super({
       objectMode: true
     });
+    this.buildSpec = buildSpec;
+    this.regexp = new RegExp('REPI:<(\\w+\\.*\\w*)>', 'g');
+  }
 
-    _defineProperty(this, "_transform", function _transformFunc(chunk, encoding, done) {
-      const chunkStr = chunk.toString();
-      /**
-       * Concern of possible partial strings when working with large files.
-       * In this case, most source will be less than 10K so this should not
-       * be a problem for the most part, but error out if it occurs.
-       */
-
-      if (!chunkStr.endsWith('\n')) {
-        // TODO: This logic if flawed looking for \n
-        console.error(`***PARTIAL LINE***[${chunkStr}]`);
-        process.exit(1); // TODO: throw something not exit
+  _transform = function _transformFunc(chunk, encoding, done) {
+    const chunkStr = chunk.toString();
+    /**
+     * Concern of possible partial strings when working with large files.
+     * In this case, most source will be less than 10K so this should not
+     * be a problem for the most part, but error out if it occurs.
+     */
+
+    if (!chunkStr.endsWith('\n')) {
+      // TODO: This logic if flawed looking for \n
+      console.error(`***PARTIAL LINE***[${chunkStr}]`);
+      process.exit(1); // TODO: throw something not exit
+    }
+    /**
+     * Used for pulling nested or flat values from the buildSpec. This allows
+     * the build spec to look like this:
+     * {
+     *   gitName : 'myName',
+     *   git : {
+     *     name : 'myName',
+     *   }
+     * }
+     * and either can be retrieved with a key of gitName or git.name.
+     */
+
+
+    const valueFromSpec = (key, spec = this.buildSpec) => {
+      if (!key.match(/\.+/)) {
+        return spec[key];
       }
-      /**
-       * Used for pulling nested or flat values from the buildSpec. This allows
-       * the build spec to look like this:
-       * {
-       *   gitName : 'myName',
-       *   git : {
-       *     name : 'myName',
-       *   }
-       * }
-       * and either can be retrieved with a key of gitName or git.name.
-       */
-
-
-      const valueFromSpec = (key, spec = this.buildSpec) => {
-        if (!key.match(/\.+/)) {
-          return spec[key];
-        }
-
-        const keys = key.split('.');
-        return valueFromSpec(keys[1], spec[keys[0]]);
-      };
 
-      const splitLines = chunkStr.split('\n');
-      const xfmLines = splitLines.map(line => {
-        let replaced = line;
+      const keys = key.split('.');
+      return valueFromSpec(keys[1], spec[keys[0]]);
+    };
 
-        for (const match of line.matchAll(this.regexp)) {
-          // eslint-disable-line no-restricted-syntax
-          const replaceWith = valueFromSpec(match[1]);
+    const splitLines = chunkStr.split('\n');
+    const xfmLines = splitLines.map(line => {
+      let replaced = line;
 
-          if (typeof replaceWith === 'undefined') {
-            // console.log( `Skipping unknown build spec property =>[${match[1]}]` )//XXX
-            continue;
-          }
+      for (const match of line.matchAll(this.regexp)) {
+        // eslint-disable-line no-restricted-syntax
+        const replaceWith = valueFromSpec(match[1]);
 
-          replaced = replaced.replace(match[0], replaceWith);
+        if (typeof replaceWith === 'undefined') {
+          // console.log( `Skipping unknown build spec property =>[${match[1]}]` )//XXX
+          continue;
         }
 
-        return replaced;
-      });
-      const xfmString = xfmLines.join('\n');
-      this.push(Buffer.from(xfmString));
-      done();
-    });
+        replaced = replaced.replace(match[0], replaceWith);
+      }
 
-    _defineProperty(this, "_flush", function _flushFunc(done) {
-      /**
-        if ( this._partialLine ) {
-          this.push( [ this._partialLine ] )
-        }
-         this._partialLine = null
-        */
-      done();
+      return replaced;
     });
-
-    this.buildSpec = buildSpec;
-    this.regexp = new RegExp('REPI:<(\\w+\\.*\\w*)>', 'g');
-  }
-
+    const xfmString = xfmLines.join('\n');
+    this.push(Buffer.from(xfmString));
+    done();
+  };
+  _flush = function _flushFunc(done) {
+    /**
+      if ( this._partialLine ) {
+        this.push( [ this._partialLine ] )
+      }
+       this._partialLine = null
+      */
+    done();
+  };
 }
 
 module.exports = ToBuildSpec;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.6.5",
+  "version": "2.6.7",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -64,21 +64,21 @@
     "inquirer": "^8.1.2",
     "js-yaml": "^4.1.0",
     "ncp": "^2.0.0",
-    "npm-check-updates": "^11.8.3",
+    "npm-check-updates": "^11.8.5",
     "npm-registry-fetch": "^11.0.0",
     "open": "^8.2.1",
     "ora": "^5.4.1",
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
     "semver": "^7.3.5",
-    "simple-git": "^2.44.0"
+    "simple-git": "^2.45.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.8",
-    "@babel/core": "^7.15.0",
-    "@babel/node": "^7.14.9",
-    "@leverege/babel-preset-leverege-node": "^1.2.0",
-    "@leverege/eslint-config-leverege": "^3.0.0",
-    "npm": "^7.20.6"
+    "@babel/cli": "^7.15.4",
+    "@babel/core": "^7.15.5",
+    "@babel/node": "^7.15.4",
+    "@leverege/babel-preset-leverege-node": "^2.0.0",
+    "@leverege/eslint-config-leverege": "^3.0.1",
+    "npm": "^7.22.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,10 +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 ci --only-production --ignore-scripts --silent && \
+    npm install -g npm@7 && \
+    npm ci --only-production --ignore-scripts ${npmlogging} && \
     rm -f /usr/src/app/.npmrc /root/.ssh/*
  
 # --------------------------------------------------------------
@@ -87,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}" ];
@@ -195,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\"`"
@@ -286,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
@@ -363,14 +371,14 @@ BUILDERR
 fi
 
 # Tag the container with the node detailsand the culprit.
-gcloud beta container images add-tag --quiet $gcimage:$version $gcimage:$pckgdts-$nodeimg-$USER
+gcloud container images add-tag --quiet $gcimage:$version $gcimage:$pckgdts-$nodeimg-$USER
 
 if [ $tagging ];
 then
   printf "\n$(colorize 'green' "Tagging and Pushing $version")\n"
   git tag -af $1 -m "Docker version $1"
   git push --follow-tags
-  gcloud beta container images add-tag --quiet $gcimage:$version $gcimage:latest
+  gcloud container images add-tag --quiet $gcimage:$version $gcimage:latest
 else
   printf "\n$(colorize 'yellow' '*** Skipped git tagging - beta release')\n\n"
 fi

package/src/helmup

@@ -31,6 +31,7 @@ SYSTEM=(
   postgres
   timescale-db
   monitoring
+  preemptible-killer
   reloader
   traefik
   velero
@@ -137,7 +138,7 @@ SA_EXISTS
     printf "\n*** Binding IAM role of monitoring viewer to stackdriver-exporter in $GCP_PROJECT_ID\n"
     gcloud projects add-iam-policy-binding "$GCP_PROJECT_ID" \
       --role "roles/monitoring.viewer" \
-      --member "serviceAccount:$SDEXP_SA@$GCP_PROJECT_ID.iam.gserviceaccount.com"
+      --member "serviceAccount:$SDEXP_SA@$GCP_PROJECT_ID.iam.gserviceaccount.com" &>/dev/null
 
     printf "\n*** Binding IAM role of workloadIdentityUser to stackdriver-exporter\n"
     gcloud iam service-accounts add-iam-policy-binding \
@@ -157,20 +158,21 @@ SA_EXISTS
   helm upgrade --install prometheus prometheus-community/prometheus \
     --namespace monitoring \
     --values prometheus/values.yaml \
-    --version 13.2.1
+    --version 13
 
   ## Installing ES exporter
   helm upgrade --install elasticsearch-exporter prometheus-community/prometheus-elasticsearch-exporter \
     --namespace monitoring \
     --values elasticsearch-exporter/values-es-exporter.yaml \
-    --version 4.1.0
+    --version 4.6
 
   ## Install Grafana  
   helm repo add grafana https://grafana.github.io/helm-charts && helm repo update
   helm upgrade --install grafana grafana/grafana \
     --namespace monitoring \
     --values grafana/values-grafana.yaml \
-    --version 6.2.2
+    --version 6.11 # 6.11 last of v7 grafana
+#   --version 6.16 # latest v8 grafana
 }
 
 function monitoringHelp(){
@@ -235,6 +237,14 @@ function getManagedSecret() {
   echo $SECRET
 }
 
+# https://github.com/estafette/estafette-gke-preemptible-killer
+function installPreemptibleKiller() {
+  helm repo add estafette https://helm.estafette.io &>/dev/null
+  helm upgrade --install estafette-gke-preemptible-killer \
+               estafette/estafette-gke-preemptible-killer --namespace estafette
+
+}
+
 function installTraefik() {
   createNamespaceIfNeeded traefik
 
@@ -497,6 +507,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"