@leverege/build-tools 1.11.1 → 1.11.3

package/lib/server/helmdn

@@ -52,7 +52,6 @@ PLATFORM=(
 )
 
 SYSTEM=(
-  descheduler
   elastic
   monitoring
   polaris

package/lib/server/helmup

@@ -23,7 +23,6 @@ PLATFORM=(
 
 SYSTEM=(
   coredns
-  descheduler
   disks
   elastic
   monitoring
@@ -82,7 +81,7 @@ KEELNEEDS
 }
 
 function createSSDYAML(){
-  cat<<EOSSD > k8-utils/ssd-storageclass.yaml
+  cat<<EOSSD > ${K8S_UTILS}/ssd-storageclass.yaml
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
@@ -97,10 +96,10 @@ 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
+    if [ ! -f ${K8S_UTILS}/ssd-storageclass.yaml ]; then
       createSSDYAML
     fi
-    kubectl apply -f k8-utils/ssd-storageclass.yaml
+    kubectl apply -f ${K8S_UTILS}/ssd-storageclass.yaml
   fi
 
   printf "\n*** Attaching PVC to SSD Class ***\n\n"
@@ -224,8 +223,22 @@ NOMUSEUM
   exit 1
 fi
 
-GITTOP=`git rev-parse --show-toplevel`
-cd $GITTOP
+GITTOP=`git rev-parse --show-toplevel` && cd $GITTOP
+K8S_UTILS="${GITTOP}/k8s-utils"
+if [ ! -d "$K8S_UTILS" ];
+then
+  cat<<EOK8S
+
+$RED_ERROR Missing the k8s utils dir => `color y $K8S_UTILS`
+
+  This is a relatively new directory setup that should be copied over from one
+  of the other configuration branches. The new-baseline branch should have this
+  setup in place, so check there.
+
+EOK8S
+
+  exit 1
+fi
 
 npm run ahoy
 [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1

package/package.json

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

package/src/helmdn

@@ -52,7 +52,6 @@ PLATFORM=(
 )
 
 SYSTEM=(
-  descheduler
   elastic
   monitoring
   polaris

package/src/helmup

@@ -23,7 +23,6 @@ PLATFORM=(
 
 SYSTEM=(
   coredns
-  descheduler
   disks
   elastic
   monitoring
@@ -82,7 +81,7 @@ KEELNEEDS
 }
 
 function createSSDYAML(){
-  cat<<EOSSD > k8-utils/ssd-storageclass.yaml
+  cat<<EOSSD > ${K8S_UTILS}/ssd-storageclass.yaml
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
@@ -97,10 +96,10 @@ 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
+    if [ ! -f ${K8S_UTILS}/ssd-storageclass.yaml ]; then
       createSSDYAML
     fi
-    kubectl apply -f k8-utils/ssd-storageclass.yaml
+    kubectl apply -f ${K8S_UTILS}/ssd-storageclass.yaml
   fi
 
   printf "\n*** Attaching PVC to SSD Class ***\n\n"
@@ -224,8 +223,22 @@ NOMUSEUM
   exit 1
 fi
 
-GITTOP=`git rev-parse --show-toplevel`
-cd $GITTOP
+GITTOP=`git rev-parse --show-toplevel` && cd $GITTOP
+K8S_UTILS="${GITTOP}/k8s-utils"
+if [ ! -d "$K8S_UTILS" ];
+then
+  cat<<EOK8S
+
+$RED_ERROR Missing the k8s utils dir => `color y $K8S_UTILS`
+
+  This is a relatively new directory setup that should be copied over from one
+  of the other configuration branches. The new-baseline branch should have this
+  setup in place, so check there.
+
+EOK8S
+
+  exit 1
+fi
 
 npm run ahoy
 [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1