@leverege/build-tools 2.66.7 → 2.66.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.66.7",
+  "version": "2.66.8",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -73,7 +73,7 @@
     "glob": "^11.0.2",
     "handlebars": "^4.7.8",
     "ignore": "^7.0.4",
-    "inquirer": "^12.6.0",
+    "inquirer": "^12.6.1",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.4",
     "ms": "^2.1.3",
@@ -82,7 +82,7 @@
     "p-limit": "^6.2.0",
     "package-up": "^5.0.0",
     "readline-sync": "^1.4.10",
-    "semver": "^7.7.1",
+    "semver": "^7.7.2",
     "shell-quote": "^1.8.2",
     "simple-git": "^3.27.0",
     "toml": "^3.0.0",

package/src/Docker.mjs

@@ -177,7 +177,7 @@ const buildContainerImage = async ( {
   artifactProject, artifactRegistry, containerName, 
   imageVersion, isNpmWorkspace, options
 } ) => {
-  const { useCloudBuildFile } = options || {}
+  const useCloudBuildFile = true // { useCloudBuildFile } = options || {}
   const buildWorkspace = './build/workspace' // passed to Cloud Build
   const imageName = `${artifactRegistry}/images/${containerName}`
 
@@ -216,25 +216,24 @@ const buildContainerImage = async ( {
   const { fullName : builderName } = await getGcpAccount()
   const gcloudBuild = `gcloud builds submit --project ${artifactProject}`
   const gcloudProjectNumber = await shellCmd( `gcloud projects describe ${artifactProject} --format="value(projectNumber)"` )
-  const cloudBuildSA = `--service-account=${gcloudProjectNumber}-compute@cloudbuild.gserviceaccount.com`
+  const gcloudBuildSA = `--service-account=projects/${artifactProject}/serviceAccounts/${gcloudProjectNumber}-compute@developer.gserviceaccount.com`
   const gcloudLogs = `--gcs-log-dir ${formCloudBuildBucketName( artifactProject )}/log`
-  let gcloudTags = `--tag ${imageName}:${imageVersion}`
+  const imageTag = `${defaultSettings.date}-${defaultSettings.nodeimage}-${builderName}`
   
-  if ( useCloudBuildFile ) {
-    const cloudBuildFile = './docker/cloudbuild.yaml'
-    gcloudTags = `--config=${cloudBuildFile}`
-    const cbst = handlebars.compile( cloudBuildSteps, { noEscape : true } )
-    const cbs = cbst( { artifactProject, artifactRegistry, imageName, imageVersion } )
+  // create the cloud build config from the handlebars template
+  const cloudBuildFile = './docker/cloudbuild.yaml'
+  const cbst = handlebars.compile( cloudBuildSteps, { noEscape : true } )
+  const cbs = cbst( { artifactProject, artifactRegistry, imageName, imageVersion, imageTag } )
+  fs.writeFileSync( cloudBuildFile, cbs )
 
-    fs.writeFileSync( cloudBuildFile, cbs )
-  }
+  const gcloudBuildConfig = `--config=${cloudBuildFile}`
 
   log( chalk.green.bold( `
   *** Submitting Build as ${builderName} ***
       ${gcloudBuild} \\
            ${gcloudLogs}  \\
-           ${gcloudTags} \\
-           ${cloudBuildSA}
+           ${gcloudBuildConfig} \\
+           ${gcloudBuildSA}
   ` ) )
 
   if ( process.env.DRY_RUN === '1' ) {
@@ -242,12 +241,7 @@ const buildContainerImage = async ( {
     process.exit( 0 )
   }
 
-  await shellCmd( `${gcloudBuild} ${gcloudLogs} ${gcloudTags} ./build`, { stdio : 'inherit' } )
-
-  const imageTag = `${defaultSettings.date}-${defaultSettings.nodeimage}-${builderName}`
-  await shellCmd(
-    `gcloud container images add-tag --quiet ${imageName}:${imageVersion} ${imageName}:${imageTag} ${imageName}:latest`
-  )
+  await shellCmd( `${gcloudBuild} ${gcloudLogs} ${gcloudBuildConfig} ${gcloudBuildSA} ./build`, { stdio : 'inherit' } )
 }
 
 const repoCleanup = async () => {

package/src/bash-funcs

@@ -187,7 +187,6 @@ function ifPluggedIn() {
     *)
       cat<<PLUGIN_INVOKED_AS_ERROR
 
-
   $RED_ERROR bash-funcs ifPluggedIn: unknown INVOKED_AS=[`color r $INVOKED_AS`]
 
 PLUGIN_INVOKED_AS_ERROR

package/src/helm-charts/prom-operator/prometheus-stack.yaml.ovh

@@ -191,6 +191,7 @@ alertmanager:
                 *Description:* {{ .Annotations.description }}
                 *Dashboard:* {{ .Annotations.dashboard }}
               {{ end }}
+      - name: discard
 
     route:
       group_wait: 30s
@@ -198,12 +199,19 @@ alertmanager:
       group_by:
         - alertname
         - namespace
-      receiver: slack
+      receiver: slack # default for everything
       routes:
-      - match_re:
-          alertname: "Watchdog"
-        receiver: slack-watchdog
-      - match:
-          severity: page
-        receiver: opsgenie
+        - matchers:
+            - severity="page" # 📢 paging DevOps
+          receiver: opsgenie
+          continue: true # 👈 KEEP GOING after this match
+
+        - matchers:
+            - namespace="kube-system" # 🙈 ignore these alerts - GKE will handle them
+          receiver: discard
+
+        - matchers:
+            - alertname="Watchdog"
+          receiver: slack-watchdog
+
       repeat_interval: 6h

package/src/helm-charts/prom-operator/rules/gcp-rules.yaml

@@ -29,8 +29,7 @@ spec:
       expr: sum(stackdriver_pubsub_subscription_pubsub_googleapis_com_subscription_num_undelivered_messages) by (subscription_id) > 1000
       for: 5m 
       labels:
-        severity: page
-        priority: P3
+        severity: info # awesome was => page / priority: P3
       annotations:
         summary: "High Number of Undelivered Messages on PubSub"
         description: "Undelivered message count on topic {{$labels.subscription_id}} is greater than 1000"

package/src/helm-charts/prom-operator/rules/prometheus-rules.yaml

@@ -130,8 +130,8 @@ spec:
                 VALUE = {{ $value }}
                 LABELS = {{ $labels }}
         - alert: PrometheusRuleEvaluationFailures
-          expr: increase(prometheus_rule_evaluation_failures_total[3m]) > 0
-          for: 0m
+          expr: increase(prometheus_rule_evaluation_failures_total[5m]) > 0 # awesome was 3m
+          for: 5m # awesome was 0m
           labels:
             severity: critical
           annotations:
@@ -186,7 +186,7 @@ spec:
                 LABELS = {{ $labels }}
         - alert: PrometheusTargetEmpty
           expr: prometheus_sd_discovered_targets == 0
-          for: 0m
+          for: 3m # awesome was => 0m
           labels:
             severity: critical
           annotations:

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

@@ -71,7 +71,7 @@ networkPolicy:
 metrics:
   enabled: true
   serviceMonitor:
-    enabled: false # set to true for prometheus operator
+    enabled: true # set to true for prometheus operator
     namespace: "prometheus"
     relabelings:
     - action: labelmap

package/src/helmup.sh

@@ -394,7 +394,7 @@ function installPreemptibleKiller() {
   gcloud iam service-accounts create $SVC_ACCT \
     --project $GCP_PROJECT_ID \
     --description "Estafette Node Killer SA" \
-    --display-name "Estafette Node Killer SA"
+    --display-name "Estafette Node Killer SA" &> $DEVNULL
   warnOnError $? "SA creation may have failed or it already exists"
 
   printf "\nCreate the $SVC_ACCT IAM role\n"
@@ -402,7 +402,7 @@ function installPreemptibleKiller() {
     --project $GCP_PROJECT_ID \
     --title "Estafette Node Killer" \
     --description "Delete compute instances" \
-    --permissions compute.instances.delete
+    --permissions compute.instances.delete &> $DEVNULL
   warnOnError $? "Role creation may have failed or it already exists"
 
   local service_account_email=$(gcloud iam --project=$GCP_PROJECT_ID service-accounts list --filter $SVC_ACCT --format 'value([email])')
@@ -417,6 +417,7 @@ function installPreemptibleKiller() {
   helm upgrade --install estafette-gke-preemptible-killer \
                estafette/estafette-gke-preemptible-killer \
                --namespace ${NAMESPACE} \
+               --set resources.limits.cpu="100m" \
                --set secret.workloadIdentityServiceAccount="$SVC_ACCT@$GCP_PROJECT_ID.iam.gserviceaccount.com" \
                --set extraEnv.BLACKLIST_HOURS="10:00-02:00" # No killing from 5AM-9PM EST
 #              --set extraEnv.WHITELIST_HOURS="12:30-13:30"

package/src/refresh-py-idx.sh

@@ -1,5 +1,14 @@
 #!/bin/bash
 
+# Load the standard helper functions
+. `build-tools --bashfun`
+
+cat<<DEPRECATED
+
+  `color r "**DEPRECATED - refresh-py-idx is no longer used"`
+DEPRECATED
+exit 1
+
 function leveregeBuildToolsRefreshPyIdx() {
   # Execute gcloud command to get the token
   local TOKEN=$(gcloud auth print-access-token)

package/src/templates/cloudBuildSteps.hbs

@@ -1,3 +1,6 @@
+options:
+  machineType: E2_HIGHCPU_8
+
 steps:
   - name: 'gcr.io/cloud-builders/docker'
     entrypoint: 'bash'
@@ -12,6 +15,28 @@ steps:
       - '--cache-from'
       - '{{imageName}}:latest'
       - '.'
-    
+
+  - name: 'gcr.io/cloud-builders/docker'
+    args:
+      - 'tag'
+      - '{{imageName}}:{{imageVersion}}'
+      - '{{imageName}}:{{imageTag}}'
+
+  - name: 'gcr.io/cloud-builders/docker'
+    args:
+      - 'tag'
+      - '{{imageName}}:{{imageVersion}}'
+      - '{{imageName}}:latest'
+
+  - name: 'gcr.io/cloud-builders/docker'
+    args:
+      - 'push'
+      - '{{imageName}}:{{imageTag}}'
+
+  - name: 'gcr.io/cloud-builders/docker'
+    args:
+      - 'push'
+      - '{{imageName}}:latest'
+
 images:
   - '{{imageName}}:{{imageVersion}}'