@leverege/build-tools 2.6.7 → 2.6.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.6.7",
+  "version": "2.6.10",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "figlet": "^1.5.2",
     "git-branch": "^2.0.1",
     "glob": "^7.1.7",
-    "inquirer": "^8.1.2",
+    "inquirer": "^8.1.5",
     "js-yaml": "^4.1.0",
     "ncp": "^2.0.0",
     "npm-check-updates": "^11.8.5",
@@ -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/circleate

@@ -57,14 +57,14 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          keys: 
+          keys:
             - v1-npm-deps-{{ checksum "package-lock.json" }}
             - v1-npm-deps-
-      
+
       - run:
           name: Setup @leverege Token
           command: echo \${NPMRC} > ~/.npmrc
-      
+
       - run: npm install
 
       - save_cache:
@@ -84,17 +84,17 @@ jobs:
       - checkout
       - attach_workspace:
           at: ~/project
-      - run: 
+      - run:
           name: Check for vulnerabilities
           command: npm audit --production --audit-level=moderate
-  
+
   license-check:
     docker:
       - image: circleci/node:fermium
     steps:
       - checkout
       - attach_workspace:
-          at: ~/project    
+          at: ~/project
       - run:
           name: Check for LICENSE and README files
           command: npm run pkglint
@@ -103,30 +103,30 @@ jobs:
           name: Check for license violations (e.g. GPL)
           command: npx license-checker --production --summary --failOn GPL
 
-  lint: 
+  lint:
     docker:
       - image: circleci/node:fermium
     steps:
       - checkout
       - attach_workspace:
-          at: ~/project           
-      - run: 
+          at: ~/project
+      - run:
           name: Lint and save results
           command: npm run lint-ci
 
       - store_test_results:
           path: reports
 
-  docs: 
+  docs:
     docker:
       - image: circleci/node:fermium
     steps:
       - checkout
       - attach_workspace:
-          at: ~/project  
-      - run: 
+          at: ~/project
+      - run:
           name: Generate docs
-          command: npx jsdoc -r src -R README.md -d docs 
+          command: npx jsdoc -r src -R README.md -d docs
       - store_artifacts:
           path: docs
           prefix: docs
@@ -140,7 +140,7 @@ jobs:
       # IF YOU NEED ANY OF THESE, UNCOMMENT TO USE
       # - image: redis
       # - image: circleci/mysql:5.7
-      #   environment: 
+      #   environment:
       #     MYSQL_USER: root
       #     MYSQL_ROOT_PASSWORD: root
       #     MYSQL_ALLOW_EMPTY_PASSWORD: true
@@ -159,10 +159,10 @@ jobs:
     steps:
       - checkout
       - attach_workspace:
-          at: ~/project   
+          at: ~/project
 
       # UNCOMMENT IF YOU NEED DECRYPTING SECRETS
-      # - run: 
+      # - run:
       #     name: Load secrets
       #     command: npm run decrypt
 
@@ -173,11 +173,11 @@ jobs:
       - run:
           name: Check if coverage meets at least 70%
           command: ./node_modules/.bin/nyc check-coverage --functions 70 --lines 70 --statements 70
- 
+
       - store_artifacts:
           path: coverage
           prefix: coverage
-  
+
   build:
     # build should make dist image and prepare docker file
     docker:
@@ -186,13 +186,13 @@ jobs:
     steps:
       - checkout
       - attach_workspace:
-          at: ~/project 
+          at: ~/project
 
       - run:
           name: Setup @leverege Token
-          command: echo \${NPMRC} > ~/.npmrc.ro 
+          command: echo \${NPMRC} > ~/.npmrc.ro
 
-      - run: 
+      - run:
           name: Determine version number and container name
           command: |
             container="\`node -p \"require('./package.json').leverege.container\"\`"
@@ -205,8 +205,8 @@ jobs:
             echo \$(git describe --tags) > package_version
             echo \${container} > container_name
             echo \${NODE_IMAGE} > node_img
-      
-      - run: 
+
+      - run:
           name: Create Dockerfile and build dist directory
           command: mkdir -p docker && npm run dockerize \$(git describe --tags)
 
@@ -236,14 +236,14 @@ workflows:
       - coverage:
           requires:
             - install
-      - docs: 
+      - docs:
           requires:
             - install
       - build:
           context: npm
           filters:
             branches:
-              only: 
+              only:
                 - development
                 - /release-.*/
                 - master
@@ -267,14 +267,14 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          keys: 
+          keys:
             - v1-npm-deps-{{ checksum "package-lock.json" }}
             - v1-npm-deps-
 
       - run:
           name: Setup @leverege Token
           command: echo \${NPMRC} > ~/.npmrc
-      
+
       - run: npm install
 
       - save_cache:
@@ -294,17 +294,17 @@ jobs:
       - checkout
       - attach_workspace:
           at: ~/project
-      - run: 
+      - run:
           name: Check for vulnerabilities
           command: npm audit --production --audit-level=moderate
-  
+
   license-check:
     docker:
       - image: circleci/node:fermium
     steps:
       - checkout
       - attach_workspace:
-          at: ~/project    
+          at: ~/project
       - run:
           name: Check for LICENSE and README files
           command: npm run pkglint
@@ -313,30 +313,30 @@ jobs:
           name: Check for license violations (e.g. GPL)
           command: npx license-checker --production --summary --failOn GPL
 
-  lint: 
+  lint:
     docker:
       - image: circleci/node:fermium
     steps:
       - checkout
       - attach_workspace:
-          at: ~/project           
-      - run: 
+          at: ~/project
+      - run:
           name: Lint and save results
           command: npm run lint-ci
 
       - store_test_results:
           path: reports
 
-  docs: 
+  docs:
     docker:
       - image: circleci/node:fermium
     steps:
       - checkout
       - attach_workspace:
-          at: ~/project  
-      - run: 
+          at: ~/project
+      - run:
           name: Generate docs
-          command: npx jsdoc -r src -R README.md -d docs 
+          command: npx jsdoc -r src -R README.md -d docs
       - store_artifacts:
           path: docs
           prefix: docs
@@ -350,7 +350,7 @@ jobs:
       # IF YOU NEED ANY OF THESE, UNCOMMENT TO USE
       # - image: redis
       # - image: circleci/mysql:5.7
-      #   environment: 
+      #   environment:
       #     MYSQL_USER: root
       #     MYSQL_ROOT_PASSWORD: root
       #     MYSQL_ALLOW_EMPTY_PASSWORD: true
@@ -369,10 +369,10 @@ jobs:
     steps:
       - checkout
       - attach_workspace:
-          at: ~/project   
+          at: ~/project
 
       # UNCOMMENT IF YOU NEED DECRYPTING SECRETS
-      # - run: 
+      # - run:
       #     name: Load secrets
       #     command: npm run decrypt
 
@@ -383,7 +383,7 @@ jobs:
       - run:
           name: Check if coverage meets at least 70%
           command: ./node_modules/.bin/nyc check-coverage --functions 70 --lines 70 --statements 70
- 
+
       - store_artifacts:
           path: coverage
           prefix: coverage
@@ -406,7 +406,7 @@ workflows:
       - coverage:
           requires:
             - install
-      - docs: 
+      - docs:
           requires:
             - install
 EOCIRCLE
@@ -414,7 +414,7 @@ EOCIRCLE
 
 create_ui_config(){
   cat<<FIREBASEINFO
-  
+
   You need to setup Firebase hosting using the cli tool before configuring CI.
   Please make sure .firebaserc and firebase.json are configured with targets set like:
 
@@ -480,10 +480,10 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          keys: 
+          keys:
             - v1-npm-deps-{{ checksum "package-lock.json" }}
             - v1-npm-deps-
-            
+
       - run:
           name: Setup @leverege Token
           command: echo \${NPMRC} > ~/.npmrc
@@ -508,7 +508,7 @@ jobs:
           paths:
             - dist
 
-  deploy-dev: 
+  deploy-dev:
     docker:
       - image: circleci/node:fermium
     steps:
@@ -519,7 +519,7 @@ jobs:
           name: Deploy to dev site
           command: firebase use $DEV_PROJ && firebase deploy --token "\$FIREBASE_TOKEN" --only hosting:$DEV_TARGET
 
-  deploy-prod: 
+  deploy-prod:
     docker:
       - image: circleci/node:fermium
     steps:
@@ -535,7 +535,7 @@ workflows:
   build-deploy-dev:
     jobs:
       - build:
-          context: npm 
+          context: npm
       - slack/approval-notification:
           context: slack
       - deploy-dev:
@@ -546,9 +546,9 @@ workflows:
               only: development
           requires:
             - build
-      - status: 
+      - status:
           context: slack
-          requires: 
+          requires:
             - deploy-dev
 
   build-deploy-prod:
@@ -568,9 +568,9 @@ workflows:
               only: master
           requires:
             - build
-      - status: 
+      - status:
           context: slack
-          requires: 
+          requires:
             - deploy-prod
 
 EOCIRCLE

package/src/helmup

@@ -237,12 +237,46 @@ 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
-  helm upgrade --install estafette-gke-preemptible-killer \
-               estafette/estafette-gke-preemptible-killer --namespace estafette
 
+  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() {
@@ -455,7 +489,7 @@ function doInstall() {
     # Allows chart version as <deployment>/Chart-x.y.z*>
     if [ -z "$CHARTVER" ];
     then
-      LCL_CHART=`compgen -G $SERVICE/Chart-?.?.?*` &>/dev/null
+      LCL_CHART=`compgen -G $SERVICE/Chart-?*.?*.?*` &>/dev/null
       if [ ! -z "$LCL_CHART" ];
       then
         CHARTVER=${LCL_CHART#*/Chart-}