github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix arguments

Browse Source 
Signed-off-by: Shogo Hida <shogo.hida@gmail.com>
This commit is contained in:
Shogo Hida 2023-02-18 09:51:17 +09:00
parent 58ae449604
commit 26f95f475a
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/e2e/common/node/container_probe.go
View File

@ -20,7 +20,6 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"net"
"net/url" "net/url"
"strings" "strings"
"time" "time"
@ -525,7 +524,7 @@ var _ = SIGDescribe("Probing container", func() {
livenessProbe := &v1.Probe{ livenessProbe := &v1.Probe{
ProbeHandler: v1.ProbeHandler{ ProbeHandler: v1.ProbeHandler{
GRPC: &v1.GRPCAction{ GRPC: &v1.GRPCAction{
Port: 6379, Port: 2379,
Service: nil, Service: nil,
}, },
}, },
@ -548,7 +547,7 @@ var _ = SIGDescribe("Probing container", func() {
livenessProbe := &v1.Probe{ livenessProbe := &v1.Probe{
ProbeHandler: v1.ProbeHandler{ ProbeHandler: v1.ProbeHandler{
GRPC: &v1.GRPCAction{ GRPC: &v1.GRPCAction{
Port: 6333, // this port is wrong Port: 2333, // this port is wrong
}, },
}, },
InitialDelaySeconds: probeTestInitialDelaySeconds * 4, InitialDelaySeconds: probeTestInitialDelaySeconds * 4,
@ -1036,11 +1035,6 @@ func runReadinessFailTest(ctx context.Context, f *framework.Framework, pod *v1.P
} }
func gRPCServerPodSpec(readinessProbe, livenessProbe *v1.Probe, containerName string) *v1.Pod { func gRPCServerPodSpec(readinessProbe, livenessProbe *v1.Probe, containerName string) *v1.Pod {
agnhostLocalhostAddress := "127.0.0.1"
if framework.TestContext.ClusterIsIPv6() {
agnhostLocalhostAddress = "::1"
}
agnhostURL := fmt.Sprintf("http://%s", net.JoinHostPort(agnhostLocalhostAddress, "6379"))
return &v1.Pod{ return &v1.Pod{
ObjectMeta: metav1.ObjectMeta{Name: "test-grpc-" + string(uuid.NewUUID())}, ObjectMeta: metav1.ObjectMeta{Name: "test-grpc-" + string(uuid.NewUUID())},
Spec: v1.PodSpec{ Spec: v1.PodSpec{
@ -1049,13 +1043,10 @@ func gRPCServerPodSpec(readinessProbe, livenessProbe *v1.Probe, containerName st
Name: containerName, Name: containerName,
Image: imageutils.GetE2EImage(imageutils.Agnhost), Image: imageutils.GetE2EImage(imageutils.Agnhost),
Command: []string{ Command: []string{
"/usr/local/bin/agnhost", "/agnhost",
"--listen-client-urls", "grpc-health-checking",
"http://0.0.0.0:6379", //should listen on all addresses
"--advertise-client-urls",
agnhostURL,
}, },
Ports: []v1.ContainerPort{{ContainerPort: int32(6379)}}, Ports: []v1.ContainerPort{{ContainerPort: int32(5000)}, {ContainerPort: int32(8080)}},
LivenessProbe: livenessProbe, LivenessProbe: livenessProbe,
ReadinessProbe: readinessProbe, ReadinessProbe: readinessProbe,
}, },