Merge pull request gardener#2970 from vpnachev/seed-taints/allow-again-some-taints

rfranzke · web-flow · commit b2f2e3a5882f · 2020-10-28T13:24:32.000+01:00
Allow again some seed taints to be used
diff --git a/docs/concepts/scheduler.md b/docs/concepts/scheduler.md
@@ -71,7 +71,7 @@ Once this list has been computed the scheduler tries to find the best one out of
 It filters out `Seed`s
 
 * whose networks have intersections with the `Shoot`'s networks (due to the VPN connectivity between seeds and shoots their networks must be disjoint)
-* that are tainted with the `seed.gardener.cloud/disable-dns` taint (only if the shoot specifies a DNS domain or does not use the `unmanaged` DNS provider)
+* that have `.spec.settings.shootDNS.enabled=false` (only if the shoot specifies a DNS domain or does not use the `unmanaged` DNS provider)
 * whose labels don't match the `.spec.seedSelector` field of the `CloudProfile` that is used in the `Shoot` (there might be multiple environments for the same provider type, e.g., you might have multiple OpenStack systems connected to Gardener)
 
 After this filtering process the least utilized seed, i.e., the one with the least number of shoot control planes, will be the winner and written to the `.spec.seedName` field of the `Shoot`.
diff --git a/docs/usage/configuration.md b/docs/usage/configuration.md
@@ -55,7 +55,7 @@ When the `gardenlet` starts it scans the `garden` namespace of the garden cluste
   * Not every end-user/stakeholder/customer has its own domain, however, Gardener needs to create a DNS record for every shoot cluster.
   * As landscape operator you might want to define a default domain owned and controlled by you that is used for all shoot clusters that don't specify their own domain.
 
-:warning: Please note that the mentioned domain secrets are only needed if you have at least one seed cluster that is not tainted with `seed.gardener.cloud/disable-dns`.
+:warning: Please note that the mentioned domain secrets are only needed if you have at least one seed cluster that is not specifing `.spec.settings.shootDNS.enabled=false`.
 Seeds with this taint don't create any DNS records for shoots scheduled on it, hence, if you only have such seeds, you don't need to create the domain secrets.
 
 * **Alerting secrets** (optional), contain the alerting configuration and credentials for the [AlertManager](https://prometheus.io/docs/alerting/alertmanager/) to send email alerts. It is also possible to configure the monitoring stack to send alerts to an AlertManager not deployed by Gardener to handle alerting. Please see [this](../../example/10-secret-alerting.yaml) for an example.
diff --git a/pkg/apis/core/v1alpha1/defaults.go b/pkg/apis/core/v1alpha1/defaults.go
@@ -117,20 +117,6 @@ func SetDefaults_Seed(obj *Seed) {
 	if obj.Spec.Settings.VerticalPodAutoscaler == nil {
 		obj.Spec.Settings.VerticalPodAutoscaler = &SeedSettingVerticalPodAutoscaler{Enabled: true}
 	}
-
-	// TODO: remove taints removal in version >=1.13
-	taintsToRemove := []string{
-		"seed.gardener.cloud/disable-capacity-reservation",
-		"seed.gardener.cloud/disable-dns",
-		"seed.gardener.cloud/invisible",
-	}
-	for _, taint := range taintsToRemove {
-		for i := len(obj.Spec.Taints) - 1; i >= 0; i-- {
-			if obj.Spec.Taints[i].Key == taint {
-				obj.Spec.Taints = append(obj.Spec.Taints[:i], obj.Spec.Taints[i+1:]...)
-			}
-		}
-	}
 }
 
 // SetDefaults_Shoot sets default values for Shoot objects.
diff --git a/pkg/apis/core/v1alpha1/defaults_test.go b/pkg/apis/core/v1alpha1/defaults_test.go
@@ -233,38 +233,22 @@ var _ = Describe("Defaults", func() {
 			Expect(obj.Spec.Settings.VerticalPodAutoscaler.Enabled).To(BeTrue())
 		})
 
-		It("should remove deprecated taints from the seed settings (w/ taints)", func() {
-			obj.Spec.Taints = []SeedTaint{
+		It("should allow taints that were not allowed in version v1.12", func() {
+			taints := []SeedTaint{
 				{Key: "seed.gardener.cloud/disable-capacity-reservation"},
 				{Key: "seed.gardener.cloud/disable-dns"},
 				{Key: "seed.gardener.cloud/invisible"},
 			}
+			obj.Spec.Taints = taints
 
 			SetDefaults_Seed(obj)
 
 			Expect(obj.Spec.Settings.ExcessCapacityReservation.Enabled).To(BeTrue())
 			Expect(obj.Spec.Settings.Scheduling.Visible).To(BeTrue())
 			Expect(obj.Spec.Settings.ShootDNS.Enabled).To(BeTrue())
 			Expect(obj.Spec.Settings.VerticalPodAutoscaler.Enabled).To(BeTrue())
-			Expect(obj.Spec.Taints).To(BeEmpty())
-		})
-
-		It("should keep non-deprecated taints from the seed settings (w/ taints)", func() {
-			obj.Spec.Taints = []SeedTaint{
-				{Key: "seed.gardener.cloud/disable-capacity-reservation"},
-				{Key: "seed.gardener.cloud/disable-dns"},
-				{Key: "seed.gardener.cloud/invisible"},
-				{Key: SeedTaintProtected},
-			}
-
-			SetDefaults_Seed(obj)
-
-			Expect(obj.Spec.Settings.ExcessCapacityReservation.Enabled).To(BeTrue())
-			Expect(obj.Spec.Settings.Scheduling.Visible).To(BeTrue())
-			Expect(obj.Spec.Settings.ShootDNS.Enabled).To(BeTrue())
-			Expect(obj.Spec.Settings.VerticalPodAutoscaler.Enabled).To(BeTrue())
-			Expect(obj.Spec.Taints).To(HaveLen(1))
-			Expect(obj.Spec.Taints[0].Key).To(Equal(SeedTaintProtected))
+			Expect(obj.Spec.Taints).To(HaveLen(3))
+			Expect(obj.Spec.Taints).To(Equal(taints))
 		})
 
 		It("should not default the seed settings because they were provided", func() {
diff --git a/pkg/apis/core/v1beta1/defaults.go b/pkg/apis/core/v1beta1/defaults.go
@@ -117,20 +117,6 @@ func SetDefaults_Seed(obj *Seed) {
 	if obj.Spec.Settings.VerticalPodAutoscaler == nil {
 		obj.Spec.Settings.VerticalPodAutoscaler = &SeedSettingVerticalPodAutoscaler{Enabled: true}
 	}
-
-	// TODO: remove taints removal in version >=1.13
-	taintsToRemove := []string{
-		"seed.gardener.cloud/disable-capacity-reservation",
-		"seed.gardener.cloud/disable-dns",
-		"seed.gardener.cloud/invisible",
-	}
-	for _, taint := range taintsToRemove {
-		for i := len(obj.Spec.Taints) - 1; i >= 0; i-- {
-			if obj.Spec.Taints[i].Key == taint {
-				obj.Spec.Taints = append(obj.Spec.Taints[:i], obj.Spec.Taints[i+1:]...)
-			}
-		}
-	}
 }
 
 // SetDefaults_Shoot sets default values for Shoot objects.
diff --git a/pkg/apis/core/v1beta1/defaults_test.go b/pkg/apis/core/v1beta1/defaults_test.go
@@ -234,38 +234,22 @@ var _ = Describe("Defaults", func() {
 			Expect(obj.Spec.Settings.VerticalPodAutoscaler.Enabled).To(BeTrue())
 		})
 
-		It("should remove deprecated taints from the seed settings (w/ taints)", func() {
-			obj.Spec.Taints = []SeedTaint{
+		It("should allow taints that were not allowed in version v1.12", func() {
+			taints := []SeedTaint{
 				{Key: "seed.gardener.cloud/disable-capacity-reservation"},
 				{Key: "seed.gardener.cloud/disable-dns"},
 				{Key: "seed.gardener.cloud/invisible"},
 			}
+			obj.Spec.Taints = taints
 
 			SetDefaults_Seed(obj)
 
 			Expect(obj.Spec.Settings.ExcessCapacityReservation.Enabled).To(BeTrue())
 			Expect(obj.Spec.Settings.Scheduling.Visible).To(BeTrue())
 			Expect(obj.Spec.Settings.ShootDNS.Enabled).To(BeTrue())
 			Expect(obj.Spec.Settings.VerticalPodAutoscaler.Enabled).To(BeTrue())
-			Expect(obj.Spec.Taints).To(BeEmpty())
-		})
-
-		It("should keep non-deprecated taints from the seed settings (w/ taints)", func() {
-			obj.Spec.Taints = []SeedTaint{
-				{Key: "seed.gardener.cloud/disable-capacity-reservation"},
-				{Key: "seed.gardener.cloud/disable-dns"},
-				{Key: "seed.gardener.cloud/invisible"},
-				{Key: SeedTaintProtected},
-			}
-
-			SetDefaults_Seed(obj)
-
-			Expect(obj.Spec.Settings.ExcessCapacityReservation.Enabled).To(BeTrue())
-			Expect(obj.Spec.Settings.Scheduling.Visible).To(BeTrue())
-			Expect(obj.Spec.Settings.ShootDNS.Enabled).To(BeTrue())
-			Expect(obj.Spec.Settings.VerticalPodAutoscaler.Enabled).To(BeTrue())
-			Expect(obj.Spec.Taints).To(HaveLen(1))
-			Expect(obj.Spec.Taints[0].Key).To(Equal(SeedTaintProtected))
+			Expect(obj.Spec.Taints).To(HaveLen(3))
+			Expect(obj.Spec.Taints).To(Equal(taints))
 		})
 
 		It("should not default the seed settings because they were provided", func() {
