@leverege/build-tools 2.26.3 → 2.26.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.26.3",
+  "version": "2.26.5",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/helmup

@@ -79,7 +79,7 @@ WORKLOAD_ID
  
   # Verify the Kubernetes SA and create it if necessary
   printf "\nChecking for the $NAMESPACE/$SVC_ACCT k8s SA\n"
-  kubectl get sa -n $NAMESPACE $SVC_ACCT
+  kubectl get sa -n $NAMESPACE $SVC_ACCT &>/dev/null
   if [[ $? -eq 1 ]];
   then
     printf "Creating the k8s $SVC_ACCT SA in $NAMESPACE\n"
@@ -111,6 +111,8 @@ 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"
 
@@ -119,7 +121,26 @@ function bootstrapLocalSetup() {
   SYSTEM_HUP="$SYSTEM_FILES/$SERVICE.hup"
   [ ! -f "$SYSTEM_HUP" ] && errorExit "Missing $SERVICE helmup script => $(color y $SYSTEM_HUP)"
 
-  [ ! -d "$SERVICE" ] && mkdir $SERVICE
+  if [ ! -d "$SERVICE" ];
+  then
+    mkdir $SERVICE
+  else
+    # If the service dir already exists but the helmup.plugin file is missing
+    # then this is most likely a legacy setup - for example, an older setup for
+    # elasticsearch that only had an es-values.yaml file. Note that we cannot
+    # get to this logic if the helmup.plugin file exists so no need to check
+    # for it again - just error.
+    cat<<MISSING_HELMUP_PLUGIN
+
+  $RED_ERROR Legacy setup detected for service `color y "$SERVICE"`
+
+  This looks like a legacy setup of the $SERVICE service. In order to
+  proceed, the existing $SERVICE subdirectory should be moved out of
+  way before attempting to rerun helmup for this service.
+
+MISSING_HELMUP_PLUGIN
+    errorExit "Installaion of `color y $SERVICE` failed - exiting"
+  fi
 
   if [ "$2" == "set-values-local" ];
   then
@@ -199,7 +220,7 @@ function installMonitoringEnvironment() {
   ## Installing ES exporter
   helm upgrade --install elasticsearch-exporter prometheus-community/prometheus-elasticsearch-exporter \
     --namespace monitoring \
-    --version 4.13 \
+    --version 5 \
     -f - <<ELASTIC_EXPORTER_CHART_MOD
 service:
   annotations:

package/src/system-charts/elastic-cluster.hup

@@ -0,0 +1,23 @@
+#!/bin/bash
+#
+# Do not move to 7.17+ until the memory explosion problem is resolved
+#
+ES_VERSION="7.16"
+
+showInstalling "Elastic Search Cluster v${ES_VERSION}"
+
+addHelmRepo elastic https://helm.elastic.co
+
+deployES() {
+  ES_TYPE="elasticsearch-${1}"
+  printf "\n   Deploying ES cluster component: `color y "$ES_TYPE"`\n"
+  helm upgrade --install $ES_TYPE elastic/elasticsearch \
+    --version $ES_VERSION \
+    --values  elastic-cluster/$ES_TYPE.yaml
+}
+
+deployES "master"
+deployES "client"
+deployES "data"
+
+removeHelmRepo elastic

package/src/system-charts/elasticsearch-local.yaml

@@ -1,3 +1,15 @@
+# Foundation Chart: https://artifacthub.io/packages/helm/elastic/elasticsearch
+#
+# esJavaOpts: "" # example: "-Xmx1g -Xms1g"
+# 
+# resources:
+#   requests:
+#     cpu: "1000m"
+#     memory: "2Gi"
+#   limits:
+#     cpu: "1000m"
+#     memory: "2Gi"
+
 tolerations:
 - key: "database"
   operator: "Equal"
@@ -12,3 +24,15 @@ nodeAffinity:
         operator: In
         values:
         - database
+
+# RecovR Prd Settings - very beefy on an n2-standard-8
+#
+# esJavaOpts: "-Xmx8g -Xms8g"
+# 
+# resources:
+#   requests:
+#     cpu: "6250m"
+#     memory: "16Gi"
+#   limits:
+#     cpu: "6750m"
+#     memory: "20Gi"

package/src/system-charts/grafana-local.yaml.ovh

@@ -0,0 +1,54 @@
+service:
+  type: "NodePort"
+  port: "9000"
+
+datasources:
+  datasources.yaml:
+    apiVersion: 1
+    datasources:
+    - name: kubernetes
+      type: prometheus
+      url: http://prometheus-server.monitoring.svc.cluster.local
+      isDefault: true
+
+persistence:
+  enabled: true
+  storageClassName: ssd
+
+plugins:
+  - grafana-piechart-panel
+  - agenty-flowcharting-panel
+
+deploymentStrategy:
+  type: Recreate
+
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: target-env
+          operator: In
+          values:
+          - database
+tolerations:
+- key: "database"
+  operator: "Equal"
+  value: "true"
+  effect: "NoSchedule"
+
+extraObjects:
+  - apiVersion: traefik.containo.us/v1alpha1
+    kind: IngressRoute
+    metadata:
+      name: grafana
+      namespace: monitoring
+    spec:
+      entryPoints:
+        - websecure
+      routes:
+      - match: Host(`OVH:<PROJECT_ID>-monitoring.OVH:<HOST>.com`)
+        kind: Rule
+        services:
+        - name: grafana
+          port: 9000

package/src/system-charts/prometheus-local.yaml

@@ -202,7 +202,7 @@ serverFiles:
               severity: error
             annotations:
               summary: "Kubernetes Pod not healthy"
-              description: "Pod {{ $labels.pod }} has been in a non-ready state for longer than a 10m."
+              description: "Pod {{ $labels.pod }} has been in a non-ready state for longer than 10 minutes."
               dashboard: "Check the pod status using the Kubernetes UI"
 
           - alert: KubernetesPodCrashLooping

package/src/system-charts/velero.hup

@@ -36,7 +36,7 @@ cat<<DONE_VELERO
 
   Velero docs => `color g 'open https://velero.io/docs'`
 
-  Wait at least 1 minute before kicking off the following backups:
+  `color y 'Wait at least 1 minute before kicking off the following backups:'`
 
   `color g 'velero backup create --from-schedule velero-full'`
   `color g 'velero backup create --from-schedule velero-psql'`

package/src/system-charts/grafana-local.yaml

@@ -1,29 +0,0 @@
-service:
-  type: "NodePort"
-  port: "9000"
-
-persistence:
-  enabled: true
-  storageClassName: ssd
-
-plugins:
-  - grafana-piechart-panel
-  - agenty-flowcharting-panel
-
-deploymentStrategy:
-  type: Recreate
-
-affinity:
-  nodeAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: target-env
-          operator: In
-          values:
-          - database
-tolerations:
-- key: "database"
-  operator: "Equal"
-  value: "true"
-  effect: "NoSchedule"