Skip to content

Commit 8332f4a

Browse files
committed
K8S-202 add storage component dependency
1 parent 8ecc5c1 commit 8332f4a

File tree

2 files changed

+37
-12
lines changed

2 files changed

+37
-12
lines changed

configs/settings.yaml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,34 @@ fields:
5252
name: storage
5353
caption: Attach dedicated NFS Storage with dynamic volume provisioning
5454
value: true
55+
showIf:
56+
true:
57+
- type: checkbox
58+
name: monitoring
59+
caption: Install Prometheus & Grafana
60+
value: false
5561

56-
- type: checkbox
57-
name: api
58-
caption: Enable Remote API Access
59-
value: false
62+
- type: checkbox
63+
name: jaeger
64+
caption: Install Jaeger tracing tools
65+
value: false
6066

61-
- type: checkbox
62-
name: monitoring
63-
caption: Install Prometheus & Grafana
64-
value: false
67+
false:
68+
- type: checkbox
69+
name: monitoring
70+
caption: Install Prometheus & Grafana
71+
value: false
72+
disabled: true
73+
74+
- type: checkbox
75+
name: jaeger
76+
caption: Install Jaeger tracing tools
77+
value: false
78+
disabled: true
6579

6680
- type: checkbox
67-
name: jaeger
68-
caption: Install Jaeger tracing tools
81+
name: api
82+
caption: Enable Remote API Access
6983
value: false
7084

7185
- type: string

manifest.jps

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ onInstall:
6464
- if (${settings.api:true}):
6565
- setup-remote-api: true
6666

67-
- if (${settings.monitoring:true}):
67+
- if (${settings.monitoring:false}):
6868
- install-monitoring
6969

70-
- if (${settings.jaeger:true}):
70+
- if (${settings.jaeger:false}):
7171
- install-jaeger
7272

7373
- if ('${env.protocol}' == 'http'):
@@ -311,6 +311,10 @@ actions:
311311
kubectl $action -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/api-ingress.yaml
312312

313313
install-monitoring:
314+
- if (!${settings.storage:false}):
315+
return:
316+
type: warning
317+
message: Monitoring components require Storage installed!
314318
- cmd[${nodes.k8sm.master.id}]: kubectl get secret --namespace kubernetes-monitoring monitoring-grafana &>/dev/null && echo "true" || echo "false"
315319
- setGlobals:
316320
monitoring_installed: ${response.out}
@@ -368,6 +372,10 @@ actions:
368372
message: ${globals.monitoring_success}
369373

370374
install-jaeger:
375+
- if (!${settings.storage:false}):
376+
return:
377+
type: warning
378+
message: Jaeger components require Storage installed!
371379
- cmd[${nodes.k8sm.master.id}]: kubectl get secret observability-jaeger-plain --namespace=observability &>/dev/null && echo "true" || echo "false"
372380
- setGlobals:
373381
jaeger_installed: ${response.out}
@@ -469,6 +477,9 @@ addons:
469477
- type: string
470478
name: ingress-controller
471479
inputType: hidden
480+
- type: checkbox
481+
name: storage
482+
inputType: hidden
472483

473484
buttons:
474485
- caption: Remote API

0 commit comments

Comments
 (0)