From e4193dca7327791b9ed10929982517fa4d638990 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Mon, 10 Aug 2020 13:20:36 +0100
Subject: [PATCH] make nodeselector for private ingress configurable

---
 charts/kubezero-istio/Chart.yaml                           | 2 +-
 charts/kubezero-istio/templates/istio-private-ingress.yaml | 4 ++--
 charts/kubezero-istio/values.yaml                          | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/charts/kubezero-istio/Chart.yaml b/charts/kubezero-istio/Chart.yaml
index f996613..ac920b6 100644
--- a/charts/kubezero-istio/Chart.yaml
+++ b/charts/kubezero-istio/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-istio
 description: KubeZero Umbrella Chart for Istio
 type: application
-version: 0.2.1
+version: 0.2.2
 appVersion: 1.6.7
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
diff --git a/charts/kubezero-istio/templates/istio-private-ingress.yaml b/charts/kubezero-istio/templates/istio-private-ingress.yaml
index c946542..b20f3b9 100644
--- a/charts/kubezero-istio/templates/istio-private-ingress.yaml
+++ b/charts/kubezero-istio/templates/istio-private-ingress.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.ingress.private }}
+{{- if .Values.ingress.private.enabled }}
 apiVersion: install.istio.io/v1alpha1
 kind: IstioOperator
 metadata:
@@ -36,7 +36,7 @@ spec:
           value: standard
         {{- if eq .Values.ingress.type "NodePort" }}
         nodeSelector:
-          node.kubernetes.io/ingress.private: "31080_31443_30671_30672_31224"
+          node.kubernetes.io/ingress.private: {{ .Values.ingress.private.nodeSelector }}
         {{- end }}
         resources:
           limits:
diff --git a/charts/kubezero-istio/values.yaml b/charts/kubezero-istio/values.yaml
index 68d5a42..dc7017a 100644
--- a/charts/kubezero-istio/values.yaml
+++ b/charts/kubezero-istio/values.yaml
@@ -6,7 +6,9 @@ ingress:
   autoscaleEnabled: false
   replicaCount: 2
   type: NodePort
-  private: true
+  private:
+    enabled: true
+    nodeSelector: "31080_31443_30671_30672_31224"
   #dnsNames:
   #- "*.example.com"