Skip to content

Commit 6b594c2

Browse files
authored
Merge pull request kubernetes#90615 from dims/drop-conformance-tag-for-tests-that-rely-directly-on-kubelet-logs-api
Drop conformance tag for tests that rely directly on kubelet /logs API
2 parents 26ad2c2 + 3292bb6 commit 6b594c2

File tree

2 files changed

+6
-22
lines changed

2 files changed

+6
-22
lines changed

test/conformance/testdata/conformance.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,20 +1569,6 @@
15691569
other platforms like Windows.
15701570
release: v1.9
15711571
file: test/e2e/common/networking.go
1572-
- testname: Proxy, logs endpoint
1573-
codename: '[sig-network] Proxy version v1 should proxy logs on node using proxy
1574-
subresource [Conformance]'
1575-
description: Select any node in the cluster to invoke /proxy/nodes/<nodeip>//logs
1576-
endpoint. This endpoint MUST be reachable.
1577-
release: v1.9
1578-
file: test/e2e/network/proxy.go
1579-
- testname: Proxy, logs port endpoint
1580-
codename: '[sig-network] Proxy version v1 should proxy logs on node with explicit
1581-
kubelet port using proxy subresource [Conformance]'
1582-
description: Select any node in the cluster to invoke /proxy/nodes/<nodeip>:10250/logs
1583-
endpoint. This endpoint MUST be reachable.
1584-
release: v1.9
1585-
file: test/e2e/network/proxy.go
15861572
- testname: Proxy, logs service endpoint
15871573
codename: '[sig-network] Proxy version v1 should proxy through a service and a pod [Conformance]'
15881574
description: Select any node in the cluster to invoke /logs endpoint using the

test/e2e/network/proxy.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,16 @@ var _ = SIGDescribe("Proxy", func() {
6464
prefix := "/api/" + version
6565

6666
/*
67-
Release : v1.9
68-
Testname: Proxy, logs port endpoint
69-
Description: Select any node in the cluster to invoke /proxy/nodes/<nodeip>:10250/logs endpoint. This endpoint MUST be reachable.
67+
Test for Proxy, logs port endpoint
68+
Select any node in the cluster to invoke /proxy/nodes/<nodeip>:10250/logs endpoint. This endpoint MUST be reachable.
7069
*/
71-
framework.ConformanceIt("should proxy logs on node with explicit kubelet port using proxy subresource ", func() { nodeProxyTest(f, prefix+"/nodes/", ":10250/proxy/logs/") })
70+
ginkgo.It("should proxy logs on node with explicit kubelet port using proxy subresource ", func() { nodeProxyTest(f, prefix+"/nodes/", ":10250/proxy/logs/") })
7271

7372
/*
74-
Release : v1.9
75-
Testname: Proxy, logs endpoint
76-
Description: Select any node in the cluster to invoke /proxy/nodes/<nodeip>//logs endpoint. This endpoint MUST be reachable.
73+
Test for Proxy, logs endpoint
74+
Select any node in the cluster to invoke /proxy/nodes/<nodeip>//logs endpoint. This endpoint MUST be reachable.
7775
*/
78-
framework.ConformanceIt("should proxy logs on node using proxy subresource ", func() { nodeProxyTest(f, prefix+"/nodes/", "/proxy/logs/") })
76+
ginkgo.It("should proxy logs on node using proxy subresource ", func() { nodeProxyTest(f, prefix+"/nodes/", "/proxy/logs/") })
7977

8078
// using the porter image to serve content, access the content
8179
// (of multiple pods?) from multiple (endpoints/services?)

0 commit comments

Comments
 (0)