@leverege/build-tools 1.11.2 → 1.11.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/server/helmup +37 -6
  2. package/package.json +1 -1
  3. package/src/helmup +37 -6
package/lib/server/helmup CHANGED
@@ -81,7 +81,7 @@ KEELNEEDS
81
81
  }
82
82
 
83
83
  function createSSDYAML(){
84
- cat<<EOSSD > k8-utils/ssd-storageclass.yaml
84
+ cat<<EOSSD > ${K8S_UTILS}/ssd-storageclass.yaml
85
85
  apiVersion: storage.k8s.io/v1
86
86
  kind: StorageClass
87
87
  metadata:
@@ -96,10 +96,10 @@ function checkSSDStorageClass(){
96
96
  kubectl get storageclass ssd
97
97
  if [[ $? -eq 1 ]]; then
98
98
  printf "\n*** SSD Storage Class not defined ***\n\n"
99
- if [ ! -f k8-utils/ssd-storageclass.yaml ]; then
99
+ if [ ! -f ${K8S_UTILS}/ssd-storageclass.yaml ]; then
100
100
  createSSDYAML
101
101
  fi
102
- kubectl apply -f k8-utils/ssd-storageclass.yaml
102
+ kubectl apply -f ${K8S_UTILS}/ssd-storageclass.yaml
103
103
  fi
104
104
 
105
105
  printf "\n*** Attaching PVC to SSD Class ***\n\n"
@@ -191,7 +191,7 @@ function installKeel() {
191
191
 
192
192
  BRANCH=`git rev-parse --abbrev-ref HEAD`
193
193
  SLACK_BOT_NAME="`overwhelm -k SLACK_BOT_NAME`"
194
- [ -z "$SLACK_BOT_NAME" ] && SLACK_BOT_NAME=$BRANCH
194
+ [[ -z "$SLACK_BOT_NAME" || "$SLACK_BOT_NAME" == "undefined" ]] && SLACK_BOT_NAME=$BRANCH
195
195
  SLACK_TOKEN="$LEV_KEYS/$BRANCH/slack-bot-token"
196
196
  [ ! -f "$SLACK_TOKEN" ] &&
197
197
  keelNeeds "Missing slack bot token => `color c $SLACK_TOKEN`"
@@ -223,8 +223,39 @@ NOMUSEUM
223
223
  exit 1
224
224
  fi
225
225
 
226
- GITTOP=`git rev-parse --show-toplevel`
227
- cd $GITTOP
226
+ GITTOP=`git rev-parse --show-toplevel` && cd $GITTOP
227
+ if [ -d "${GITTOP}/k8-utils" ];
228
+ then
229
+ cat<<BADK8
230
+
231
+ $YELO_WARN The k8_utils directory should be renamed to k8s_utils
232
+
233
+ This repository has the old k8_util directory name in place. Please rename
234
+ it to the newer k8s_utils directory that `color c helmup` will be looking for.
235
+
236
+ Run this => `color g "git mv k8-utils k8s-utils; git add k8*utils"`
237
+
238
+ $YELO_WARN Don't forget to commit and push after the renaming.
239
+
240
+ BADK8
241
+ exit 1
242
+ fi
243
+
244
+ K8S_UTILS="${GITTOP}/k8s-utils"
245
+ if [ ! -d "$K8S_UTILS" ];
246
+ then
247
+ cat<<EOK8S
248
+
249
+ $RED_ERROR Missing the k8s utils dir => `color y $K8S_UTILS`
250
+
251
+ This is a relatively new directory setup that should be copied over from one
252
+ of the other configuration branches. The new-baseline branch should have this
253
+ setup in place, so check there.
254
+
255
+ EOK8S
256
+
257
+ exit 1
258
+ fi
228
259
 
229
260
  npm run ahoy
230
261
  [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@leverege/build-tools",
3
- "version": "1.11.2",
3
+ "version": "1.11.4",
4
4
  "description": "A package for development build tools.",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/helmup CHANGED
@@ -81,7 +81,7 @@ KEELNEEDS
81
81
  }
82
82
 
83
83
  function createSSDYAML(){
84
- cat<<EOSSD > k8-utils/ssd-storageclass.yaml
84
+ cat<<EOSSD > ${K8S_UTILS}/ssd-storageclass.yaml
85
85
  apiVersion: storage.k8s.io/v1
86
86
  kind: StorageClass
87
87
  metadata:
@@ -96,10 +96,10 @@ function checkSSDStorageClass(){
96
96
  kubectl get storageclass ssd
97
97
  if [[ $? -eq 1 ]]; then
98
98
  printf "\n*** SSD Storage Class not defined ***\n\n"
99
- if [ ! -f k8-utils/ssd-storageclass.yaml ]; then
99
+ if [ ! -f ${K8S_UTILS}/ssd-storageclass.yaml ]; then
100
100
  createSSDYAML
101
101
  fi
102
- kubectl apply -f k8-utils/ssd-storageclass.yaml
102
+ kubectl apply -f ${K8S_UTILS}/ssd-storageclass.yaml
103
103
  fi
104
104
 
105
105
  printf "\n*** Attaching PVC to SSD Class ***\n\n"
@@ -191,7 +191,7 @@ function installKeel() {
191
191
 
192
192
  BRANCH=`git rev-parse --abbrev-ref HEAD`
193
193
  SLACK_BOT_NAME="`overwhelm -k SLACK_BOT_NAME`"
194
- [ -z "$SLACK_BOT_NAME" ] && SLACK_BOT_NAME=$BRANCH
194
+ [[ -z "$SLACK_BOT_NAME" || "$SLACK_BOT_NAME" == "undefined" ]] && SLACK_BOT_NAME=$BRANCH
195
195
  SLACK_TOKEN="$LEV_KEYS/$BRANCH/slack-bot-token"
196
196
  [ ! -f "$SLACK_TOKEN" ] &&
197
197
  keelNeeds "Missing slack bot token => `color c $SLACK_TOKEN`"
@@ -223,8 +223,39 @@ NOMUSEUM
223
223
  exit 1
224
224
  fi
225
225
 
226
- GITTOP=`git rev-parse --show-toplevel`
227
- cd $GITTOP
226
+ GITTOP=`git rev-parse --show-toplevel` && cd $GITTOP
227
+ if [ -d "${GITTOP}/k8-utils" ];
228
+ then
229
+ cat<<BADK8
230
+
231
+ $YELO_WARN The k8_utils directory should be renamed to k8s_utils
232
+
233
+ This repository has the old k8_util directory name in place. Please rename
234
+ it to the newer k8s_utils directory that `color c helmup` will be looking for.
235
+
236
+ Run this => `color g "git mv k8-utils k8s-utils; git add k8*utils"`
237
+
238
+ $YELO_WARN Don't forget to commit and push after the renaming.
239
+
240
+ BADK8
241
+ exit 1
242
+ fi
243
+
244
+ K8S_UTILS="${GITTOP}/k8s-utils"
245
+ if [ ! -d "$K8S_UTILS" ];
246
+ then
247
+ cat<<EOK8S
248
+
249
+ $RED_ERROR Missing the k8s utils dir => `color y $K8S_UTILS`
250
+
251
+ This is a relatively new directory setup that should be copied over from one
252
+ of the other configuration branches. The new-baseline branch should have this
253
+ setup in place, so check there.
254
+
255
+ EOK8S
256
+
257
+ exit 1
258
+ fi
228
259
 
229
260
  npm run ahoy
230
261
  [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1