github-personal/kubernetes
1
0
Fork 0
mirror of https://github.com/outbackdingo/kubernetes.git synced 2026-01-28 10:19:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #132905 from ylink-lfs/chore/intptr_removal

Browse Source 
chore: intPtr utility removal with ptr.To
This commit is contained in:
Kubernetes Prow Robot
2025-07-12 16:31:43 -07:00
committed by GitHub
parent 37a7addd0c 5971802fdd
commit 3fc199b059
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/integration/serving/serving_test.go
View File

@@ -42,6 +42,7 @@ import (
kubectrlmgrtesting "k8s.io/kubernetes/cmd/kube-controller-manager/app/testing"
kubeschedulertesting "k8s.io/kubernetes/cmd/kube-scheduler/app/testing"
"k8s.io/kubernetes/test/integration/framework"
"k8s.io/utils/ptr"
)
type componentTester interface {
@@ -191,30 +192,30 @@ func testComponentWithSecureServing(t *testing.T, tester componentTester, kubeco
{"/healthz without authn/authz", []string{
"--kubeconfig", kubeconfig,
"--leader-elect=false",
}, "/healthz", true, false, intPtr(http.StatusOK)},
}, "/healthz", true, false, ptr.To(http.StatusOK)},
{"/metrics without authn/authz", []string{
"--kubeconfig", kubeconfig,
"--leader-elect=false",
}, "/metrics", true, false, intPtr(http.StatusForbidden)},
}, "/metrics", true, false, ptr.To(http.StatusForbidden)},
{"authorization skipped for /healthz with authn/authz", []string{
"--authentication-kubeconfig", kubeconfig,
"--authorization-kubeconfig", kubeconfig,
"--kubeconfig", kubeconfig,
"--leader-elect=false",
}, "/healthz", false, false, intPtr(http.StatusOK)},
}, "/healthz", false, false, ptr.To(http.StatusOK)},
{"authorization skipped for /healthz with BROKEN authn/authz", []string{
"--authentication-skip-lookup", // to survive inaccessible extensions-apiserver-authentication configmap
"--authentication-kubeconfig", brokenKubeconfig,
"--authorization-kubeconfig", brokenKubeconfig,
"--kubeconfig", kubeconfig,
"--leader-elect=false",
}, "/healthz", false, false, intPtr(http.StatusOK)},
}, "/healthz", false, false, ptr.To(http.StatusOK)},
{"not authorized /metrics with BROKEN authn/authz", []string{
"--authentication-kubeconfig", kubeconfig,
"--authorization-kubeconfig", brokenKubeconfig,
"--kubeconfig", kubeconfig,
"--leader-elect=false",
}, "/metrics", false, false, intPtr(http.StatusInternalServerError)},
}, "/metrics", false, false, ptr.To(http.StatusInternalServerError)},
{"always-allowed /metrics with BROKEN authn/authz", []string{
"--authentication-skip-lookup", // to survive inaccessible extensions-apiserver-authentication configmap
"--authentication-kubeconfig", brokenKubeconfig,
@@ -222,7 +223,7 @@ func testComponentWithSecureServing(t *testing.T, tester componentTester, kubeco
"--authorization-always-allow-paths", "/healthz,/metrics",
"--kubeconfig", kubeconfig,
"--leader-elect=false",
}, "/metrics", false, false, intPtr(http.StatusOK)},
}, "/metrics", false, false, ptr.To(http.StatusOK)},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
@@ -284,10 +285,6 @@ func testComponentWithSecureServing(t *testing.T, tester componentTester, kubeco
}
}
func intPtr(x int) *int {
return &x
}
func fakeCloudProviderFactory(io.Reader) (cloudprovider.Interface, error) {
return &fake.Cloud{
DisableRoutes: true, // disable routes for server tests, otherwise --cluster-cidr is required
@@ -363,7 +360,7 @@ users:
"--authorization-always-allow-paths", "/statusz",
"--kubeconfig", apiserverConfig.Name(),
"--leader-elect=false",
}, "/statusz", false, false, intPtr(http.StatusOK)},
}, "/statusz", false, false, ptr.To(http.StatusOK)},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {