Enable OpenStack Shoots for Kubernetes >= 1.10.3

- The behavior prior to 1.10 has been re-introduced. See kubernetes/kubernetes#63903 for details.
gardener · May 29, 2018 · 1c9bd91 · 1c9bd91
1 parent 4c4be26
commit 1c9bd91
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/operation/cloudbotanist/openstackbotanist/controlplane.go b/pkg/operation/cloudbotanist/openstackbotanist/controlplane.go
@@ -53,12 +53,13 @@ monitor-delay=60s
 monitor-timeout=30s
 monitor-max-retries=5`
 
-	k8s1101, err := utils.CompareVersions(b.Shoot.Info.Spec.Kubernetes.Version, "^", "1.10.1")
+	// https://github.com/kubernetes/kubernetes/pull/63903#issue-188306465
+	needsDHCPDomain, err := utils.CheckVersionMeetsConstraint(b.Shoot.Info.Spec.Kubernetes.Version, ">= 1.10.1, < 1.10.3")
 	if err != nil {
 		return "", err
 	}
 
-	if k8s1101 && b.Shoot.CloudProfile.Spec.OpenStack.DHCPDomain != nil {
+	if needsDHCPDomain && b.Shoot.CloudProfile.Spec.OpenStack.DHCPDomain != nil {
 		cloudProviderConfig += `
 [Metadata]
 dhcp-domain=` + *b.Shoot.CloudProfile.Spec.OpenStack.DHCPDomain