Skip to content

Deflake TestPortForwardUnderlyingProtocol #61181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zmb3 merged 1 commit into from
Nov 10, 2025
Merged

Deflake TestPortForwardUnderlyingProtocol #61181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions lib/kube/proxy/portforward_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,25 +585,25 @@ func TestPortForwardUnderlyingProtocol(t *testing.T) {
validateFunc func(*testing.T, *testingkubemock.KubeMockServer)
}{
{
name: "SPDY protocol, version < 1.31",
version: &version.Info{
GitVersion: "v1.30.0",
},
name: "SPDY protocol, version < 1.31",
version: &version.Info{GitVersion: "v1.30.0"},
validateFunc: func(t *testing.T, kms *testingkubemock.KubeMockServer) {
// forward used SPDY to kubernetes API
require.EqualValues(t, 1, kms.KubePortforward.SPDY.Load())
require.EqualValues(t, 0, kms.KubePortforward.Websocket.Load())
require.EventuallyWithT(t, func(t *assert.CollectT) {
// forward used SPDY to kubernetes API
require.EqualValues(t, 1, kms.KubePortforward.SPDY.Load())
require.EqualValues(t, 0, kms.KubePortforward.Websocket.Load())
}, 5*time.Second, 100*time.Millisecond)
},
},
{
name: "Websocket protocol for clusters >=1.31",
version: &version.Info{
GitVersion: "v1.31.0",
},
name: "Websocket protocol for clusters >=1.31",
version: &version.Info{GitVersion: "v1.31.0"},
validateFunc: func(t *testing.T, kms *testingkubemock.KubeMockServer) {
// forward used SPDY over websocket to kubernetes API
require.EqualValues(t, 0, kms.KubePortforward.SPDY.Load())
require.EqualValues(t, 1, kms.KubePortforward.Websocket.Load())
require.EventuallyWithT(t, func(t *assert.CollectT) {
// forward used SPDY over websocket to kubernetes API
require.EqualValues(t, 0, kms.KubePortforward.SPDY.Load())
require.EqualValues(t, 1, kms.KubePortforward.Websocket.Load())
}, 5*time.Second, 100*time.Millisecond)
},
},
}
Expand All @@ -615,9 +615,8 @@ func TestPortForwardUnderlyingProtocol(t *testing.T) {
)
require.NoError(t, err)
t.Cleanup(func() { kubeMock.Close() })
t.Cleanup(func() {
tt.validateFunc(t, kubeMock)
})
t.Cleanup(func() { tt.validateFunc(t, kubeMock) })

// creates a Kubernetes service with a configured cluster pointing to mock api server
testCtx := SetupTestContext(
context.Background(),
Expand All @@ -626,7 +625,6 @@ func TestPortForwardUnderlyingProtocol(t *testing.T) {
Clusters: []KubeClusterConfig{{Name: kubeCluster, APIEndpoint: kubeMock.URL}},
},
)

t.Cleanup(func() { require.NoError(t, testCtx.Close()) })

// create a user with access to kubernetes (kubernetes_user and kubernetes_groups specified)
Expand Down
Loading