From df149e07fec31ee5600987119bb16a642689c98e Mon Sep 17 00:00:00 2001
From: "garcia.ryan" <garcia.ryan@solute.us>
Date: Wed, 22 Sep 2021 10:26:58 -0600
Subject: [PATCH] Initial commit for eck-operator istio-injection support
---
chart/templates/logging/eck-operator/namespace.yaml | 4 ++--
chart/templates/logging/eck-operator/values.yaml | 6 ++++++
chart/values.yaml | 3 ++-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/chart/templates/logging/eck-operator/namespace.yaml b/chart/templates/logging/eck-operator/namespace.yaml
index 8231f5c26d..dc0f429664 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 16df742277..b99d839ff4 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 f5d3551a78..ad576e5c0e 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: {}
--
GitLab