@leverege/build-tools 2.26.5 → 2.27.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.26.5",
+  "version": "2.27.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -65,14 +65,14 @@
     "parse-gitignore": "^2.0.0",
     "readline-sync": "^1.4.10",
     "semver": "^7.3.8",
-    "simple-git": "^3.16.0",
-    "zx": "^7.1.1"
+    "simple-git": "^3.17.0",
+    "zx": "^7.2.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.20.7",
-    "@babel/core": "^7.20.12",
+    "@babel/cli": "^7.21.0",
+    "@babel/core": "^7.21.0",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^9.4.1"
+    "npm": "^9.6.1"
   }
 }

package/src/helmup

@@ -21,7 +21,7 @@ PLATFORM=(
   scheduler
   transponder-bq
   transponder-rt
-  transponder-postgres # deprecated
+# transponder-postgres # deprecated
   transponder-tsdb
 )
 
@@ -110,16 +110,9 @@ function createNamespaceIfNeeded() {
 
 function bootstrapLocalSetup() {
   SERVICE="$1"
-  [ -z "$1" ] && errorExit "bootstrapLocalSetup function requires a service name"
-  ifPluggedIn $SERVICE && return # if it's already plugged in then go
-
-  TOOLS_SRC="$(build-tools --reporoot)/src"
-  SYSTEM_FILES="$(build-tools --reporoot)/src/system-charts"
+  [ -z "$SERVICE" ] && errorExit "bootstrapLocalSetup function requires a service name"
 
-  SYSTEM_CHART="$SYSTEM_FILES/$SERVICE-local.yaml"
-  [ ! -f "$SYSTEM_CHART" ] && errorExit "Missing $SERVICE chart => $(color y $SYSTEM_CHART)"
-  SYSTEM_HUP="$SYSTEM_FILES/$SERVICE.hup"
-  [ ! -f "$SYSTEM_HUP" ] && errorExit "Missing $SERVICE helmup script => $(color y $SYSTEM_HUP)"
+  ifPluggedIn $SERVICE && return # if it's already plugged in then go
 
   if [ ! -d "$SERVICE" ];
   then
@@ -142,14 +135,37 @@ MISSING_HELMUP_PLUGIN
     errorExit "Installaion of `color y $SERVICE` failed - exiting"
   fi
 
-  if [ "$2" == "set-values-local" ];
+  TOOLS_SRC="$(build-tools --reporoot)/src"
+  SYSTEM_FILES="$(build-tools --reporoot)/src/system-charts"
+
+  case "$2" in
+    "set-values-local")
+      SYSTEM_CHART="$SYSTEM_FILES/$SERVICE-local.yaml"
+      TARGET_CHART="values-local.yaml"
+      ;;
+
+    "ovh-values-local")
+      SYSTEM_CHART="$SYSTEM_FILES/$SERVICE-local.yaml.ovh"
+      TARGET_CHART="$SERVICE-local.yaml.ovh"
+      echo "$SERVICE-local.yaml" > $SERVICE/.gitignore
+      ;;
+
+    *)
+      SYSTEM_CHART="$SYSTEM_FILES/$SERVICE-local.yaml"
+      TARGET_CHART="$SYSTEM_CHART"
+      touch $SERVICE/.nohelm
+      ;;
+  esac
+
+  if [ ! -f "$SYSTEM_CHART" ];
   then
-    TARGET_CHART="values-local.yaml"
-  else
-    TARGET_CHART="$SERVICE-local.yaml"
-    touch $SERVICE/.nohelm
+    rm -rf $SERVICE
+    errorExit "Missing $SERVICE chart => $(color y $SYSTEM_CHART)"
   fi
 
+  SYSTEM_HUP="$SYSTEM_FILES/$SERVICE.hup"
+  [ ! -f "$SYSTEM_HUP" ] && errorExit "Missing $SERVICE helmup script => $(color y $SYSTEM_HUP)"
+
   cp $SYSTEM_CHART $SERVICE/$TARGET_CHART
   cp $SYSTEM_HUP $SERVICE/helmup.plugin
   git add $SERVICE
@@ -234,7 +250,7 @@ ELASTIC_EXPORTER_CHART_MOD
   bootstrapLocalSetup prometheus set-values-local
 
   ## Install Grafana  
-  bootstrapLocalSetup grafana
+  bootstrapLocalSetup grafana ovh-values-local
 
   ## Clean up
   removeHelmRepo prometheus-community
@@ -703,7 +719,7 @@ function doInstall() {
         ;;
 
       "grafana")
-        bootstrapLocalSetup grafana
+        bootstrapLocalSetup grafana ovh-values-local
         ;;
 
       "monitoring")