@leverege/build-tools 2.54.1 → 2.55.0

package/src/helm-charts/redis/redis-local.yaml

@@ -70,3 +70,6 @@ networkPolicy:
 
 metrics:
   enabled: true
+  serviceMonitor:
+    enabled: false # set to true for prometheus operator
+    namespace: "prometheus"

package/src/helmup.sh

@@ -296,7 +296,7 @@ function installStackdriverExporterEnvironment() {
   # Add necessary helm repositories - note that stable is deprecated
   addHelmRepo prometheus-community https://prometheus-community.github.io/helm-charts
 
-  local SDEXP_NS="monitoring"
+  local SDEXP_NS=${1:-monitoring}
   local SDEXP_SA="stackdriver-exporter"
   local SDEXP_EM="$SDEXP_SA@$GCP_PROJECT_ID.iam.gserviceaccount.com"
 
@@ -306,7 +306,8 @@ function installStackdriverExporterEnvironment() {
   printf "\n*** Removing the previous $SDEXP_SA installation...\n"
   helm uninstall -n $SDEXP_NS $SDEXP_SA                 &> $DEVNULL
   kubectl delete serviceaccounts -n $SDEXP_NS $SDEXP_SA &> $DEVNULL
-  gcloud --quiet iam service-accounts delete $SDEXP_EM  &> $DEVNULL
+  printf "!!! Skipping deletion of the gcloud SA $SDEXP_EM\n"
+# gcloud --quiet iam service-accounts delete $SDEXP_EM  &> $DEVNULL
 
   # NOTE: The k8s SA != GCP SA - the former is created by the helm chart
   # that installs the stackdriver-exporter, the latter is handled here in
@@ -321,7 +322,7 @@ function installStackdriverExporterEnvironment() {
 
   printf "\n*** Binding IAM role of $SDEXP_NS viewer to $SDEXP_SA in $GCP_PROJECT_ID\n"
   gcloud projects add-iam-policy-binding "$GCP_PROJECT_ID" \
-    --role "roles/$SDEXP_NS.viewer" \
+    --role "roles/monitoring.viewer" \
     --member "serviceAccount:$SDEXP_EM" &> $DEVNULL
   sleep 2 # give the IAM binding a chance to complete before moving on
 
@@ -1002,7 +1003,13 @@ CATBACKUP
         bootstrapLocalSetup $SERVICE
         ;;
 
-      "prometheus"|"prometheus-operator")
+      "prometheus")
+        installStackdriverExporterEnvironment
+        bootstrapLocalSetup $SERVICE
+        ;;
+
+      "prom-operator")
+        installStackdriverExporterEnvironment prometheus
         bootstrapLocalSetup $SERVICE
         ;;
 

package/src/overwhelm.mjs

@@ -206,6 +206,13 @@ const doReplacements = ( yamls, replacements ) => {
     process.exit( 1 )
   }
 
+  // Eat any doubly double quoted values such that
+  //   ""<ovh replace>"" -> "<ovh replace>"
+  // but
+  //   someDefault: ""
+  // remains unchanged
+  replYaml = replYaml.replace( /""([^"]+)""/g, '"$1"' )
+
   return replYaml
 }
 
@@ -307,7 +314,7 @@ ahoy.forEach( ( dir ) => {
   }
 } )
 
-// we can also apply replaceables to any top level .ovh files to support top level config maps
+// we can also apply replaceables to all .ovh files in the project
 glob.sync( '**/*.ovh' ).forEach( ( cfgmap ) => {
   const target = cfgmap.replace( /.ovh$/, '' )
   let valuesOut = fs.readFileSync( cfgmap, { encoding : 'utf-8' } )