@leverege/build-tools 1.12.16 → 1.13.0

package/lib/server/helmup

@@ -1,11 +1,7 @@
 #!/bin/bash
 #
 # This script is used to ease the pain of transition testing to chart museum
-# prior to setting up keel for new clusters / installs.
-#
-# Removing db-curator from the list of platform components for now. It needs
-# to be turned into a cronjob to avoid having it run as soon as it gets
-# deployed.
+# for adding / updating deployments on a fluster.
 #
 # printf "\nRUNNING LOCALLY\n" && sleep 2
 PLATFORM=(
@@ -55,34 +51,6 @@ function setOrUnset() {
   echo "$setting"
 }
 
-# Installing keel is a little more involved since we need to feed it svc acct
-# keys and a slack bot token.
-function keelNeeds() {
-  cat<<KEELNEEDS
-
- $RED_ERROR  $1
-
- In order to get its job done keel needs the service account JSON file for the
- project containing the docker images that it is reponsible for. It also needs
- a token for the slack bot in order to interact with slack.
-
-   `color g LEV_KEYS`
-           points to the top level directory containing the keys and secrets
-           to the k8s clusters
-   `color g \$LEV_KEYS/docker-image-svc-acct`
-           directory containing the service account JSON files
-   `color g "\$LEV_KEYS/<branch-name>/slack-bot-token"`
-           location of the slack bot token text file
-
- Current settings:
-   LEV_KEYS   => `setOrUnset $LEV_KEYS`
-
- Missing variables should be set using the standard bash syntax:
-   `color y export\ VARNAME=\"\<YOUR_SETTING\>\"`
-
-KEELNEEDS
-  exit 1
-}
 
 function createSSDYAML(){
   cat<<EOSSD > ${K8S_UTILS}/ssd-storageclass.yaml
@@ -192,35 +160,6 @@ function installVelero() {
   printf "\n$YELO_WARN NO REALLY...MOVE credentials-velero file NOW"
 }
 
-function installKeel() {
-  [ ! -d "$LEV_KEYS" ] &&
-    keelNeeds "`color c \\$LEV_KEYS` must point to the keys directory for the clusters."
-
-  # TODO make the docker image project configurable and not just lev
-  SVC_ACCT="$LEV_KEYS/docker-image-svc-acct/leverege-docker-images.json"
-  [ ! -f "$SVC_ACCT" ] &&
-    keelNeeds "Missing service account info => `color c $SVC_ACCT`"
-
-  BRANCH=`git rev-parse --abbrev-ref HEAD`
-  SLACK_BOT_NAME="`overwhelm -k SLACK_BOT_NAME`"
-  [[ -z "$SLACK_BOT_NAME" || "$SLACK_BOT_NAME" == "undefined" ]] && SLACK_BOT_NAME=$BRANCH
-  SLACK_TOKEN="$LEV_KEYS/$BRANCH/slack-bot-token"
-  [ ! -f "$SLACK_TOKEN" ] &&
-    keelNeeds "Missing slack bot token => `color c $SLACK_TOKEN`"
-
-  helm repo add keel https://charts.keel.sh; helm repo update
-  helm upgrade --install keel keel/keel \
-    --set gcr.enabled="true" \
-    --set gcr.projectId="leverege-docker-images" \
-    --set gcr.pubSub.enabled="true" \
-    --set slack.enabled="true" \
-    --set slack.channel="devs-cicd" \
-    --set slack.approvalsChannel="cd-approvals" \
-    --set slack.botName="$SLACK_BOT_NAME" \
-    --set slack.token="$(cat $SLACK_TOKEN)" \
-    --set googleApplicationCredentials="$(cat $SVC_ACCT | base64 -w 0)"
-}
-
 # ---------- helmup MAIN ----------
 command -v chartmuseum &> /dev/null
 if [ $? -ne 0 ];
@@ -284,7 +223,6 @@ function doInstall() {
     case "$SERVICE" in
       "platform")
         doInstall "${PLATFORM[@]}"
-        printf "\nkeel may be installed by running => helmup keel\n\n"
         ;;
 
       "system")
@@ -312,10 +250,6 @@ function doInstall() {
         helm upgrade --install elasticsearch elastic/elasticsearch --set volumeClaimTemplate.storageClassName="ssd"
         ;;
 
-      "keel")
-        installKeel # because it's a little more involved
-        ;;
-
       "monitoring")
         helm dep up ./monitoring && helm upgrade --install monitoring ./monitoring
         ;;
@@ -366,6 +300,13 @@ function doInstall() {
           continue
         fi
 
+        if [ -f $SERVICE/DEPRECATED ];
+        then
+          printf "\n$YELO_WARN Skipping DEPRECATED service => $SERVICE\n\n"
+          sleep 2 # sleep on it to make sure people see the deprecation
+          continue
+        fi
+
         printf "\n--------------------------------------------------------------\nCharting $SERVICE\n"
         # By default the museum chart name will be the same as the service, but
         # we have the flexibility to override the naming when the charts are

package/lib/web/dnsify/index.js

@@ -5,6 +5,8 @@ require("core-js/modules/es.symbol");
 
 require("core-js/modules/es.array.filter");
 
+require("core-js/modules/es.array.for-each");
+
 require("core-js/modules/es.object.get-own-property-descriptor");
 
 require("core-js/modules/es.object.get-own-property-descriptors");
@@ -21,7 +23,7 @@ require("regenerator-runtime/runtime");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 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; }
 

package/lib/web/packleate/Packleator.js

@@ -6,6 +6,8 @@ require("core-js/modules/es.array.concat");
 
 require("core-js/modules/es.array.filter");
 
+require("core-js/modules/es.array.for-each");
+
 require("core-js/modules/es.array.index-of");
 
 require("core-js/modules/es.array.iterator");
@@ -46,7 +48,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 

package/lib/web/packleate/index.js

@@ -5,6 +5,8 @@ require("core-js/modules/es.symbol");
 
 require("core-js/modules/es.array.filter");
 
+require("core-js/modules/es.array.for-each");
+
 require("core-js/modules/es.object.get-own-property-descriptor");
 
 require("core-js/modules/es.object.get-own-property-descriptors");
@@ -21,7 +23,7 @@ require("regenerator-runtime/runtime");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 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; }
 

package/lib/web/pkglint/index.js

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
 "use strict";
 
+require("core-js/modules/es.array.every");
+
 require("core-js/modules/es.array.index-of");
 
 var glob = require('glob');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "1.12.16",
+  "version": "1.13.0",
   "description": "A package for development build tools.",
   "main": "index.js",
   "scripts": {
@@ -62,4 +62,4 @@
     "@leverege/eslint-config-leverege": "^2.0.1",
     "core-js": "^3.4.7"
   }
-}
+}

package/src/helmup

@@ -1,11 +1,7 @@
 #!/bin/bash
 #
 # This script is used to ease the pain of transition testing to chart museum
-# prior to setting up keel for new clusters / installs.
-#
-# Removing db-curator from the list of platform components for now. It needs
-# to be turned into a cronjob to avoid having it run as soon as it gets
-# deployed.
+# for adding / updating deployments on a fluster.
 #
 # printf "\nRUNNING LOCALLY\n" && sleep 2
 PLATFORM=(
@@ -55,34 +51,6 @@ function setOrUnset() {
   echo "$setting"
 }
 
-# Installing keel is a little more involved since we need to feed it svc acct
-# keys and a slack bot token.
-function keelNeeds() {
-  cat<<KEELNEEDS
-
- $RED_ERROR  $1
-
- In order to get its job done keel needs the service account JSON file for the
- project containing the docker images that it is reponsible for. It also needs
- a token for the slack bot in order to interact with slack.
-
-   `color g LEV_KEYS`
-           points to the top level directory containing the keys and secrets
-           to the k8s clusters
-   `color g \$LEV_KEYS/docker-image-svc-acct`
-           directory containing the service account JSON files
-   `color g "\$LEV_KEYS/<branch-name>/slack-bot-token"`
-           location of the slack bot token text file
-
- Current settings:
-   LEV_KEYS   => `setOrUnset $LEV_KEYS`
-
- Missing variables should be set using the standard bash syntax:
-   `color y export\ VARNAME=\"\<YOUR_SETTING\>\"`
-
-KEELNEEDS
-  exit 1
-}
 
 function createSSDYAML(){
   cat<<EOSSD > ${K8S_UTILS}/ssd-storageclass.yaml
@@ -192,35 +160,6 @@ function installVelero() {
   printf "\n$YELO_WARN NO REALLY...MOVE credentials-velero file NOW"
 }
 
-function installKeel() {
-  [ ! -d "$LEV_KEYS" ] &&
-    keelNeeds "`color c \\$LEV_KEYS` must point to the keys directory for the clusters."
-
-  # TODO make the docker image project configurable and not just lev
-  SVC_ACCT="$LEV_KEYS/docker-image-svc-acct/leverege-docker-images.json"
-  [ ! -f "$SVC_ACCT" ] &&
-    keelNeeds "Missing service account info => `color c $SVC_ACCT`"
-
-  BRANCH=`git rev-parse --abbrev-ref HEAD`
-  SLACK_BOT_NAME="`overwhelm -k SLACK_BOT_NAME`"
-  [[ -z "$SLACK_BOT_NAME" || "$SLACK_BOT_NAME" == "undefined" ]] && SLACK_BOT_NAME=$BRANCH
-  SLACK_TOKEN="$LEV_KEYS/$BRANCH/slack-bot-token"
-  [ ! -f "$SLACK_TOKEN" ] &&
-    keelNeeds "Missing slack bot token => `color c $SLACK_TOKEN`"
-
-  helm repo add keel https://charts.keel.sh; helm repo update
-  helm upgrade --install keel keel/keel \
-    --set gcr.enabled="true" \
-    --set gcr.projectId="leverege-docker-images" \
-    --set gcr.pubSub.enabled="true" \
-    --set slack.enabled="true" \
-    --set slack.channel="devs-cicd" \
-    --set slack.approvalsChannel="cd-approvals" \
-    --set slack.botName="$SLACK_BOT_NAME" \
-    --set slack.token="$(cat $SLACK_TOKEN)" \
-    --set googleApplicationCredentials="$(cat $SVC_ACCT | base64 -w 0)"
-}
-
 # ---------- helmup MAIN ----------
 command -v chartmuseum &> /dev/null
 if [ $? -ne 0 ];
@@ -284,7 +223,6 @@ function doInstall() {
     case "$SERVICE" in
       "platform")
         doInstall "${PLATFORM[@]}"
-        printf "\nkeel may be installed by running => helmup keel\n\n"
         ;;
 
       "system")
@@ -312,10 +250,6 @@ function doInstall() {
         helm upgrade --install elasticsearch elastic/elasticsearch --set volumeClaimTemplate.storageClassName="ssd"
         ;;
 
-      "keel")
-        installKeel # because it's a little more involved
-        ;;
-
       "monitoring")
         helm dep up ./monitoring && helm upgrade --install monitoring ./monitoring
         ;;
@@ -366,6 +300,13 @@ function doInstall() {
           continue
         fi
 
+        if [ -f $SERVICE/DEPRECATED ];
+        then
+          printf "\n$YELO_WARN Skipping DEPRECATED service => $SERVICE\n\n"
+          sleep 2 # sleep on it to make sure people see the deprecation
+          continue
+        fi
+
         printf "\n--------------------------------------------------------------\nCharting $SERVICE\n"
         # By default the museum chart name will be the same as the service, but
         # we have the flexibility to override the naming when the charts are