@leverege/build-tools 2.26.3 → 2.26.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.
- package/package.json +1 -1
- package/src/helmup +22 -3
package/package.json
CHANGED
package/src/helmup
CHANGED
|
@@ -79,7 +79,7 @@ WORKLOAD_ID
|
|
|
79
79
|
|
|
80
80
|
# Verify the Kubernetes SA and create it if necessary
|
|
81
81
|
printf "\nChecking for the $NAMESPACE/$SVC_ACCT k8s SA\n"
|
|
82
|
-
kubectl get sa -n $NAMESPACE $SVC_ACCT
|
|
82
|
+
kubectl get sa -n $NAMESPACE $SVC_ACCT &>/dev/null
|
|
83
83
|
if [[ $? -eq 1 ]];
|
|
84
84
|
then
|
|
85
85
|
printf "Creating the k8s $SVC_ACCT SA in $NAMESPACE\n"
|
|
@@ -119,7 +119,26 @@ function bootstrapLocalSetup() {
|
|
|
119
119
|
SYSTEM_HUP="$SYSTEM_FILES/$SERVICE.hup"
|
|
120
120
|
[ ! -f "$SYSTEM_HUP" ] && errorExit "Missing $SERVICE helmup script => $(color y $SYSTEM_HUP)"
|
|
121
121
|
|
|
122
|
-
[ ! -d "$SERVICE" ]
|
|
122
|
+
if [ ! -d "$SERVICE" ];
|
|
123
|
+
then
|
|
124
|
+
mkdir $SERVICE
|
|
125
|
+
else
|
|
126
|
+
# If the service dir already exists but the helmup.plugin file is missing
|
|
127
|
+
# then this is most likely a legacy setup - for example, an older setup for
|
|
128
|
+
# elasticsearch that only had an es-values.yaml file. Note that we cannot
|
|
129
|
+
# get to this logic if the helmup.plugin file exists so no need to check
|
|
130
|
+
# for it again - just error.
|
|
131
|
+
cat<<MISSING_HELMUP_PLUGIN
|
|
132
|
+
|
|
133
|
+
$RED_ERROR Legacy setup detected for service `color y "$SERVICE"`
|
|
134
|
+
|
|
135
|
+
This looks like a legacy setup of the $SERVICE service. In order to
|
|
136
|
+
proceed, the existing $SERVICE subdirectory should be moved out of
|
|
137
|
+
way before attempting to rerun helmup for this service.
|
|
138
|
+
|
|
139
|
+
MISSING_HELMUP_PLUGIN
|
|
140
|
+
errorExit "Installaion of `color y $SERVICE` failed - exiting"
|
|
141
|
+
fi
|
|
123
142
|
|
|
124
143
|
if [ "$2" == "set-values-local" ];
|
|
125
144
|
then
|
|
@@ -199,7 +218,7 @@ function installMonitoringEnvironment() {
|
|
|
199
218
|
## Installing ES exporter
|
|
200
219
|
helm upgrade --install elasticsearch-exporter prometheus-community/prometheus-elasticsearch-exporter \
|
|
201
220
|
--namespace monitoring \
|
|
202
|
-
--version
|
|
221
|
+
--version 5 \
|
|
203
222
|
-f - <<ELASTIC_EXPORTER_CHART_MOD
|
|
204
223
|
service:
|
|
205
224
|
annotations:
|