Merge branch 'eck-opr8r-injection' into 'master'

ECK Operator enable Istio-Injection

Closes platform-one/big-bang/apps/core/eck-operator#8

See merge request platform-one/big-bang/bigbang!924

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

@@ -37,9 +37,15 @@ spec:
       kind: Secret
       valuesKey: "overlays"
 
-  {{- if .Values.gatekeeper.enabled }}
+  {{- if or .Values.gatekeeper.enabled .Values.istio.enabled }}
   dependsOn:
+    {{- if .Values.gatekeeper.enabled }}
     - name: gatekeeper
       namespace: {{ .Release.Namespace }}
+    {{- end }}
+    {{- if .Values.istio.enabled }}
+    - name: istio
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
   {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}

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

@@ -7,5 +7,5 @@ metadata:
     app.kubernetes.io/name: eck-operator
     app.kubernetes.io/component: "core"
     {{- include "commonLabels" . | nindent 4}}
-    istio-injection: disabled
-{{- end }}
\ No newline at end of file
+    istio-injection: enabled
+{{- end }}

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

@@ -15,6 +15,12 @@ podAnnotations:
 
 openshift: {{ .Values.openshift }}
 
+istio:
+  enabled: {{ .Values.istio.enabled }}
+
+monitoring:
+  enabled: {{ .Values.monitoring.enabled }}
+
 networkPolicies:
   enabled: {{ .Values.networkPolicies.enabled }}
   controlPlaneCidr: {{ .Values.networkPolicies.controlPlaneCidr }}

chart/templates/logging/elasticsearch-kibana/ek-helmrelease.yaml

@@ -46,9 +46,4 @@ spec:
     - name: gatekeeper
       namespace: {{ .Release.Namespace }}
     {{- end }}
-
-    {{- if .Values.istio.enabled }}
-    - name: istio
-      namespace: {{ .Release.Namespace }}
-    {{- end }}
 {{- end }}

chart/values.yaml

@@ -354,7 +354,7 @@ eckoperator:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/eck-operator.git
     path: "./chart"
-    tag: "1.6.0-bb.2"
+    tag: "1.6.0-bb.3"
 
   # -- Flux reconciliation overrides specifically for the ECK Operator Package
   flux: {}