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/values.yaml b/chart/values.yaml index f5d3551a78bb123d7d9193776a56f3fda74842e7..ad576e5c0e7c78158882f3093881750a5cbfdada 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -354,7 +354,8 @@ 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.2" + branch: "8-istio-injection" # -- Flux reconciliation overrides specifically for the ECK Operator Package flux: {}