From 51a08bea9ac73fe3d204c7fd514edb7f858192a0 Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian@hakman.dev>
Date: Tue, 9 Jan 2024 12:32:56 +0200
Subject: [PATCH] aws: Wait for zone label to be set before scheduling EBS CSI
 node driver

---
 .../aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template b/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template
index cf149608ff..8cc0bcbfc4 100644
--- a/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template
+++ b/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template
@@ -377,6 +377,10 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
+              {{- if not .HostNetwork }}
+              - key: topology.kubernetes.io/zone
+                operator: Exists
+              {{- end }}
               - key: eks.amazonaws.com/compute-type
                 operator: NotIn
                 values: