@leverege/build-tools 2.43.9 → 2.43.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.43.9",
+  "version": "2.43.11",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -64,14 +64,14 @@
     "ms": "^2.1.3",
     "npm-registry-fetch": "^16.1.0",
     "parse-gitignore": "^2.0.0",
-    "read-pkg": "^9.0.0",
+    "read-pkg": "^9.0.1",
     "readline-sync": "^1.4.10",
     "semver": "^7.5.4",
-    "simple-git": "^3.20.0",
+    "simple-git": "^3.21.0",
     "zx": "^7.2.3"
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^4.2.0",
-    "npm": "^10.2.3"
+    "npm": "^10.2.5"
   }
 }

package/src/bash-funcs

@@ -155,3 +155,41 @@ EOSLACK
                 --message "\"$slackmsg\""
   # the "\"$var\"" escaped " is necessary for proper message encapsulation
 }
+
+# If a helmup.plugin file exists and is executable helmup assumes it is
+# an installation specific script that should be executed instead of one
+# of the standard setup scripts.
+function ifPluggedIn() {
+  local INVOKED_AS=`basename $0`
+  local PLUGIN=
+  case "$INVOKED_AS" in
+    "helmup"|"helmwhat" )
+      PLUGIN="$1/helmup.plugin"
+      ;;
+    "helmdn" )
+      PLUGIN="$1/helmdn.plugin"
+      ;;
+    *)
+      ;;
+  esac
+
+  [ ! -f $PLUGIN ] && return 1
+
+  if [ ! -x $PLUGIN ];
+  then
+    cat<<PLUGIN_NOEXEC
+    $RED_ERROR The plugin file is present but is not executable.
+              Try running => `color y "chmod +x $PLUGIN"`
+
+PLUGIN_NOEXEC
+    exit 1
+  fi
+
+  local OPERATION="Executing local plugin code"
+  [ ! -z "$HELM_WHAT" ] && OPERATION="Performing a DRY RUN"
+  printf "\n***$OPERATION => `color y $PLUGIN`\n\n" && sleep 2
+  export HELM_WHAT
+  . $PLUGIN # executing with . allows the plugin to use functions like color
+  sendToSlack "$PLUGIN"
+  return 0
+}

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

@@ -378,24 +378,24 @@ serverFiles:
               description: "PostgreSQL replication lag is going up (> 10s): check {{ $labels.release }}"
               dashboard: "OVH:<MONITORING>/postgres"
 
-          - alert: PostgresqlTableNotVaccumed
-            expr: time() - pg_stat_user_tables_last_autovacuum > 60 * 60 * 24
+          - alert: PostgresqlTableNotVacuumed
+            expr: (pg_stat_user_tables_last_autovacuum > 0) and (time() - pg_stat_user_tables_last_autovacuum > 60 * 60 * 24)
             for: 5m
             labels:
               severity: warning
             annotations:
-              summary: "Postgresql table not vaccumed"
-              description: "Table has not been vaccum for 24 hours: check {{ $labels.release }}"
+              summary: "Postgresql table not vacuumed"
+              description: "Table has not been vacuum for 24 hours: check {{ $labels.instance }}"
               dashboard: "OVH:<MONITORING>/postgres"
 
-          - alert: PostgresqlTableNotAnalyzed
-            expr: time() - pg_stat_user_tables_last_autoanalyze > 60 * 60 * 24
+          - alert: PostgresqlTableNotAutoAnalyzed
+            expr: (pg_stat_user_tables_last_autoanalyze > 0) and (time() - pg_stat_user_tables_last_autoanalyze > 60 * 60 * 24)
             for: 5m
             labels:
               severity: warning
             annotations:
               summary: "Postgresql table not analyzed (instance {{ $labels.instance }})"
-              description: "Table has not been analyzed for 24 hours: check {{ $labels.release }} - {{ $labels.datname }}"
+              description: "Table {{ $labels.relname }} has not been analyzed for 24 hours: check {{ $labels.release }} - {{ $labels.datname }}"
               dashboard: "OVH:<MONITORING>/postgres"
 
           - alert: PostgresqlDeadLocks

package/src/helmdn.sh

@@ -53,16 +53,10 @@ SYSTEM=(
 GITTOP=`git rev-parse --show-toplevel`
 cd $GITTOP
 
-npm run ahoy
+overwhelm
 [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1
 
-# Detect Project ID
-currContext=`kubectl config current-context`
-
-IFS='_'
-read -ra ADDR <<< "$currContext"
-
-GCP_PROJECT_ID=${ADDR[1]} # project id is the second string split by _
+GCP_PROJECT_ID="$(getProjectIdFromK8sContext)"
 
 helm repo update &> /dev/null
 
@@ -104,6 +98,10 @@ NOHELMDN
   fi
 
   local namespace=${2:-default}
+
+  # if there is a helmdn.plugin then do that instead
+  ifPluggedIn $SERVICE $namespace && continue
+
   local helmdn="helm uninstall $1 -n $namespace"
   eval $helmdn
   sendToSlack $helmdn

package/src/helmup.sh

@@ -7,6 +7,14 @@
 
 SHELMUP_ARGS=("$*")
 
+# artifact-registry => https://console.cloud.google.com/artifacts?project=leverege-registry
+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 -u oauth2accesstoken \
+  --password-stdin https://$REGISTRY_DOMAIN &> $DEVNULL &
+
 # make sure we have a current npmrc file
 refresh-npm-token
 
@@ -453,6 +461,7 @@ function installVeleroEnvironment() {
   showInstalling "Velero Backup Management"
   createNamespaceIfNeeded velero
 
+  # Do we need to => gcloud auth application-default
   gcloud config set project $GCP_PROJECT_ID
 
   ## The major chart version will determine the bucket suffix
@@ -545,30 +554,6 @@ function installVeleroEnvironment() {
   kubectl delete volumesnapshotlocation.velero.io -n velero gcp &> $DEVNULL
 }
 
-# If a helmup.plugin file exists and is executable helmup assumes it is
-# an installation specific script that should be executed instead of one
-# of the standard setup scripts.
-function ifPluggedIn() {
-  PLUGIN="$1/helmup.plugin"
-  [ ! -f $PLUGIN ] && return 1
-
-  if [ ! -x $PLUGIN ];
-  then
-    cat<<PLUGIN_NOEXEC
-    $RED_ERROR The plugin file is present but is not executable.
-              Try running => `color y "chmod +x $PLUGIN"`
-
-PLUGIN_NOEXEC
-    exit 1
-  fi
-
-  printf "\n***Executing local plugin code => `color y $PLUGIN`\n\n" && sleep 2
-  export HELM_WHAT
-  . $PLUGIN # executing with . allows the plugin to use functions like color
-  sendToSlack "$PLUGIN"
-  return 0
-}
-
 function getServiceAndChartVersion() {
   SERVICE=
   CHARTVER=
@@ -588,11 +573,6 @@ function getServiceAndChartVersion() {
     $YELO_WARN The use of $SERVICE/$LCL_CHART to lock the chart version has
     been deprecated. Create a top level `color g "Versions.json"` file instead:
 
-    {
-      "scheduler" : "3.6.1",
-      "$SERVICE" : "$CHARTVER"
-    }
-
 DEPRECATED_CHART
     exit 1
   fi

package/src/refresh-npm-token.mjs

@@ -101,7 +101,7 @@ are made.}`
   them know to run this command to fetch the current npmrc file:
 
     gcloud secrets versions access latest \\
-         --secret=NPM_DEVELOPER_NPMRC     \\
+         --secret=REFRESH_NPM_NPMRC       \\
          --project=leverege-registry > ~/.npmrc
 
   Note, ^^that command will need a different --project name for non-leverege