mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-31 15:25:57 +00:00
Add Node IP IPv6 formatting in NodeAuthenticator tests
This commit is contained in:
parent
5c58620118
commit
2ae12e6345
@ -19,6 +19,7 @@ package auth
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
netutil "k8s.io/utils/net"
|
||||||
|
|
||||||
v1 "k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
@ -60,6 +61,7 @@ var _ = SIGDescribe("[Feature:NodeAuthenticator]", func() {
|
|||||||
pod := createNodeAuthTestPod(f)
|
pod := createNodeAuthTestPod(f)
|
||||||
for _, nodeIP := range nodeIPs {
|
for _, nodeIP := range nodeIPs {
|
||||||
// Anonymous authentication is disabled by default
|
// Anonymous authentication is disabled by default
|
||||||
|
nodeIP = getFormattedNodeIP(nodeIP)
|
||||||
result := framework.RunHostCmdOrDie(ns, pod.Name, fmt.Sprintf("curl -sIk -o /dev/null -w '%s' https://%s:%v/metrics", "%{http_code}", nodeIP, ports.KubeletPort))
|
result := framework.RunHostCmdOrDie(ns, pod.Name, fmt.Sprintf("curl -sIk -o /dev/null -w '%s' https://%s:%v/metrics", "%{http_code}", nodeIP, ports.KubeletPort))
|
||||||
gomega.Expect(result).To(gomega.Or(gomega.Equal("401"), gomega.Equal("403")), "the kubelet's main port 10250 should reject requests with no credentials")
|
gomega.Expect(result).To(gomega.Or(gomega.Equal("401"), gomega.Equal("403")), "the kubelet's main port 10250 should reject requests with no credentials")
|
||||||
}
|
}
|
||||||
@ -81,6 +83,7 @@ var _ = SIGDescribe("[Feature:NodeAuthenticator]", func() {
|
|||||||
pod := createNodeAuthTestPod(f)
|
pod := createNodeAuthTestPod(f)
|
||||||
|
|
||||||
for _, nodeIP := range nodeIPs {
|
for _, nodeIP := range nodeIPs {
|
||||||
|
nodeIP = getFormattedNodeIP(nodeIP)
|
||||||
result := framework.RunHostCmdOrDie(ns,
|
result := framework.RunHostCmdOrDie(ns,
|
||||||
pod.Name,
|
pod.Name,
|
||||||
fmt.Sprintf("curl -sIk -o /dev/null -w '%s' --header \"Authorization: Bearer `%s`\" https://%s:%v/metrics",
|
fmt.Sprintf("curl -sIk -o /dev/null -w '%s' --header \"Authorization: Bearer `%s`\" https://%s:%v/metrics",
|
||||||
@ -92,6 +95,13 @@ var _ = SIGDescribe("[Feature:NodeAuthenticator]", func() {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
func getFormattedNodeIP(nodeIP string) string {
|
||||||
|
if netutil.IsIPv6String(nodeIP) {
|
||||||
|
return fmt.Sprintf("[%s]", nodeIP)
|
||||||
|
}
|
||||||
|
return nodeIP
|
||||||
|
}
|
||||||
|
|
||||||
func createNodeAuthTestPod(f *framework.Framework) *v1.Pod {
|
func createNodeAuthTestPod(f *framework.Framework) *v1.Pod {
|
||||||
pod := e2epod.NewAgnhostPod(f.Namespace.Name, "agnhost-pod", nil, nil, nil)
|
pod := e2epod.NewAgnhostPod(f.Namespace.Name, "agnhost-pod", nil, nil, nil)
|
||||||
pod.ObjectMeta.GenerateName = "test-node-authn-"
|
pod.ObjectMeta.GenerateName = "test-node-authn-"
|
||||||
|
Loading…
Reference in New Issue
Block a user