Skip to content

K
k3s
Commit 3f447dd0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #52796 from aleksandra-malinowska/autoscaling-test-fix-3

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. In autoscaling tests, add PDBs for more kube-system pods This adds PDBs for more kube-system pods in scale down tests. It should reduce flakes caused by evenly distributed system components blocking scale down of all nodes.
parents 26bb28b0 fbeb4de9
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
test/e2e/autoscaling/cluster_size_autoscaling.go
View file @ 3f447dd0
...@@ -1404,7 +1404,7 @@ func waitForScaleUpStatus(c clientset.Interface, expected string, timeout time.D ...@@ -1404,7 +1404,7 @@ func waitForScaleUpStatus(c clientset.Interface, expected string, timeout time.D
} }
// This is a temporary fix to allow CA to migrate some kube-system pods // This is a temporary fix to allow CA to migrate some kube-system pods
// TODO: Remove this when the PDB is added for those components // TODO: Remove this when the PDB is added for some of those components
func addKubeSystemPdbs(f *framework.Framework) (func(), error) { func addKubeSystemPdbs(f *framework.Framework) (func(), error) {
By("Create PodDisruptionBudgets for kube-system components, so they can be migrated if required") By("Create PodDisruptionBudgets for kube-system components, so they can be migrated if required")
...@@ -1420,10 +1420,12 @@ func addKubeSystemPdbs(f *framework.Framework) (func(), error) { ...@@ -1420,10 +1420,12 @@ func addKubeSystemPdbs(f *framework.Framework) (func(), error) {
min_available int min_available int
} }
pdbsToAdd := []pdbInfo{ pdbsToAdd := []pdbInfo{
{label: "kube-dns-autoscaler", min_available: 1},
{label: "kube-dns", min_available: 1}, {label: "kube-dns", min_available: 1},
{label: "event-exporter", min_available: 0}, {label: "kube-dns-autoscaler", min_available: 0},
{label: "metrics-server", min_available: 0},
{label: "kubernetes-dashboard", min_available: 0}, {label: "kubernetes-dashboard", min_available: 0},
{label: "l7-default-backend", min_available: 0},
{label: "heapster", min_available: 0},
} }
for _, pdbData := range pdbsToAdd { for _, pdbData := range pdbsToAdd {
By(fmt.Sprintf("Create PodDisruptionBudget for %v", pdbData.label)) By(fmt.Sprintf("Create PodDisruptionBudget for %v", pdbData.label))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment