@leverege/build-tools 2.5.12 → 2.5.13

package/lib/server/overwhelm.js

@@ -273,6 +273,15 @@ ahoy.forEach(dir => {
     valuesOut = doReplacements(valuesOut, over);
     fs.writeFileSync(`${dir}/values.yaml`, valuesOut);
   }
+}); // we can also apply replaceables to any top level .ovh files to support top level config maps
+
+glob.sync('*.ovh').forEach(cfgmap => {
+  const target = cfgmap.replace(/.ovh$/, '');
+  let valuesOut = fs.readFileSync(cfgmap, {
+    encoding: 'utf-8'
+  });
+  valuesOut = doReplacements(valuesOut, over);
+  fs.writeFileSync(target, valuesOut);
 }); // Set the GCP context for safety!
 
 const clusterName = over.CLUSTER_NAME;

package/lib/web/overwhelm.js

@@ -273,6 +273,15 @@ ahoy.forEach(dir => {
     valuesOut = doReplacements(valuesOut, over);
     fs.writeFileSync(`${dir}/values.yaml`, valuesOut);
   }
+}); // we can also apply replaceables to any top level .ovh files to support top level config maps
+
+glob.sync('*.ovh').forEach(cfgmap => {
+  const target = cfgmap.replace(/.ovh$/, '');
+  let valuesOut = fs.readFileSync(cfgmap, {
+    encoding: 'utf-8'
+  });
+  valuesOut = doReplacements(valuesOut, over);
+  fs.writeFileSync(target, valuesOut);
 }); // Set the GCP context for safety!
 
 const clusterName = over.CLUSTER_NAME;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.5.12",
+  "version": "2.5.13",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -55,7 +55,7 @@
     "command-line-args": "^5.1.1",
     "command-line-usage": "^6.1.1",
     "dotenv": "^8.2.0",
-    "execa": "^4.1.0",
+    "execa": "^5.0.0",
     "figlet": "^1.5.0",
     "git-branch": "^2.0.1",
     "glob": "^7.1.6",
@@ -68,12 +68,12 @@
     "ora": "^5.1.0",
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
-    "semver": "^7.3.2",
-    "simple-git": "^2.23.0"
+    "semver": "^7.3.4",
+    "simple-git": "^2.24.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.7",
-    "@babel/core": "^7.12.7",
+    "@babel/cli": "^7.12.8",
+    "@babel/core": "^7.12.9",
     "@babel/node": "^7.12.6",
     "@leverege/babel-preset-leverege-node": "^1.1.1",
     "@leverege/eslint-config-leverege": "^2.2.0",

package/src/helmup

@@ -109,14 +109,16 @@ DIRTYGIT
   # blow away the existing deployment
   helm uninstall monitoring
 
+  NEWBASELINE=${BASELINE_ROOT:-new-baseline}
+
   # Make certain the baseline branch is up to date
-  git fetch origin new-baseline:new-baseline
+  git fetch origin ${NEWBASELINE}:${NEWBASELINE}
 
   NEWMON="elasticsearch-exporter grafana prometheus stackdriver-exporter"
   for SOURCE in $NEWMON;
   do
-    printf "Grabbing $SOURCE from new-baseline\n"
-    git checkout --quiet new-baseline $SOURCE
+    printf "Grabbing $SOURCE from ${NEWBASELINE}\n"
+    git checkout --quiet ${NEWBASELINE} $SOURCE
   done
 
   cat<<RERUN

package/src/overwhelm.js

@@ -229,6 +229,14 @@ ahoy.forEach( ( dir ) => {
   }
 } )
 
+// we can also apply replaceables to any top level .ovh files to support top level config maps
+glob.sync( '*.ovh' ).forEach( ( cfgmap ) => {
+  const target = cfgmap.replace(/.ovh$/,'')
+  let valuesOut = fs.readFileSync( cfgmap, { encoding : 'utf-8' } )
+  valuesOut = doReplacements( valuesOut, over )
+  fs.writeFileSync( target, valuesOut )
+} )
+
 // Set the GCP context for safety!
 const clusterName = over.CLUSTER_NAME
 const projectId = over.PROJECT_ID

package/src/sa-tools/imp-sa

@@ -8,16 +8,19 @@ impersonate() {
 }
 
 case $1 in
-gke)
- impersonate k8s@project.iam.gserviceaccount.com
- ;;
-admin)
- impersonate admin@other-project.iam.gserviceaccount.com
- ;;
-clear)
- gcloud config unset auth/impersonate_service_account
- ;;
-*)
- echo "Usage: Updates impersonated service account"
- echo "  imp-sa [gke|admin|clear]"
+  terraform)
+    impersonate terraformer@leverege-dev-john.iam.gserviceaccount.com
+    ;;
+  gke)
+    impersonate k8s@project.iam.gserviceaccount.com
+    ;;
+  admin)
+    impersonate admin@other-project.iam.gserviceaccount.com
+    ;;
+  clear)
+    gcloud config unset auth/impersonate_service_account
+    ;;
+  *)
+    echo "Usage: Updates impersonated service account"
+    echo "  imp-sa [gke|admin|clear]"
 esac

package/src/sa-tools/make-sa

@@ -2,7 +2,7 @@
 
 SVC_PROJ="leverege-dev-john"
 
-SVC_NAME="terraformer"
+SVC_NAME="terraform"
 SVC_ACCT="${SVC_NAME}@${SVC_PROJ}.iam.gserviceaccount.com"
 
 function countdown() {
@@ -16,10 +16,12 @@ function countdown() {
   done
 }
 
+gcloud config unset auth/impersonate_service_account
+
 gcloud iam service-accounts create ${SVC_NAME} \
   --project=${SVC_PROJ} --quiet \
-  --description="the terraforming account" \
-  --display-name="terraformer" &> /dev/null
+  --description="${SVC_NAME} SA" \
+  --display-name="${SVC_NAME}" &> /dev/null
 
 gcloud projects add-iam-policy-binding ${SVC_PROJ} \
   --project=${SVC_PROJ} --quiet \
@@ -31,8 +33,18 @@ gcloud projects add-iam-policy-binding ${SVC_PROJ} \
   --member=serviceAccount:${SVC_ACCT}              \
   --role=roles/iam.securityAdmin &> /dev/null
 
+gcloud projects add-iam-policy-binding ${SVC_PROJ} \
+  --project=${SVC_PROJ} --quiet \
+  --member=serviceAccount:${SVC_ACCT}              \
+  --role=roles/iam.serviceAccountTokenCreator &> /dev/null
+
 countdown 30 "will delete ${SVC_NAME} service account"
 
+gcloud projects remove-iam-policy-binding ${SVC_PROJ} \
+  --project=${SVC_PROJ} --quiet \
+  --member=serviceAccount:${SVC_ACCT}              \
+  --role=roles/iam.serviceAccountTokenCreator &> /dev/null
+
 gcloud projects remove-iam-policy-binding ${SVC_PROJ} \
   --project=${SVC_PROJ} --quiet \
   --member=serviceAccount:${SVC_ACCT}              \