Skip to content

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

Merge pull request #33165 from zefciu/b29633

Automatic merge from submit-queue Corrected timeout on Downward API volume The tests for Downward API volume were apparently created before the default sync-frequency was set to 1 minute. As the current implementation of Pod gives us no guarantee that the changes will be seen in Downward API before `sync-frequency` we need the tests to reflect this. Fixes: #29633
parents f9da0793 de6cc5d0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
test/e2e/common/downwardapi_volume.go
View file @ d728afc5
...@@ -31,7 +31,7 @@ import ( ...@@ -31,7 +31,7 @@ import (
var _ = framework.KubeDescribe("Downward API volume", func() { var _ = framework.KubeDescribe("Downward API volume", func() {
// How long to wait for a log pod to be displayed // How long to wait for a log pod to be displayed
const podLogTimeout = 45 * time.Second const podLogTimeout = 65 * time.Second
f := framework.NewDefaultFramework("downward-api") f := framework.NewDefaultFramework("downward-api")
var podClient *framework.PodClient var podClient *framework.PodClient
BeforeEach(func() { BeforeEach(func() {
...@@ -81,9 +81,7 @@ var _ = framework.KubeDescribe("Downward API volume", func() { ...@@ -81,9 +81,7 @@ var _ = framework.KubeDescribe("Downward API volume", func() {
}) })
}) })
// Mark the following 2 tests as [Flaky] because of https://github.com/kubernetes/kubernetes/issues/29633, It("should update labels on modification [Conformance]", func() {
// we should re-enable these tests when the issue is fixed.
It("should update labels on modification [Conformance] [Flaky]", func() {
labels := map[string]string{} labels := map[string]string{}
labels["key1"] = "value1" labels["key1"] = "value1"
labels["key2"] = "value2" labels["key2"] = "value2"
...@@ -114,7 +112,7 @@ var _ = framework.KubeDescribe("Downward API volume", func() { ...@@ -114,7 +112,7 @@ var _ = framework.KubeDescribe("Downward API volume", func() {
podLogTimeout, framework.Poll).Should(ContainSubstring("key3=\"value3\"\n")) podLogTimeout, framework.Poll).Should(ContainSubstring("key3=\"value3\"\n"))
}) })
It("should update annotations on modification [Conformance] [Flaky]", func() { It("should update annotations on modification [Conformance]", func() {
annotations := map[string]string{} annotations := map[string]string{}
annotations["builder"] = "bar" annotations["builder"] = "bar"
podName := "annotationupdate" + string(uuid.NewUUID()) podName := "annotationupdate" + string(uuid.NewUUID())
......
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