@leverege/build-tools 2.88.2 → 2.89.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.88.2",
+  "version": "2.89.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -76,13 +76,13 @@
     "glob": "^11.0.3",
     "handlebars": "^4.7.8",
     "ignore": "^7.0.5",
-    "inquirer": "^12.9.6",
+    "inquirer": "^12.10.0",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.5",
     "ms": "^2.1.3",
     "npm-registry-fetch": "^19.0.0",
     "ora": "^9.0.0",
-    "p-limit": "^7.1.1",
+    "p-limit": "^7.2.0",
     "package-up": "^5.0.0",
     "readline-sync": "^1.4.10",
     "semver": "^7.7.3",
@@ -90,10 +90,10 @@
     "simple-git": "^3.28.0",
     "sloc": "^0.3.2",
     "toml": "^3.0.0",
-    "zx": "^8.8.4"
+    "zx": "^8.8.5"
   },
   "devDependencies": {
-    "@leverege/eslint-config-leverege": "^5.1.0",
+    "@leverege/eslint-config-leverege": "^5.1.1",
     "npm": "^11.6.2"
   }
 }

package/src/build-cnpg-image.mjs

@@ -102,7 +102,8 @@ RUN set -xe; \\
     apt-get update; \\
     apt-get install -y --no-install-recommends \\
         "postgresql-\${PG_MAJOR}-jsquery" \\
-        "postgresql-\${PG_MAJOR}-repack"; \\
+        "postgresql-\${PG_MAJOR}-repack" \\
+        "postgresql-\${PG_MAJOR}-squeeze"; \\
         ln -s /usr/lib/postgresql/\${PG_MAJOR}/bin/pg_repack /usr/local/bin/pg_repack || true; \\
     rm -fr /tmp/*; \\
     rm -rf /var/lib/apt/lists/*;

package/src/chart-to-registry.mjs

@@ -106,12 +106,12 @@ debug( {
   registryRepository,
   ociPushEndpoint }, '<==Parsed package and chart' )
 
-// gcloud auth print-access-token | helm registry login -u oauth2accesstoken \
+// gcloud auth application-default print-access-token | helm registry login -u oauth2accesstoken \
 // -p ${password} https://us-docker.pkg.dev
 //
 // Get the current access token and use it to login to the registry with helm.
 try {
-  const accessToken = await shellCmd( 'gcloud auth print-access-token' )
+  const accessToken = await shellCmd( 'gcloud auth application-default print-access-token' )
   // -p is frowned upon but using a pipe | is problematic with shellCmd (execa)
   const registryLoginCommand = `helm registry login -u oauth2accesstoken -p ${accessToken}`
 

package/src/clone-cnpg-from-snapshot.mjs

@@ -4,11 +4,12 @@
 
 import fs from 'node:fs/promises'
 import path from 'node:path'
-import ora from 'ora'
 
+import ora from 'ora'
 import { program } from 'commander'
 import chalk from 'chalk'
 import YAML from 'js-yaml'
+
 import {
   // condir,
   debug,
@@ -88,6 +89,7 @@ const writeApplyScript = async ( dir ) => {
 #
 # Apply VolumeSnapshot resources prior to deploying the CNPG cluster
 #
+overwhelm
 kubectl apply -f ${dir}/volumesnapshotclass.yaml
 kubectl apply -f ${dir}/volumesnapshotcontent.yaml
 kubectl apply -f ${dir}/volumesnapshot.yaml

package/src/count-lines-of-code.mjs

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import path from 'node:path'
+
 import { $, fs, chalk, argv } from 'zx'
 
 import { log } from './Utils.mjs'

package/src/custom-images/bitnami-audits/bitnami-audit.mjs

@@ -6,6 +6,7 @@
 // the BitnamiImageRegistry gsheet to show progess on the migration effort.
 //
 import fs from 'node:fs'
+
 import chalk from 'chalk'
 import semver from 'semver'
 

package/src/docker-to-registry-py.mjs

@@ -3,6 +3,7 @@
  * DEPRECATED - DO NOT MODIFY
  */
 import fs from 'node:fs'
+
 import toml from 'toml'
 import chalk from 'chalk'
 
@@ -14,7 +15,6 @@ import {
   parseHelmChart,
   proceed,
   shellCmd } from './Utils.mjs'
-
 import Docker from './DockerPy.mjs'
 
 // refresh-npm-token does not throw so no need to try, but it emits in debug

package/src/docker-to-registry.mjs

@@ -18,7 +18,6 @@ import {
   shellCmd,
   warning,
 } from './Utils.mjs'
-
 import docker from './Docker.mjs'
 
 const minimumBuildToolsVersion = '2.68.0'

package/src/fetch-awesome-alerts.mjs

@@ -2,6 +2,7 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
+
 import yaml from 'js-yaml'
 import { Command } from 'commander'
 import chalk from 'chalk'

package/src/getjson.mjs

@@ -19,6 +19,7 @@
  * Get a command line switch parser.
  */
 import fs from 'node:fs'
+
 import cliArgs from 'command-line-args'
 import cliHelp from 'command-line-usage'
 

package/src/helm-audit.mjs

@@ -6,6 +6,7 @@
 import ora from 'ora'
 import pLimit from 'p-limit'
 import chalk from 'chalk'
+
 import { shellCmd, log, errorExit } from './Utils.mjs'
 
 const spinner = ora( 'Gathering Helm release info...' ).start()

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

@@ -76,7 +76,7 @@ spec:
                 time() - kube_pod_start_time > 60
               )
             ) > 0.3
-          for: 5m
+          for: 10m # awesome was 5m
           labels:
             severity: warning
             namespace: '{{ $labels.namespace }}'

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

@@ -165,7 +165,7 @@ spec:
                 LABELS = {{ $labels }}
         - alert: KubernetesHpaScaleInability
           expr: (kube_horizontalpodautoscaler_spec_max_replicas - kube_horizontalpodautoscaler_status_desired_replicas) * on (horizontalpodautoscaler,namespace) (kube_horizontalpodautoscaler_status_condition{condition="ScalingLimited", status="true"} == 1) == 0
-          for: 5m # awesome was => 2m
+          for: 15m # awesome was => 2m
           labels:
             severity: warning
           annotations:
@@ -295,7 +295,7 @@ spec:
                 LABELS = {{ $labels }}
         - alert: KubernetesDaemonsetRolloutStuck
           expr: kube_daemonset_status_number_ready / kube_daemonset_status_desired_number_scheduled * 100 < 100 or kube_daemonset_status_desired_number_scheduled - kube_daemonset_status_current_number_scheduled > 0
-          for: 10m
+          for: 15m # awesome was 10m
           labels:
             severity: warning
           annotations:
@@ -349,7 +349,24 @@ spec:
                 VALUE = {{ $value }}
                 LABELS = {{ $labels }}
         - alert: KubernetesApiClientErrors
-          expr: (sum(rate(rest_client_requests_total{code=~"(4|5).."}[1m])) by (instance, job) / sum(rate(rest_client_requests_total[1m])) by (instance, job)) * 100 > 1
+# awesome expr: (sum(rate(rest_client_requests_total{code=~"(4|5).."}[1m])) by (instance, job) / sum(rate(rest_client_requests_total[1m])) by (instance, job)) * 100 > 1
+          expr: |
+              (
+                (
+                  sum by (instance, job) (
+                    rate(
+                      rest_client_requests_total{
+                        code=~"(4|5)..",
+                        code!~"403|404|409"
+                      }[5m]
+                    )
+                  )
+                  /
+                  sum by (instance, job) (
+                    rate(rest_client_requests_total[5m])
+                  )
+                ) * 100
+              ) > 1
           for: 5m
           labels:
             severity: critical

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

@@ -130,10 +130,10 @@ spec:
                 VALUE = {{ $value }}
                 LABELS = {{ $labels }}
         - alert: PrometheusRuleEvaluationFailures
-          expr: increase(prometheus_rule_evaluation_failures_total[5m]) > 0 # awesome was 3m
-          for: 5m # awesome was 0m
+          expr: increase(prometheus_rule_evaluation_failures_total[5m]) > 5
+          for: 10m # awesome was 0m
           labels:
-            severity: critical
+            severity: warning # awesome was critical
           annotations:
             summary: Prometheus rule evaluation failures (instance {{ $labels.instance }})
             description: |-

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

@@ -9,7 +9,7 @@ spec:
   - name: Velero
     rules:
     - alert: VeleroBackupFailure
-      expr: (time() - velero_backup_last_successful_timestamp{schedule_version=~"2.[0]"} > 108000) and (velero_backup_success_total{schedule!=""}  != 0)
+      expr: (time() - velero_backup_last_successful_timestamp > 108000) and (velero_backup_success_total{schedule!=""}  != 0)
       for: 5m
       labels:
         severity: warning

package/src/helmup.sh

@@ -12,7 +12,7 @@ REGISTRY_DOMAIN="us-docker.pkg.dev"
 # open container initiative (oci) => https://opencontainers.org/
 ARTIFACT_REGISTRY="oci://$REGISTRY_DOMAIN/leverege-registry"
 # login to the registry in the background
-gcloud auth print-access-token | helm registry login \
+gcloud auth application-default print-access-token | helm registry login \
   -u oauth2accesstoken --password-stdin $REGISTRY_DOMAIN &> $DEVNULL
 
 # make sure we have a current npmrc file

package/src/hook-and-release.mjs

@@ -3,7 +3,6 @@
 import path from 'node:path'
 
 import { debug, getGitDiff, } from './Utils.mjs'
-
 import Config from './hook-and-release/index.mjs'
 
 const harConfig = await Config.create()

package/src/k8x.sh

@@ -63,6 +63,10 @@ K8X_HELP
     FZFQ="--query=redis" && cmd='redis-cli'
     ;;
 
+  "valkey"|"valkey-cli")
+    FZFQ="--query=valkey" && cmd='valkey-cli'
+    ;;
+
   *)
     FZFQ="--query=$cmd" && cmd='bash'
     ;;

package/src/modify-gcs-access.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import { Command } from 'commander'
+
 import { shellCmd, log, warning, errorExit } from './Utils.mjs'
 
 const program = new Command()

package/src/refresh-py-idx.sh

@@ -11,7 +11,7 @@ exit 1
 
 function leveregeBuildToolsRefreshPyIdx() {
   # Execute gcloud command to get the token
-  local TOKEN=$(gcloud auth print-access-token)
+  local TOKEN=$(gcloud auth application-default print-access-token)
 
   # Write to pip.conf
   local PIP_CONFIG_DIR="$HOME/.config/pip"