@leverege/build-tools 1.10.0 → 1.10.3

package/lib/server/helmdn

@@ -55,6 +55,7 @@ SYSTEM=(
   descheduler
   elastic
   monitoring
+  polaris
   redis
 )
 

package/lib/server/helmup

@@ -24,7 +24,6 @@ SYSTEM=(
   descheduler
   disks
   elastic
-  keel
   monitoring
   polaris
   redis
@@ -80,6 +79,31 @@ KEELNEEDS
   exit 1
 }
 
+function createSSDYAML(){
+  cat<<EOSSD > k8-utils/ssd-storageclass.yaml
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: ssd
+provisioner: kubernetes.io/gce-pd
+parameters:
+  type: pd-ssd
+EOSSD
+}
+
+function checkSSDStorageClass(){
+  kubectl get storageclass ssd
+  if [[ $? -eq 1 ]]; then
+    printf "\n*** SSD Storage Class not defined ***\n\n"
+    if [ ! -f k8-utils/ssd-storageclass.yaml ]; then
+      createSSDYAML
+    fi
+    kubectl apply -f k8-utils/ssd-storageclass.yaml
+  fi
+
+  printf "\n*** Attaching PVC to SSD Class ***\n\n"
+}
+
 function installKeel() {
   [ ! -d "$LEV_KEYS" ] &&
     keelNeeds "`color c \\$LEV_KEYS` must point to the keys directory for the clusters."
@@ -90,6 +114,8 @@ function installKeel() {
     keelNeeds "Missing service account info => `color c $SVC_ACCT`"
 
   BRANCH=`git rev-parse --abbrev-ref HEAD`
+  SLACK_BOT_NAME="`overwhelm -k SLACK_BOT_NAME`"
+  [ -z "$SLACK_BOT_NAME" ] && SLACK_BOT_NAME=$BRANCH
   SLACK_TOKEN="$LEV_KEYS/$BRANCH/slack-bot-token"
   [ ! -f "$SLACK_TOKEN" ] &&
     keelNeeds "Missing slack bot token => `color c $SLACK_TOKEN`"
@@ -102,7 +128,7 @@ function installKeel() {
     --set slack.enabled="true" \
     --set slack.channel="devs-cicd" \
     --set slack.approvalsChannel="cd-approvals" \
-    --set slack.botName="$BRANCH" \
+    --set slack.botName="$SLACK_BOT_NAME" \
     --set slack.token="$(cat $SLACK_TOKEN)" \
     --set googleApplicationCredentials="$(cat $SVC_ACCT | base64 -w 0)"
 }
@@ -138,6 +164,7 @@ function doInstall() {
     case "$SERVICE" in
       "platform")
         doInstall "${PLATFORM[@]}"
+        printf "\nkeel may be installed by running => helmup keel\n\n"
         ;;
 
       "system")
@@ -146,16 +173,18 @@ function doInstall() {
 
       "descheduler")
         helm repo add akomljen-charts     https://raw.githubusercontent.com/komljen/helm-charts/master/charts/
-        helm upgrade --install descheduler akomljen-charts/descheduler --set schedule="*/13 * * * *"
+        helm upgrade --install descheduler akomljen-charts/descheduler --set schedule="*/15 * * * *",deschedulerPolicy.strategies.RemovePodsViolatingNodeAffinity.params.nodeAffinityType={preferredDuringSchedulingIgnoredDuringExecution}
         ;;
 
       "disks")
+        checkSSDStorageClass
         helm upgrade --install disks ./disks
         ;;
 
       "elastic"|"elasticsearch")
+        checkSSDStorageClass
         helm repo add elastic https://helm.elastic.co
-        helm upgrade --install elasticsearch elastic/elasticsearch --version 7.2.0
+        helm upgrade --install elasticsearch elastic/elasticsearch --set volumeClaimTemplate.storageClassName="ssd"
         ;;
 
       "keel")
@@ -169,7 +198,7 @@ function doInstall() {
       "polaris")
         helm repo add reactiveops-stable https://charts.reactiveops.com/stable
         helm upgrade --install polaris reactiveops-stable/polaris --namespace polaris
-        printf "\n***Proxy 8080 with this=> kubectl port-forward --namespace polaris svc/polaris-dashboard 8080:80\n\n"
+        printf "\n***Proxy 8081 with this=> kubectl port-forward --namespace polaris svc/polaris-dashboard 8081:80\n\n"
         ;;
 
       "redis")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "1.10.0",
+  "version": "1.10.3",
   "description": "A package for development build tools.",
   "main": "index.js",
   "scripts": {

package/src/helmdn

@@ -55,6 +55,7 @@ SYSTEM=(
   descheduler
   elastic
   monitoring
+  polaris
   redis
 )
 

package/src/helmup

@@ -24,7 +24,6 @@ SYSTEM=(
   descheduler
   disks
   elastic
-  keel
   monitoring
   polaris
   redis
@@ -80,6 +79,31 @@ KEELNEEDS
   exit 1
 }
 
+function createSSDYAML(){
+  cat<<EOSSD > k8-utils/ssd-storageclass.yaml
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: ssd
+provisioner: kubernetes.io/gce-pd
+parameters:
+  type: pd-ssd
+EOSSD
+}
+
+function checkSSDStorageClass(){
+  kubectl get storageclass ssd
+  if [[ $? -eq 1 ]]; then
+    printf "\n*** SSD Storage Class not defined ***\n\n"
+    if [ ! -f k8-utils/ssd-storageclass.yaml ]; then
+      createSSDYAML
+    fi
+    kubectl apply -f k8-utils/ssd-storageclass.yaml
+  fi
+
+  printf "\n*** Attaching PVC to SSD Class ***\n\n"
+}
+
 function installKeel() {
   [ ! -d "$LEV_KEYS" ] &&
     keelNeeds "`color c \\$LEV_KEYS` must point to the keys directory for the clusters."
@@ -90,6 +114,8 @@ function installKeel() {
     keelNeeds "Missing service account info => `color c $SVC_ACCT`"
 
   BRANCH=`git rev-parse --abbrev-ref HEAD`
+  SLACK_BOT_NAME="`overwhelm -k SLACK_BOT_NAME`"
+  [ -z "$SLACK_BOT_NAME" ] && SLACK_BOT_NAME=$BRANCH
   SLACK_TOKEN="$LEV_KEYS/$BRANCH/slack-bot-token"
   [ ! -f "$SLACK_TOKEN" ] &&
     keelNeeds "Missing slack bot token => `color c $SLACK_TOKEN`"
@@ -102,7 +128,7 @@ function installKeel() {
     --set slack.enabled="true" \
     --set slack.channel="devs-cicd" \
     --set slack.approvalsChannel="cd-approvals" \
-    --set slack.botName="$BRANCH" \
+    --set slack.botName="$SLACK_BOT_NAME" \
     --set slack.token="$(cat $SLACK_TOKEN)" \
     --set googleApplicationCredentials="$(cat $SVC_ACCT | base64 -w 0)"
 }
@@ -138,6 +164,7 @@ function doInstall() {
     case "$SERVICE" in
       "platform")
         doInstall "${PLATFORM[@]}"
+        printf "\nkeel may be installed by running => helmup keel\n\n"
         ;;
 
       "system")
@@ -146,16 +173,18 @@ function doInstall() {
 
       "descheduler")
         helm repo add akomljen-charts     https://raw.githubusercontent.com/komljen/helm-charts/master/charts/
-        helm upgrade --install descheduler akomljen-charts/descheduler --set schedule="*/13 * * * *"
+        helm upgrade --install descheduler akomljen-charts/descheduler --set schedule="*/15 * * * *",deschedulerPolicy.strategies.RemovePodsViolatingNodeAffinity.params.nodeAffinityType={preferredDuringSchedulingIgnoredDuringExecution}
         ;;
 
       "disks")
+        checkSSDStorageClass
         helm upgrade --install disks ./disks
         ;;
 
       "elastic"|"elasticsearch")
+        checkSSDStorageClass
         helm repo add elastic https://helm.elastic.co
-        helm upgrade --install elasticsearch elastic/elasticsearch --version 7.2.0
+        helm upgrade --install elasticsearch elastic/elasticsearch --set volumeClaimTemplate.storageClassName="ssd"
         ;;
 
       "keel")
@@ -169,7 +198,7 @@ function doInstall() {
       "polaris")
         helm repo add reactiveops-stable https://charts.reactiveops.com/stable
         helm upgrade --install polaris reactiveops-stable/polaris --namespace polaris
-        printf "\n***Proxy 8080 with this=> kubectl port-forward --namespace polaris svc/polaris-dashboard 8080:80\n\n"
+        printf "\n***Proxy 8081 with this=> kubectl port-forward --namespace polaris svc/polaris-dashboard 8081:80\n\n"
         ;;
 
       "redis")