@leverege/build-tools 2.19.0 → 2.19.2

package/lib/server/overwhelm.js

@@ -276,8 +276,9 @@ if (args.key) {
 } // Find all of the potential target dirs. Utilize .gitignore to ignore files
 
 
+const gitignore = parse(fs.readFileSync('.gitignore'));
 const opt = {
-  ignore: parse(fs.readFileSync('.gitignore'))
+  ignore: gitignore.patterns
 };
 const ahoy = glob.sync('*/', opt); // .noahoy = skips generation of values.yaml but allows helmup to run
 // .nohelm = overwhelm and helmup will skip the deployment entirely

package/lib/web/overwhelm.js

@@ -276,8 +276,9 @@ if (args.key) {
 } // Find all of the potential target dirs. Utilize .gitignore to ignore files
 
 
+const gitignore = parse(fs.readFileSync('.gitignore'));
 const opt = {
-  ignore: parse(fs.readFileSync('.gitignore'))
+  ignore: gitignore.patterns
 };
 const ahoy = glob.sync('*/', opt); // .noahoy = skips generation of values.yaml but allows helmup to run
 // .nohelm = overwhelm and helmup will skip the deployment entirely

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.19.0",
+  "version": "2.19.2",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -60,23 +60,23 @@
     "enquirer": "^2.3.6",
     "execa": "^5.1.1",
     "figlet": "^1.5.2",
-    "glob": "^7.2.3",
+    "glob": "^8.0.3",
     "inquirer": "^8.2.4",
     "js-yaml": "^4.1.0",
     "ncp": "^2.0.0",
-    "npm-registry-fetch": "^11.0.0",
+    "npm-registry-fetch": "^13.3.0",
     "open": "^8.4.0",
     "ora": "^5.4.1",
-    "parse-gitignore": "^1.0.1",
+    "parse-gitignore": "^2.0.0",
     "readline-sync": "^1.4.10",
     "semver": "^7.3.7",
     "simple-git": "^3.10.0",
     "zx": "^7.0.7"
   },
   "devDependencies": {
-    "@babel/cli": "^7.18.6",
-    "@babel/core": "^7.18.6",
-    "@babel/node": "^7.18.6",
+    "@babel/cli": "^7.18.9",
+    "@babel/core": "^7.18.9",
+    "@babel/node": "^7.18.9",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
     "npm": "^8.14.0"

package/src/helmup

@@ -145,10 +145,19 @@ function installPrometheus() {
     --namespace monitoring \
     --values prometheus/values.yaml \
     --version $PROMETHEUS_HELM_CHART
-
   removeHelmRepo prometheus-community
 }
 
+function installGrafana() {
+  ## Install Grafana
+  addHelmRepo grafana https://grafana.github.io/helm-charts
+  helm upgrade --install grafana grafana/grafana \
+    --namespace monitoring \
+    --values grafana/values-grafana.yaml \
+    --version 6 # latest v8 grafana
+  removeHelmRepo grafana
+}
+
 function installRedis() {
   showInstalling "Redis Network Cache"
   addBitnamiRepo latest
@@ -314,15 +323,10 @@ SA_EXISTS
     --version 4.13
 
   ## Install Grafana  
-  addHelmRepo grafana https://grafana.github.io/helm-charts
-  helm upgrade --install grafana grafana/grafana \
-    --namespace monitoring \
-    --values grafana/values-grafana.yaml \
-    --version 6 # latest v8 grafana
+  installGrafana
 
   ## Clean up
   removeHelmRepo prometheus-community
-  removeHelmRepo grafana
 }
 
 function monitoringHelp(){
@@ -891,6 +895,10 @@ function doInstall() {
         installPreemptibleKiller # the gke preemptible node spreader outer
         ;;
 
+      "grafana")
+        installGrafana
+        ;;
+
       "monitoring")
         installMonitoringCharts
         monitoringHelp

package/src/overwhelm.js

@@ -221,8 +221,9 @@ if ( args.key ) {
 }
 
 // Find all of the potential target dirs. Utilize .gitignore to ignore files
+const gitignore = parse( fs.readFileSync( '.gitignore' ) )
 const opt = {
-  ignore : parse( fs.readFileSync( '.gitignore' ) )
+  ignore : gitignore.patterns,
 }
 
 const ahoy = glob.sync( '*/', opt )