@leverege/build-tools 2.5.22 → 2.5.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.5.22",
+  "version": "2.5.23",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -65,7 +65,7 @@
     "ncp": "^2.0.0",
     "npm-check-updates": "^11.1.1",
     "npm-registry-fetch": "^9.0.0",
-    "open": "^7.3.1",
+    "open": "^7.4.0",
     "ora": "^5.3.0",
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
@@ -78,6 +78,6 @@
     "@babel/node": "^7.12.10",
     "@leverege/babel-preset-leverege-node": "^1.1.1",
     "@leverege/eslint-config-leverege": "^2.2.0",
-    "npm": "^6.14.11"
+    "npm": "^7.5.2"
   }
 }

package/src/bash-funcs

@@ -17,6 +17,9 @@ function color() {
   esac
   printf "\e[$color$2\e[0m"
 }
+RED_ERROR=`color r '***ERROR:'`
+YELO_WARN="`color y '***WARNING:'`"
+GREEN_INFO=`color g '***INFO:'`
 
 function clearlyWarn() {
   [ -z "$1" ] && clear
@@ -27,6 +30,10 @@ function clearlyWarn() {
 CLEARWARN
 }
 
+function warnOnError() {
+  [ $1 -ne 0 ] && printf "\n$YELO_WARN $2\n"
+}
+
 function errorExit() {
   cat <<ERREXIT
 
@@ -36,6 +43,10 @@ ERREXIT
   exit 1
 }
 
+function exitOnError() {
+  [ $1 -ne 0 ] && errorExit $2
+}
+
 function yesOrSkipToContinue() {
   printf "\n Enter \"`color g yes`\" ${1}, \"`color y skip`\" to skip this step, or anything else to exit.\n\n"
   read ANS

package/src/helmdn

@@ -68,12 +68,34 @@ npm run ahoy
 
 helm repo update # old helm2 => helm search chartmuseum
 
+function annihilateMonitoring() {
+  # Detect Project ID
+  currContext=`kubectl config current-context`
+
+  IFS='_'
+  read -ra ADDR <<< "$currContext"
+
+  GCP_PROJECT_ID=${ADDR[1]} # project id is the second string split by _
+
+  kubectl delete sa -n monitoring stackdriver-exporter
+  gcloud iam service-accounts delete stackdriver-exporter@${GCP_PROJECT_ID}.iam.gserviceaccount.com --quiet
+
+  helm repo remove prometheus-community kube-state-metrics && helm repo update
+  helm uninstall -n monitoring grafana prometheus stackdriver-exporter elasticsearch-exporter
+  helm ls -n monitoring
+}
+
 function doNuking() {
 
   for PARAM in "$@";
   do
     SERVICE=${PARAM%/} # strip trailing / if it's there
 
+    if [ "$SERVICE" == "monitoring" ];
+    then
+      annihilateMonitoring && exit $?
+    fi
+
     if [ "$SERVICE" == "platform" ];
     then
       doNuking "${PLATFORM[@]}" && exit $?

package/src/helmup

@@ -4,6 +4,10 @@
 # for adding / updating deployments on a fluster.
 #
 # printf "\n***** RUNNING LOCALLY *****\n" && sleep 2
+
+# Load the standard helper functions
+. `build-tools --bashfun`
+
 PLATFORM=(
   authz-server
   api-server
@@ -29,28 +33,6 @@ SYSTEM=(
   monitoring
 )
 
-# Simple ANSI color coded string generator.
-function color() {
-  local color=
-  case "$1" in
-    'g') color="92m" ;; # green
-    'c') color="96m" ;; # lt blue
-    'y') color="93m" ;; # yellow
-    'r') color="91m" ;; # red
-    'toast') color="1;3;7;91;103;5m" ;;
-  esac
-  printf "\e[$color$2\e[0m"
-}
-RED_ERROR=`color r '***ERROR:'`
-YELO_WARN="`color y '***WARNING:'`"
-GREEN_INFO=`color g '***INFO:'`
-
-function setOrUnset() {
-  local setting=`color toast "NEEDS TO BE SET"`
-  [ ! -z "$1" ] && setting=`color g $1`
-  echo "$setting"
-}
-
 function checkTimescalePassword(){
   if [ -f values-databases.yaml ] || [ -d timescale-db ];
   then
@@ -80,66 +62,18 @@ function generatePassword(){
   echo $RANDOMPW
 }
 
-function checkMonitoringNS(){
-  kubectl get namespace monitoring
+function installMonitoringCharts(){
+  # Check the namespace exists in kubernetes
+  kubectl get namespace monitoring &> /dev/null
   if [[ $? -eq 1 ]]; then
     printf "\n*** Creating monitoring namespace ***\n\n"
     kubectl create namespace monitoring
   fi
-}
-
-function upgradeMonitoringCharts(){
-  if [[ `git status --porcelain` ]];
-  then
-    cat<<DIRTYGIT
-
-$RED_ERROR This git repo must be clean before we can do the monitoring
-          upgrade so either commit or stash and rerun.
-
-`git status`
-
-DIRTYGIT
-    exit 1
-  fi
-
-  if [ -f values-monitoring.yaml ] || [ -d monitoring ];
-  then
-    rm -rf values-monitoring.yaml monitoring
-    git add -A
-  fi
 
-  # blow away the existing deployment
-  helm uninstall monitoring
-
-  NEWBASELINE=${BASELINE_ROOT:-new-baseline}
-
-  # Make certain the baseline branch is up to date
-  git fetch origin ${NEWBASELINE}:${NEWBASELINE}
-
-  NEWMON="elasticsearch-exporter grafana prometheus stackdriver-exporter"
-  for SOURCE in $NEWMON;
-  do
-    printf "Grabbing $SOURCE from ${NEWBASELINE}\n"
-    git checkout --quiet ${NEWBASELINE} $SOURCE
-  done
-
-  cat<<RERUN
-  
-`git status`
-
-$GREEN_INFO Make certain the staged mods to this git repo are committed and
-         pushed so things don't get twisted up and sad.
-
-$GREEN_INFO Preparing to rerun overwhelm before continuing with the upgrade.
-
-         Hit return to coninue...
-RERUN
-
-  read ANS && overwhelm
-}
-
-function installMonitoringCharts(){
-  upgradeMonitoringCharts
+  # Add necessary helm repositories - note that stable is deprecated
+  printf "\nAdding and updating helm repositories...\n"
+  helm repo add stable https://charts.helm.sh/stable &> /dev/null
+  helm repo update
 
   ## Set the project id by parsing current context
   currContext=`kubectl config current-context`
@@ -147,49 +81,64 @@ function installMonitoringCharts(){
   IFS='_'
   read -ra ADDR <<< "$currContext" 
 
-  [[ ${ADDR[0]} == "gke" ]] && IS_GKE=true || IS_GKE=false
+  KUBERNETES_ENV=${ADDR[0]} # should be either gke or eks
 
   ## Installing stackdriver exporter in GKE
-  if [[ "$IS_GKE" = true ]]; then
-    # Check SA creation
-    kubectl get sa -n monitoring stackdriver-exporter
-    if [[ $? -eq 1 ]]; then
-      # Create Kubernetes SA
-      printf "\n*** Creating stackdriver-exporter SA ***\n\n"
-      kubectl create sa -n monitoring stackdriver-exporter
-
-      # Detect Project ID
-      currContext=`kubectl config current-context`
-       
-      IFS='_'
-      read -ra ADDR <<< "$currContext" 
-
-      GCP_PROJECT_ID=${ADDR[1]} # project id is the second string split by _
-
-      # Create GCP SA and bind policies
-      printf "\n*** Creating GCP SA with monitoring/viewer ***\n\n"
-      gcloud iam service-accounts create stackdriver-exporter --project "$GCP_PROJECT_ID"
-
-      gcloud projects add-iam-policy-binding "$GCP_PROJECT_ID" \
-        --member "serviceAccount:stackdriver-exporter@$GCP_PROJECT_ID.iam.gserviceaccount.com" \
-        --role "roles/monitoring.viewer"
-
-      gcloud iam service-accounts add-iam-policy-binding \
-        --role roles/iam.workloadIdentityUser \
-        --member "serviceAccount:$GCP_PROJECT_ID.svc.id.goog[monitoring/stackdriver-exporter]" \
-        "stackdriver-exporter@$GCP_PROJECT_ID.iam.gserviceaccount.com"
-
-      # Annotate Kubernetes SA
-      kubectl annotate serviceaccount stackdriver-exporter \
-        "iam.gke.io/gcp-service-account=stackdriver-exporter@$GCP_PROJECT_ID.iam.gserviceaccount.com" \
-        --namespace monitoring
+  if [[ "$KUBERNETES_ENV" = "gke" ]];
+  then
+    kubectl get sa -n monitoring stackdriver-exporter &> /dev/null
+    if [[ $? -eq 0 ]];
+    then
+      cat<<SA_EXISTS
+
+  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.
+
+SA_EXISTS
+      kubectl get sa -n monitoring stackdriver-exporter
+      exitOnError 1 "Must remove the SA in order to proceed - `color r DANGER`"
     fi
 
+    GCP_PROJECT_ID=${ADDR[1]} # project id is the second string split by _
+    SDEXP_SA='stackdriver-exporter'
     helm upgrade --install stackdriver-exporter \
       stable/stackdriver-exporter \
       --namespace monitoring \
-      -f stackdriver-exporter/values.yaml \
+      --values stackdriver-exporter/values.yaml \
       --version 1.3.0
+
+    # Verify the Kubernetes SA
+    kubectl get sa -n monitoring $SDEXP_SA
+    exitOnError $? "The $SDEXP_SA SA seems to be missing"
+
+    # 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
+    # order to provide the proper IAM permissions to the exporter.
+
+    # 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"
+    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"
+    gcloud projects add-iam-policy-binding "$GCP_PROJECT_ID" \
+      --role "roles/monitoring.viewer" \
+      --member "serviceAccount:$SDEXP_SA@$GCP_PROJECT_ID.iam.gserviceaccount.com"
+
+    printf "\n*** Binding IAM role of workloadIdentityUser to stackdriver-exporter\n"
+    gcloud iam service-accounts add-iam-policy-binding \
+      --project "$GCP_PROJECT_ID" \
+      --role "roles/iam.workloadIdentityUser" \
+      --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
   fi
 
   ## Install Prometheus
@@ -458,7 +407,6 @@ function doInstall() {
         ;;
 
       "monitoring")
-        checkMonitoringNS
         installMonitoringCharts
         monitoringHelp
         ;;