Skip to content

K
k3s
Commit a9f96da6 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #25291 from janetkuo/describe-rc-pods-non-flake

Automatic merge from submit-queue Remove kubectl describe test from flaky list ## Pull Request Guidelines 1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md). 1. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md). 1. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below. ```release-note * Use the release-note-* labels to set the release note state * Clear this block to use the PR title as the release note -OR- * Enter your extended release note here ``` Ref #25083 #25911 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
parents 5fd2bb5c 6ca3c16f
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
test/e2e/kubectl.go
View file @ a9f96da6
...@@ -170,7 +170,6 @@ var _ = framework.KubeDescribe("Kubectl client", func() { ...@@ -170,7 +170,6 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
ValidPhases: []api.PodPhase{api.PodRunning /*api.PodPending*/}, ValidPhases: []api.PodPhase{api.PodRunning /*api.PodPending*/},
}) })
} }
forEachPod := func(podFunc func(p api.Pod)) { forEachPod := func(podFunc func(p api.Pod)) {
clusterState().ForEach(podFunc) clusterState().ForEach(podFunc)
} }
...@@ -485,8 +484,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() { ...@@ -485,8 +484,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
}) })
framework.KubeDescribe("Kubectl describe", func() { framework.KubeDescribe("Kubectl describe", func() {
// Flaky issue: #25083 It("should check if kubectl describe prints relevant information for rc and pods [Conformance]", func() {
It("should check if kubectl describe prints relevant information for rc and pods [Conformance] [Flaky]", func() {
framework.SkipUnlessServerVersionGTE(nodePortsOptionalVersion, c) framework.SkipUnlessServerVersionGTE(nodePortsOptionalVersion, c)
controllerJson := readTestFileOrDie(redisControllerFilename) controllerJson := readTestFileOrDie(redisControllerFilename)
serviceJson := readTestFileOrDie(redisServiceFilename) serviceJson := readTestFileOrDie(redisServiceFilename)
......
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