@leverege/build-tools 1.11.2 → 1.11.3
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.
- package/lib/server/helmup +19 -5
- package/package.json +1 -1
- package/src/helmup +19 -5
package/lib/server/helmup
CHANGED
|
@@ -81,7 +81,7 @@ KEELNEEDS
|
|
|
81
81
|
}
|
|
82
82
|
|
|
83
83
|
function createSSDYAML(){
|
|
84
|
-
cat<<EOSSD >
|
|
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
|
|
99
|
+
if [ ! -f ${K8S_UTILS}/ssd-storageclass.yaml ]; then
|
|
100
100
|
createSSDYAML
|
|
101
101
|
fi
|
|
102
|
-
kubectl apply -f
|
|
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"
|
|
@@ -223,8 +223,22 @@ NOMUSEUM
|
|
|
223
223
|
exit 1
|
|
224
224
|
fi
|
|
225
225
|
|
|
226
|
-
GITTOP=`git rev-parse --show-toplevel`
|
|
227
|
-
|
|
226
|
+
GITTOP=`git rev-parse --show-toplevel` && cd $GITTOP
|
|
227
|
+
K8S_UTILS="${GITTOP}/k8s-utils"
|
|
228
|
+
if [ ! -d "$K8S_UTILS" ];
|
|
229
|
+
then
|
|
230
|
+
cat<<EOK8S
|
|
231
|
+
|
|
232
|
+
$RED_ERROR Missing the k8s utils dir => `color y $K8S_UTILS`
|
|
233
|
+
|
|
234
|
+
This is a relatively new directory setup that should be copied over from one
|
|
235
|
+
of the other configuration branches. The new-baseline branch should have this
|
|
236
|
+
setup in place, so check there.
|
|
237
|
+
|
|
238
|
+
EOK8S
|
|
239
|
+
|
|
240
|
+
exit 1
|
|
241
|
+
fi
|
|
228
242
|
|
|
229
243
|
npm run ahoy
|
|
230
244
|
[ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1
|
package/package.json
CHANGED
package/src/helmup
CHANGED
|
@@ -81,7 +81,7 @@ KEELNEEDS
|
|
|
81
81
|
}
|
|
82
82
|
|
|
83
83
|
function createSSDYAML(){
|
|
84
|
-
cat<<EOSSD >
|
|
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
|
|
99
|
+
if [ ! -f ${K8S_UTILS}/ssd-storageclass.yaml ]; then
|
|
100
100
|
createSSDYAML
|
|
101
101
|
fi
|
|
102
|
-
kubectl apply -f
|
|
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"
|
|
@@ -223,8 +223,22 @@ NOMUSEUM
|
|
|
223
223
|
exit 1
|
|
224
224
|
fi
|
|
225
225
|
|
|
226
|
-
GITTOP=`git rev-parse --show-toplevel`
|
|
227
|
-
|
|
226
|
+
GITTOP=`git rev-parse --show-toplevel` && cd $GITTOP
|
|
227
|
+
K8S_UTILS="${GITTOP}/k8s-utils"
|
|
228
|
+
if [ ! -d "$K8S_UTILS" ];
|
|
229
|
+
then
|
|
230
|
+
cat<<EOK8S
|
|
231
|
+
|
|
232
|
+
$RED_ERROR Missing the k8s utils dir => `color y $K8S_UTILS`
|
|
233
|
+
|
|
234
|
+
This is a relatively new directory setup that should be copied over from one
|
|
235
|
+
of the other configuration branches. The new-baseline branch should have this
|
|
236
|
+
setup in place, so check there.
|
|
237
|
+
|
|
238
|
+
EOK8S
|
|
239
|
+
|
|
240
|
+
exit 1
|
|
241
|
+
fi
|
|
228
242
|
|
|
229
243
|
npm run ahoy
|
|
230
244
|
[ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1
|