@leverege/build-tools 2.14.2 → 2.16.0

package/lib/server/overwhelm.js

@@ -342,6 +342,12 @@ glob.sync('**/*.ovh').forEach(cfgmap => {
 }); // Set the GCP context for safety!
 
 const clusterName = over.CLUSTER_NAME;
+
+if (over.PROJECT_NAME === 'minikube') {
+  process.exit(0);
+}
+
+console.log(over, `XXXXX=>[${clusterName}]`);
 const projectId = over.PROJECT_ID;
 let zone = over['GCE_REGION'] + (over['GCE_ZONE'] ? `-${over['GCE_ZONE']}` : '');
 

package/lib/web/overwhelm.js

@@ -342,6 +342,12 @@ glob.sync('**/*.ovh').forEach(cfgmap => {
 }); // Set the GCP context for safety!
 
 const clusterName = over.CLUSTER_NAME;
+
+if (over.PROJECT_NAME === 'minikube') {
+  process.exit(0);
+}
+
+console.log(over, `XXXXX=>[${clusterName}]`);
 const projectId = over.PROJECT_ID;
 let zone = over['GCE_REGION'] + (over['GCE_ZONE'] ? `-${over['GCE_ZONE']}` : '');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.14.2",
+  "version": "2.16.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -68,14 +68,14 @@
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
     "semver": "^7.3.7",
-    "simple-git": "^3.7.1"
+    "simple-git": "^3.10.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.18.2",
-    "@babel/node": "^7.17.10",
+    "@babel/core": "^7.18.5",
+    "@babel/node": "^7.18.5",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^8.12.1"
+    "npm": "^8.13.1"
   }
 }

package/src/dockreate

@@ -44,6 +44,7 @@ pluginFile="Dockerfile.plugin"
 
 # cleanup trapper for gracefully killing, which doesn't do much right now
 cleanup() {
+  [ ! -z "$DOCKER_SKIP_CLEANUP" ] && printf "\nSkipping clean up\n\n" && exit 1
   printf "\nCleaning up and exiting...\n\n"
   rm -rf ./workspace $SSHDIR .npmrc
   exit 0

package/src/helmdn

@@ -52,6 +52,7 @@ PLATFORM=(
   scheduler
   transponder-bq
   transponder-postgres
+  transponder-tsdb
   transponder-rt
 )
 

package/src/helmup

@@ -25,6 +25,7 @@ PLATFORM=(
   transponder-bq
   transponder-rt
   transponder-postgres
+  transponder-tsdb
 )
 
 SYSTEM=(
@@ -43,7 +44,7 @@ SYSTEM=(
 
 # support for legacy bitnami charts
 function addBitnamiRepo() {
-  if [ ! -z "$BITNAMI_LATEST" ];
+  if [ ! -z "$BITNAMI_LATEST" ] || [ "$1" == "latest" ];
   then
     BITNAMI_URL="https://charts.bitnami.com/bitnami"
   else
@@ -148,8 +149,71 @@ function installPrometheus() {
 # removeHelmRepo prometheus-community
 }
 
+function installRedis() {
+  showInstalling "Redis Network Cache"
+  addBitnamiRepo latest
+  [ -z "$REDIS_HELM_CHART" ] && REDIS_HELM_CHART="16" # latest breaks us => "v14+"
+  helm upgrade --install redis bitnami/redis \
+    --version $REDIS_HELM_CHART \
+    -f - <<REDIS_CHART_MODS
+auth:
+  enabled: false
+
+global:
+  storageClass: ssd
+
+metrics:
+  enabled: true
+
+networkPolicy:
+  enabled: true
+
+master:
+  persistence:
+    size: 8Gi # 8Gi is default
+
+  tolerations:
+  - key: "database"
+    operator: "Equal"
+    value: "true"
+    effect: "NoSchedule"
+
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: target-env
+            operator: In
+            values:
+            - database
+
+replica:
+  persistence:
+    size: 8Gi # 8Gi is default
+
+  tolerations:
+  - key: "database"
+    operator: "Equal"
+    value: "true"
+    effect: "NoSchedule"
+
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: target-env
+            operator: In
+            values:
+            - database
+REDIS_CHART_MODS
+  printf "\n\nTo start a specific version => `color g 'REDIS_HELM_CHART="13.0.1" helmup redis'`\n\n"
+  removeHelmRepo bitnami
+}
+
 function installMonitoringCharts(){
-  showInstalling "Grafana Monitoring"
+  showInstalling "Monitoring Components"
   createNamespaceIfNeeded monitoring
 
   # Add necessary helm repositories - note that stable is deprecated
@@ -160,8 +224,8 @@ function installMonitoringCharts(){
    
   IFS='_'
   read -ra ADDR <<< "$currContext" 
-
   KUBERNETES_ENV=${ADDR[0]} # should be either gke or eks
+  GCP_PROJECT_ID=${ADDR[1]} # project id is the second string split by _
 
   ## Installing stackdriver exporter in GKE
   if [[ "$KUBERNETES_ENV" = "gke" ]];
@@ -173,28 +237,16 @@ function installMonitoringCharts(){
 
   The stackdriver-exporter SA already exists which means installing the
   helm chart is going to fail because it wants to manage that aspect of the
-  system.
+  system. This most likely because the stackdriver exporter is already
+  installed and running. Run the following helm command to uninstall first:
+
+      `color y "overwhelm && helm uninstall -n monitoring stackdriver-exporter"`
 
 SA_EXISTS
-      kubectl get sa -n monitoring stackdriver-exporter
-      exitOnError 1 "Must remove the SA in order to proceed - `color r DANGER`"
+      exitOnError 1 "uninstall the existing deployment in order to proceed"
     fi
 
-    GCP_PROJECT_ID=${ADDR[1]} # project id is the second string split by _
     SDEXP_SA='stackdriver-exporter'
-    helm upgrade --install stackdriver-exporter \
-      prometheus-community/prometheus-stackdriver-exporter \
-      --namespace monitoring \
-      --values stackdriver-exporter/values.yaml \
-      --version 1.12.0
-
-    # Verify the Kubernetes SA
-    kubectl get sa -n monitoring $SDEXP_SA
-    if [[ $? -eq 1 ]];
-    then
-      printf "The $SDEXP_SA SA seems to be missing, which is weird - creating it now\n"
-      kubectl create sa -n monitoring stackdriver-exporter
-    fi
 
     # NOTE: The k8s SA != GCP SA - the former is created by the helm chart
     # that installs the stackdriver-exporter, the latter is handled here in
@@ -203,7 +255,8 @@ SA_EXISTS
     # Create GCP SA and bind policies
     printf "\n*** Creating GCP SA with monitoring/viewer ***\n"
     gcloud iam service-accounts create $SDEXP_SA \
-      --project "$GCP_PROJECT_ID"
+      --project "$GCP_PROJECT_ID" \
+      --display-name "Prometheus Stackdriver Exporter"
     warnOnError $? "the GCP SA $SDEXP_SA may already exist"
 
     printf "\n*** Binding IAM role of monitoring viewer to stackdriver-exporter in $GCP_PROJECT_ID\n"
@@ -218,11 +271,26 @@ SA_EXISTS
       --member "serviceAccount:$GCP_PROJECT_ID.svc.id.goog[monitoring/$SDEXP_SA]" \
       "$SDEXP_SA@$GCP_PROJECT_ID.iam.gserviceaccount.com"
 
-    # Annotate Kubernetes SA
-    printf "\n*** Annotating the stackdriver-exporter SA\n"
-    kubectl annotate serviceaccount $SDEXP_SA \
-      "iam.gke.io/gcp-service-account=$SDEXP_SA@$GCP_PROJECT_ID.iam.gserviceaccount.com" \
-      --namespace monitoring
+    # The GCP SA is now up but slight delay before launch helm to let the IAM update occur
+    sleep 2
+    helm upgrade --install stackdriver-exporter \
+      prometheus-community/prometheus-stackdriver-exporter \
+      --namespace monitoring \
+      --values stackdriver-exporter/values.yaml \
+      --version 3
+
+    # Verify the Kubernetes SA
+    kubectl get sa -n monitoring $SDEXP_SA
+    if [[ $? -eq 1 ]];
+    then
+      printf "The $SDEXP_SA SA seems to be missing - did startup fail?\n"
+    else
+      # Annotate Kubernetes SA
+      printf "\n*** Annotating the stackdriver-exporter SA\n"
+      kubectl annotate serviceaccount $SDEXP_SA \
+        "iam.gke.io/gcp-service-account=$SDEXP_SA@$GCP_PROJECT_ID.iam.gserviceaccount.com" \
+        --namespace monitoring
+    fi
   fi
 
   ## Install Prometheus
@@ -232,14 +300,14 @@ SA_EXISTS
   helm upgrade --install elasticsearch-exporter prometheus-community/prometheus-elasticsearch-exporter \
     --namespace monitoring \
     --values elasticsearch-exporter/values-es-exporter.yaml \
-    --version 4.11
+    --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.26.5 # latest v8 grafana
+    --version 6 # latest v8 grafana
 
   ## Clean up
   removeHelmRepo prometheus-community
@@ -321,7 +389,8 @@ function installPreemptibleKiller() {
   printf "\nCreating the gcloud $SVC_ACCT service account (SA)\n"
   gcloud iam service-accounts create $SVC_ACCT \
     --project $PROJECT_ID \
-    --display-name "Estafette Node Killer"
+    --description "Estafette Node Killer SA" \
+    --display-name "Estafette Node Killer SA"
   warnOnError $? "SA creation may have failed or it already exists"
 
   printf "\nCreate the $SVC_ACCT IAM role\n"
@@ -456,7 +525,7 @@ NEED_MANAGED_SECRET
   addHelmRepo jetstack https://charts.jetstack.io
   helm upgrade --install cert-manager jetstack/cert-manager \
     --namespace cert-manager --set installCRDs=true \
-    --version v1.7.0
+    --version v1.8
 
   cat<<DELAY
 
@@ -531,10 +600,12 @@ TRAEFIK_CFG
 
   addHelmRepo traefik https://helm.traefik.io/traefik
 
+  [ -z "$TRAEFIK_HELM_CHART" ] && TRAEFIK_HELM_CHART="10"
   helm upgrade --install traefik traefik/traefik \
     --namespace traefik \
-    --values $TRAEFIK_HA_YAML
-
+    --version  $TRAEFIK_HELM_CHART \
+    --values   $TRAEFIK_HA_YAML
+ 
   removeHelmRepo traefik
 }
 
@@ -644,6 +715,7 @@ function installVelero() {
   ## Helpful debugging link => https://github.com/vmware-tanzu/helm-charts/issues/351
   addHelmRepo vmware-tanzu https://vmware-tanzu.github.io/helm-charts
   helm upgrade --install velero vmware-tanzu/velero \
+    --version 2.29 \
     --namespace velero \
     --set credentials.useSecret="false" \
     --set configuration.provider="gcp" \
@@ -798,6 +870,7 @@ function doInstall() {
         checkSSDStorageClass
         addHelmRepo elastic https://helm.elastic.co
         helm upgrade --install elasticsearch elastic/elasticsearch \
+          --version 7 \
           --values $LOCAL_ES_VALUES \
           --set volumeClaimTemplate.storageClassName="ssd"
         removeHelmRepo elastic
@@ -828,14 +901,7 @@ function doInstall() {
         ;;
 
       "redis")
-        showInstalling "Redis Network Cache"
-        addBitnamiRepo
-        [ -z "$REDIS_HELM_CHART" ] && REDIS_HELM_CHART="13.0.1" # latest breaks us => "v14+"
-        helm upgrade --install redis bitnami/redis \
-          -f redis/redis-values.yaml \
-          --version $REDIS_HELM_CHART
-        printf "\n\nTo start a specific version => `color g 'REDIS_HELM_CHART="13.0.1" helmup redis'`\n\n"
-        removeHelmRepo bitnami
+        installRedis
         ;;
 
       "reloader")

package/src/overwhelm.js

@@ -286,6 +286,10 @@ glob.sync( '**/*.ovh' ).forEach( ( cfgmap ) => {
 
 // Set the GCP context for safety!
 const clusterName = over.CLUSTER_NAME
+if ( over.PROJECT_NAME === 'minikube' ) {
+  process.exit(0)
+}
+console.log( over, `XXXXX=>[${clusterName}]` )
 const projectId = over.PROJECT_ID
 let zone = over['GCE_REGION'] + ( over['GCE_ZONE'] ? `-${over['GCE_ZONE']}` : '' )