Merge branch 'opts' into 'master'

add rudimentary logic behind enabling/disabling applications

rudimentary logic to ensure proper `dependsOn` are created when packages are enabled/disabled

See merge request platform-one/big-bang/umbrella!14

chart/templates/certmanager/cert-manager-helmrelease.yaml

@@ -37,4 +37,5 @@ spec:
     - name: env-values
       kind: Secret
       optional: true
+
 {{- end }}
\ No newline at end of file

chart/templates/istio/istio-controlplane-helmrelease.yaml

@@ -42,8 +42,11 @@ spec:
     hostname: {{ .Values.global.hostname }}
 
   dependsOn:
-    - name: {{ .Release.Name }}-gatekeeper
-      namespace: {{ .Release.Namespace }}
     - name: {{ .Release.Name }}-istio-operator
       namespace: {{ .Release.Namespace }}
+
+    {{- if .Values.gatekeeper.enabled }}
+    - name: {{ .Release.Name }}-gatekeeper
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
 {{- end }}
\ No newline at end of file

chart/templates/istio/istio-operator-helmrelease.yaml

@@ -42,7 +42,10 @@ spec:
       kind: Secret
       optional: true
 
+  {{- if .Values.gatekeeper.enabled }}
   dependsOn:
     - name: {{ .Release.Name }}-gatekeeper
       namespace: {{ .Release.Namespace }}
+  {{- end }}
+
 {{- end }}
\ No newline at end of file

chart/templates/logging/eck-operator-helmrelease.yaml

@@ -38,7 +38,9 @@ spec:
       kind: Secret
       optional: true
 
+  {{- if .Values.gatekeeper.enabled }}
   dependsOn:
     - name: {{ .Release.Name }}-gatekeeper
       namespace: {{ .Release.Namespace }}
+  {{- end }}
 {{- end }}
\ No newline at end of file

chart/templates/logging/efk-helmrelease.yaml

@@ -41,13 +41,20 @@ spec:
   values:
     hostname: {{ .Values.global.hostname }}
 
+  {{/* ECK and Logging _always_ depend on .Values.logging being enabled, so can assume they exist here */}}
   dependsOn:
-    - name: {{ .Release.Name }}-gatekeeper
-      namespace: {{ .Release.Namespace }}
-    - name: {{ .Release.Name }}-istio
-      namespace: {{ .Release.Namespace }}
     - name: {{ .Release.Name }}-eck-operator
       namespace: {{ .Release.Namespace }}
     - name: {{ .Release.Name }}-logging-operator
       namespace: {{ .Release.Namespace }}
+
+    {{- if  .Values.gatekeeper.enabled }}
+    - name: {{ .Release.Name }}-gatekeeper
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
+
+    {{- if .Values.istio.enabled }}
+    - name: {{ .Release.Name }}-istio
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
 {{- end }}
\ No newline at end of file

chart/templates/logging/logging-operator-helmrelease.yaml

@@ -33,7 +33,9 @@ spec:
   values:
     createCustomResource: false
 
+  {{- if .Values.gatekeeper.enabled }}
   dependsOn:
     - name: {{ .Release.Name }}-gatekeeper
       namespace: {{ .Release.Namespace }}
+  {{- end }}
 {{- end }}
\ No newline at end of file

chart/templates/monitoring/kube-prometheus-stack-helmrelease.yaml

@@ -75,7 +75,10 @@ spec:
     kind: Secret
     optional: true
 
+  # TODO: DRY this up
+  {{- if .Values.gatekeeper.enabled }}
   dependsOn:
     - name: {{ .Release.Name }}-gatekeeper
       namespace: {{ .Release.Namespace }}
+  {{- end }}
 {{- end }}
\ No newline at end of file

chart/templates/twistlock/twistlock-helmrelease.yaml

@@ -42,11 +42,18 @@ spec:
     hostname: {{ .Values.global.hostname }}
     prometheus:
       servicemonitor:
-        enabled: true
+        enabled: {{ .Values.monitoring.enabled }}
 
+  # TODO: DRY this up
+  {{- if or .Values.gatekeeper.enabled .Values.istio.enabled }}
   dependsOn:
+    {{- if .Values.gatekeeper.enabled }}
     - name: {{ .Release.Name }}-gatekeeper
       namespace: {{ .Release.Namespace }}
+    {{- end }}
+    {{- if .Values.istio.enabled }}
     - name: {{ .Release.Name }}-istio
       namespace: {{ .Release.Namespace }}
+    {{- end }}
+  {{- end }}
 {{- end }}
\ No newline at end of file