@leverege/build-tools 2.42.0-beta.2 → 2.42.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.42.0-beta.2",
+  "version": "2.42.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -61,7 +61,7 @@
     "glob": "^10.3.10",
     "js-yaml": "^4.1.0",
     "ms": "^2.1.3",
-    "npm-registry-fetch": "^16.0.0",
+    "npm-registry-fetch": "^16.1.0",
     "parse-gitignore": "^2.0.0",
     "read-pkg": "^8.1.0",
     "readline-sync": "^1.4.10",

package/src/docker-to-registry.sh

@@ -221,7 +221,7 @@ function getNthObjectFromDelimitedString() {
   IFS=$delimeter
   read -ra ADDR <<< "$inputStr"
 
-  echo ${ADDR[$2]}
+  echo ${ADDR[$index]}
 }
 
 # ---------- MAIN PROCESSING STARTS HERE ----------
@@ -597,8 +597,6 @@ then
   printf "\n$(color g "Tagging and Pushing $version")\n"
   git tag -af $1 -m "Docker version $1"
   git push --follow-tags
-# gcloud container images add-tag --quiet $gcimage:$version $gcimage:latest
-# [ ! -z "$artifact" ] && gcloud container images add-tag --quiet $registry:$version $registry:latest
 else
   printf "\n$(color y '*** Skipped git tagging - beta release')\n\n"
 fi

package/src/helm-charts/elasticsearch8/elasticsearch-local.yaml

@@ -1,15 +1,13 @@
 # Foundation Chart: https://artifacthub.io/packages/helm/elastic/elasticsearch
 #
-# esJavaOpts: "" # example: "-Xmx1g -Xms1g"
-# 
-# resources:
-#   requests:
-#     cpu: "1000m"
-#     memory: "2Gi"
-#   limits:
-#     cpu: "1000m"
-#     memory: "2Gi"
-
+# These settings are for a vanilla initial system setup. For an example of a
+# much beefier ES8 deployment take a look at prd-recovr-auto, which also uses
+# much bigger nodes in the elastic node pool - n2-standard-16.
+#
+# On a production deployment there will most likely be resource definitions
+# for each of the 4 ES node types in the cluster. See prd-recovr-auto for an
+# example of a big beefy system.
+#
 global:
   storageClass: "ssd"
 
@@ -18,6 +16,11 @@ namespaceOverride: "elastic"
 
 coordinating:
   replicaCount: 3
+# resources: # default from bitnami chart
+#   limits: {}
+#   requests:
+#     cpu: 25m
+#     memory: 256Mi
   affinity:
     nodeAffinity:
       requiredDuringSchedulingIgnoredDuringExecution:
@@ -35,10 +38,11 @@ coordinating:
 
 data:
   replicaCount: 3
-  resources:
-    requests:
-      cpu: 2
-      memory: 4Gi
+# resources: # defaults from bitnami chart
+#   limits: {}
+#   requests:
+#     cpu: 25m
+#     memory: 2048Mi
   persistence:
     enabled: true
     size: 64Gi
@@ -59,6 +63,7 @@ data:
 
 ingest:
   replicaCount: 3
+  # no default resources specified
   affinity:
     nodeAffinity:
       requiredDuringSchedulingIgnoredDuringExecution:
@@ -76,6 +81,17 @@ ingest:
 
 master:
   replicaCount: 3
+# resources: # example from the bitnami chart
+#   ## Example:
+#   ## limits:
+#   ##    cpu: 500m
+#   ##    memory: 1Gi
+#   limits: {}
+#   ## Examples:
+#   ## requests:
+#   ##    cpu: 250m
+#   ##    memory: 256Mi
+#   requests: {}
   affinity:
     nodeAffinity:
       requiredDuringSchedulingIgnoredDuringExecution:
@@ -90,15 +106,3 @@ master:
     operator: "Equal"
     value: "true"
     effect: "NoSchedule"
-
-# RecovR Prd Settings - very beefy on an n2-standard-8
-#
-# esJavaOpts: "-Xmx8g -Xms8g"
-# 
-# resources:
-#   requests:
-#     cpu: "6250m"
-#     memory: "16Gi"
-#   limits:
-#     cpu: "6750m"
-#     memory: "20Gi"

package/src/helm-charts/prometheus/helmup.plugin

@@ -3,8 +3,8 @@
 showInstalling "Prometheus"
 
 # the following two lines may be removed after reaching prom chart 25
-kubectl delete deploy -n monitoring -l app=prometheus,component=server &> $DEVNULL
-kubectl delete deploy -n monitoring -l app.kubernetes.io/name=prometheus &> $DEVNULL
+[ -z "$HELM_WHAT" ] && kubectl delete deploy -n monitoring -l app=prometheus,component=server &> $DEVNULL
+[ -z "$HELM_WHAT" ] && kubectl delete deploy -n monitoring -l app.kubernetes.io/name=prometheus &> $DEVNULL
 
 addHelmRepo prometheus-community https://prometheus-community.github.io/helm-charts
 

package/src/helm-charts/pubsub-pulse/values-local.yaml

@@ -0,0 +1,9 @@
+image:
+  tag: # v1.3.5
+# registry: gcr.io/leverege-docker-images # deprecated
+# registry: us-docker.pkg.dev/leverege-registry/leverege/images
+
+config:
+  pulseDelay: "1000"
+  LOG_CONFIG: '{"type":"pino","level":"warn"}'
+  IMAGINE_API_URL: "https://OVH:<PROJECT_ID>-imagine-api.OVH:<HOST>.com"

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

@@ -1,5 +1,5 @@
 image:
-  tag: # v2.2.0
+  tag: # v2.2.1
 
 config:
   CF_TRANSPORT_CONFIG: '{

package/src/helmup.sh

@@ -29,6 +29,13 @@ PLATFORM=(
   transponder-tsdb
 )
 
+AUXILIARY=(
+  geotile-server
+  pubsub-pulse
+  push-notifier
+  vin-decoder-server
+)
+
 SYSTEM=(
   elasticsearch8
   redis
@@ -42,6 +49,12 @@ SYSTEM=(
   monitoring # do monitoring last to show password
 )
 
+function isLeveregeService() {
+  local answer=0
+  [[ ${PLATFORM[@]} =~ $1 || ${AUXILIARY[@]} =~ $1 ]] && answer=1
+  echo $answer
+}
+
 # audit trail via slack
 # support for legacy bitnami charts
 function addBitnamiRepo() {
@@ -771,7 +784,7 @@ CATBACKUP
       *)
         # if the service dir is missing then check to see if it's a platform
         # service and if it is then try to bootstrap from charts in build-tools
-        [[ ! -d $SERVICE && ${PLATFORM[@]} =~ $SERVICE ]] && bootstrapLocalSetup $SERVICE
+        [ ! -d $SERVICE ] && [[ $(isLeveregeService $SERVICE) -eq 1 ]] && bootstrapLocalSetup $SERVICE
 
         if [ ! -d $SERVICE ] || [ ! -f $SERVICE/values-local.yaml ];
         then