From 172f54ce542c51a506c5f1b654d3b37f51504b9f Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 10 Feb 2025 00:57:21 +0000 Subject: [PATCH] fix: use different labels for GKE as kubernetes.io is restricted --- charts/kubezero/templates/istio-ingress.yaml | 6 +++++- charts/kubezero/templates/istio-private-ingress.yaml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/charts/kubezero/templates/istio-ingress.yaml b/charts/kubezero/templates/istio-ingress.yaml index f61fd090..1c53bdb2 100644 --- a/charts/kubezero/templates/istio-ingress.yaml +++ b/charts/kubezero/templates/istio-ingress.yaml @@ -21,7 +21,11 @@ gateway: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: node.kubernetes.io/ingress.public + {{- if eq .Values.global.platform "gke" }} + - key: "kubezero.zero-downtime.net/ingress.public" + {{- else }} + - key: "node.kubernetes.io/ingress.public" + {{- end }} operator: Exists topologySpreadConstraints: diff --git a/charts/kubezero/templates/istio-private-ingress.yaml b/charts/kubezero/templates/istio-private-ingress.yaml index c973fbdf..045972b8 100644 --- a/charts/kubezero/templates/istio-private-ingress.yaml +++ b/charts/kubezero/templates/istio-private-ingress.yaml @@ -21,7 +21,11 @@ gateway: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: node.kubernetes.io/ingress.private + {{- if eq .Values.global.platform "gke" }} + - key: "kubezero.zero-downtime.net/ingress.public" + {{- else }} + - key: "node.kubernetes.io/ingress.public" + {{- end }} operator: Exists topologySpreadConstraints: