@@ -45,7 +45,6 @@ onInstall:
4545 - setGlobals:
4646 ingress-dir: traefik
4747 - install-traefik
48- - configure-remote-api
4948 - install-components
5049 - install-helm-master
5150 - if ('${globals.k8sm-slave-ids}'):
@@ -186,9 +185,6 @@ actions:
186185 - setGlobals:
187186 worker_join_cmd: ${response.out}
188187 - prepare-worker-integration
189- - if (${settings.api:true}):
190- - setGlobals:
191- default_api: or [Remote API Endpoint](${env.protocol}://${env.domain}/api/)
192188
193189 init-slave-masters:
194190 - script: |
@@ -254,13 +250,6 @@ actions:
254250 kubectl apply -f ${baseUrl}/addons/traefik/traefik-ds.yaml
255251 kubectl apply -f ${baseUrl}/addons/traefik/traefik-ui.yaml
256252
257- configure-remote-api:
258- - if (${settings.api:true}):
259- - cmd[${nodes.k8sm.master.id}]: |-
260- kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/api-ingress.yaml
261- - setGlobals:
262- default_api: or [Remote API Endpoint](${env.protocol}://${env.domain}/api/)
263-
264253 install-components:
265254 - cmd[${nodes.k8sm.master.id}]: /usr/local/sbin/install-components.sh --base-url=$(echo '${baseUrl}' | base64 -w 0) --admin-account=true --metallb=true --metrics-server=true --dashboard=${settings.dashboard:none} --ingress-name=${globals.ingress-dir}
266255
@@ -302,11 +291,23 @@ actions:
302291 /usr/bin/kubectl drain ${this.workerHostname} --ignore-daemonsets --delete-local-data || exit 8;
303292 /usr/bin/kubectl delete node ${this.workerHostname} || exit 9;
304293
294+ init-manifest-globals:
295+ - cmd[${nodes.k8sm.master.id}]: |-
296+ /usr/bin/kubectl get daemonset traefik-ingress-controller -n kube-system &>/dev/null && echo "traefik" ||:
297+ /usr/bin/kubectl get deployment nginx-ingress-controller -n ingress-nginx &>/dev/null && echo "nginx" ||:
298+ /usr/bin/kubectl get daemonset nginx-ingress-controller -n ingress-nginx &>/dev/null && echo "nginx" ||:
299+ /usr/bin/kubectl get daemonset haproxy-ingress -n ingress-controller &>/dev/null && echo "haproxy" ||:
300+ - setGlobals:
301+ ingress-dir: ${response.out}
302+
305303 setup-remote-api:
306304 - log: '${this}'
307305 - cmd[${nodes.k8sm.master.id}]: |-
308306 action=$([ "${this}" == "true" ] && echo "apply" || echo "delete")
309307 kubectl $action -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/api-ingress.yaml
308+ - if (${settings.api:true}):
309+ - setGlobals:
310+ default_api: or [Remote API Endpoint](${env.protocol}://${env.domain}/api/)
310311
311312 install-monitoring:
312313 - if (!${settings.storage:false}):
@@ -317,6 +318,7 @@ actions:
317318 - setGlobals:
318319 monitoring_installed: ${response.out}
319320 - if ('${globals.monitoring_installed}' == 'false'):
321+ - init-manifest-globals
320322 - cmd[${nodes.k8sm.master.id}]: |-
321323 helm repo update
322324 helm install --name monitoring-prometheus --namespace kubernetes-monitoring stable/prometheus --set server.prefixURL=/prometheus --set server.baseURL=/prometheus
@@ -377,6 +379,7 @@ actions:
377379 - setGlobals:
378380 jaeger_installed: ${response.out}
379381 - if ('${globals.jaeger_installed}' == 'false'):
382+ - init-manifest-globals
380383 - cmd[${nodes.k8sm.master.id}]: |-
381384 kubectl create namespace observability
382385 kubectl create -f ${baseUrl}/addons/jaeger/jaegertracing.io_jaegers_crd.yaml
@@ -463,6 +466,7 @@ addons:
463466 actions:
464467 addon-remote-api:
465468 - log: '${this.api}'
469+ - init-manifest-globals
466470 - setup-remote-api: ${this.api}
467471 - if (${this.api:true}):
468472 - setGlobals:
0 commit comments