Skip to content

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

Merge pull request #42773 from MrHohn/dns-autoscaler-testfix

Automatic merge from submit-queue dns_autoscaling test: Don't expect configMap to be re-created with previous params Fix #42766. In dns_autoscaling e2e test, there is a test case that we delete the kube-dns-autoscaler configMap first and wait for it to be recreated with previous params. This is not necessarily true, because we will preserve the kube-dns-autoscaler configMap during upgrade but we may update the default params in kube-dns-autoscale binary, which means a configMap with new params will be created in the upgrade case. One of the test failures could be found on: https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/logs/ci-kubernetes-e2e-gke-gci-1.5-gci-1.6-upgrade-cluster-new/18#k8sio-dns-horizontal-autoscaling-kube-dns-autoscaler-should-scale-kube-dns-pods-in-both-nonfaulty-and-faulty-scenarios This PR removes the codes that make above assertion. @bowei @skriss ```release-note NONE ```
parents 0ed150f3 a9899206
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
test/e2e/dns_autoscaling.go
View file @ 81ac6148
...@@ -19,7 +19,6 @@ package e2e ...@@ -19,7 +19,6 @@ package e2e
import ( import (
"fmt" "fmt"
"math" "math"
"reflect"
"strings" "strings"
"time" "time"
...@@ -185,12 +184,9 @@ var _ = framework.KubeDescribe("DNS horizontal autoscaling", func() { ...@@ -185,12 +184,9 @@ var _ = framework.KubeDescribe("DNS horizontal autoscaling", func() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
By("Wait for the ConfigMap got re-created") By("Wait for the ConfigMap got re-created")
configMap, err := waitForDNSConfigMapCreated(c, DNSdefaultTimeout) _, err = waitForDNSConfigMapCreated(c, DNSdefaultTimeout)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
By("Check the new created ConfigMap got the same data as we have")
Expect(reflect.DeepEqual(previousParams, configMap.Data)).To(Equal(true))
By("Replace the dns autoscaling parameters with another testing parameters") By("Replace the dns autoscaling parameters with another testing parameters")
err = updateDNSScalingConfigMap(c, packDNSScalingConfigMap(packLinearParams(&DNSParams_2))) err = updateDNSScalingConfigMap(c, packDNSScalingConfigMap(packLinearParams(&DNSParams_2)))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
......
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