@leverege/build-tools 2.5.26 → 2.5.28

package/lib/server/overwhelm.js

@@ -275,7 +275,7 @@ ahoy.forEach(dir => {
   }
 }); // we can also apply replaceables to any top level .ovh files to support top level config maps
 
-glob.sync('*.ovh').forEach(cfgmap => {
+glob.sync('**/*.ovh').forEach(cfgmap => {
   const target = cfgmap.replace(/.ovh$/, '');
   let valuesOut = fs.readFileSync(cfgmap, {
     encoding: 'utf-8'

package/lib/web/overwhelm.js

@@ -275,7 +275,7 @@ ahoy.forEach(dir => {
   }
 }); // we can also apply replaceables to any top level .ovh files to support top level config maps
 
-glob.sync('*.ovh').forEach(cfgmap => {
+glob.sync('**/*.ovh').forEach(cfgmap => {
   const target = cfgmap.replace(/.ovh$/, '');
   let valuesOut = fs.readFileSync(cfgmap, {
     encoding: 'utf-8'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.5.26",
+  "version": "2.5.28",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -63,21 +63,21 @@
     "inquirer": "^7.3.3",
     "js-yaml": "^4.0.0",
     "ncp": "^2.0.0",
-    "npm-check-updates": "^11.1.1",
+    "npm-check-updates": "^11.1.4",
     "npm-registry-fetch": "^9.0.0",
-    "open": "^7.4.0",
+    "open": "^7.4.2",
     "ora": "^5.3.0",
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
     "semver": "^7.3.4",
-    "simple-git": "^2.34.2"
+    "simple-git": "^2.35.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.13",
-    "@babel/core": "^7.12.13",
-    "@babel/node": "^7.12.13",
+    "@babel/cli": "^7.12.17",
+    "@babel/core": "^7.12.17",
+    "@babel/node": "^7.12.17",
     "@leverege/babel-preset-leverege-node": "^1.1.1",
     "@leverege/eslint-config-leverege": "^2.2.0",
-    "npm": "^7.5.2"
+    "npm": "^7.5.4"
   }
 }

package/src/helmdn

@@ -93,7 +93,7 @@ function doNuking() {
 
     if [ "$SERVICE" == "monitoring" ];
     then
-      annihilateMonitoring && exit $?
+      annihilateMonitoring && continue
     fi
 
     if [ "$SERVICE" == "platform" ];

package/src/helmup

@@ -32,6 +32,7 @@ SYSTEM=(
   timescale-db
   monitoring
   reloader
+  traefik
   velero
 )
 
@@ -64,13 +65,17 @@ function generatePassword(){
   echo $RANDOMPW
 }
 
-function installMonitoringCharts(){
+function createNamespaceIfNeeded(){
   # Check the namespace exists in kubernetes
-  kubectl get namespace monitoring &> /dev/null
+  kubectl get namespace $1 &> /dev/null
   if [[ $? -eq 1 ]]; then
-    printf "\n*** Creating monitoring namespace ***\n\n"
-    kubectl create namespace monitoring
+    printf "\n*** Creating $1 namespace ***\n\n"
+    kubectl create namespace $1
   fi
+}
+
+function installMonitoringCharts(){
+  createNamespaceIfNeeded monitoring
 
   # Add necessary helm repositories - note that stable is deprecated
   printf "\nAdding and updating helm repositories...\n"
@@ -147,20 +152,20 @@ SA_EXISTS
   ## Install Prometheus
   helm upgrade --install prometheus prometheus-community/prometheus \
     --namespace monitoring \
-    -f prometheus/values.yaml \
+    --values prometheus/values.yaml \
     --version 13.2.1
 
   ## Installing ES exporter
   helm upgrade --install elasticsearch-exporter prometheus-community/prometheus-elasticsearch-exporter \
     --namespace monitoring \
-    -f elasticsearch-exporter/values-es-exporter.yaml \
+    --values elasticsearch-exporter/values-es-exporter.yaml \
     --version 4.1.0
 
   ## Install Grafana  
   helm repo add grafana https://grafana.github.io/helm-charts && helm repo update
   helm upgrade --install grafana grafana/grafana \
     --namespace monitoring \
-    -f grafana/values-grafana.yaml \
+    --values grafana/values-grafana.yaml \
     --version 6.2.2
 }
 
@@ -214,6 +219,37 @@ function checkSSDStorageClass(){
   printf "\n*** Attaching PVC to SSD Class ***\n\n"
 }
 
+function getManagedSecret() {
+  local SECNAME=$1
+  local PROJECT="${2:-leverege-docker-images}"
+  SECRET=$(gcloud secrets versions access latest --secret=$SECNAME --project=$PROJECT)
+  echo $SECRET
+}
+
+function installTraefik() {
+  createNamespaceIfNeeded traefik
+
+  kubectl get secret cloudflare --namespace traefik &>/dev/null
+  if [[ $? -eq 1 ]]; then
+    cat<<NEED_TRAEFIK_SECRET
+  `color r "***ERROR:"` missing secret: `color y cloudflare` namespace: `color y traefik`
+
+   This secret may be fetched from the leverege-docker-images cluster and
+   properly injected into this cluster.
+NEED_TRAEFIK_SECRET
+    yesToContinue "to copy and inject the cloudflare secret"
+    TOKEN=$(getManagedSecret "CLOUDFLARE_API_TOKEN")
+    exitOnError $? "Failed to fetch the secret from leverege-docker-images"
+    kubectl create secret generic cloudflare \
+      --namespace traefik \
+      --from-literal=dns-token=$TOKEN
+  fi
+
+  helm upgrade --install traefik traefik/traefik \
+    --namespace traefik \
+    --values traefik/traefik-values.yaml
+}
+
 function installVelero() {
   ## Set the project id by parsing current context
   currContext=`kubectl config current-context`
@@ -451,7 +487,11 @@ function doInstall() {
       transponder-*)
         # transponders use the same chart but different deployment name
         helm upgrade --install $SERVICE leverege/transponder \
-                            -f $SERVICE/values.yaml
+                     --values $SERVICE/values.yaml
+        ;;
+
+      "traefik")
+        installTraefik
         ;;
 
       "velero")

package/src/install-traefik

@@ -4,17 +4,18 @@ cat<<TRAEFIK_CERT
 
 *** This is currently informational only ***
 
+overwhelm
 helm repo add traefik https://containous.github.io/traefik-helm-chart
 helm repo add jetstack https://charts.jetstack.io
 helm repo update
 
 kubectl create namespace cert-manager
 kubectl create secret generic cloudflare --namespace cert-manager \
-  --from-literal=dns-token='q0Brf_gDhoppt5MgUal7rg61zBOQrDzrgmrKzGRb'
+  --from-literal=dns-token="CLOUD FLARE API TOKEN KEEWEB"
 
 kubectl create namespace traefik
 kubectl create secret generic cloudflare --namespace traefik \
-  --from-literal=dns-token='q0Brf_gDhoppt5MgUal7rg61zBOQrDzrgmrKzGRb'
+  --from-literal=dns-token="CLOUD FLARE API TOKEN KEEWEB"
 
 helm install --namespace traefik traefik traefik/traefik -f traefik/traefik-values.yaml
 
@@ -33,5 +34,9 @@ helm install \
 # this token is a cox2m token
 kubectl apply --namespace cert-manager -f cert-manager
 
-kubectl describe certificate
+# to describe the cert
+kubectl describe certificate --namespace cert-manager
+
+# to delete the issuer
+kubectl -n cert-manager delete clusterissuer <issuer name?>
 TRAEFIK_CERT

package/src/overwhelm.js

@@ -230,7 +230,7 @@ ahoy.forEach( ( dir ) => {
 } )
 
 // we can also apply replaceables to any top level .ovh files to support top level config maps
-glob.sync( '*.ovh' ).forEach( ( cfgmap ) => {
+glob.sync( '**/*.ovh' ).forEach( ( cfgmap ) => {
   const target = cfgmap.replace(/.ovh$/,'')
   let valuesOut = fs.readFileSync( cfgmap, { encoding : 'utf-8' } )
   valuesOut = doReplacements( valuesOut, over )