diff --git a/chart/templates/logging/eck-operator/eck-operator-helmrelease.yaml b/chart/templates/logging/eck-operator/eck-operator-helmrelease.yaml index 48aaa85827bb315488500ae006fad2b06894cfe5..61e8b1e41a05dbb266b400ecedda1c49f468c514 100644 --- a/chart/templates/logging/eck-operator/eck-operator-helmrelease.yaml +++ b/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 }} diff --git a/chart/templates/logging/eck-operator/namespace.yaml b/chart/templates/logging/eck-operator/namespace.yaml index 8231f5c26df8c6ca724c3fd101367a0f3740458e..dc0f4296644d2cd44289044c63f396cbd6fc70f0 100644 --- a/chart/templates/logging/eck-operator/namespace.yaml +++ b/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 }} diff --git a/chart/templates/logging/eck-operator/values.yaml b/chart/templates/logging/eck-operator/values.yaml index 16df742277829fa462a0b94179f65a4141cc741c..b99d839ff4d4a021def0c32d8cb597986e3f3d13 100644 --- a/chart/templates/logging/eck-operator/values.yaml +++ b/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 }} diff --git a/chart/templates/logging/elasticsearch-kibana/ek-helmrelease.yaml b/chart/templates/logging/elasticsearch-kibana/ek-helmrelease.yaml index 6953ab358526df1824c5baefa11c61e0243d333e..036e38cf1dfeb5fba30683eecedca85b06ee89a8 100644 --- a/chart/templates/logging/elasticsearch-kibana/ek-helmrelease.yaml +++ b/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 }} diff --git a/chart/values.yaml b/chart/values.yaml index d56428d5d1bae850067a3bfcd8b1dae8ca0a1c3f..13894403fdc309510f0ce7d83f479fa82629ae2c 100644 --- a/chart/values.yaml +++ b/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: {}