Skip to content

Commit 28047b4

Browse files
committed
Fix arguments
Signed-off-by: Shogo Hida <shogo.hida@gmail.com>
1 parent 57a5834 commit 28047b4

1 file changed

Lines changed: 5 additions & 14 deletions

File tree

‎test/e2e/common/node/container_probe.go‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"context"
2121
"errors"
2222
"fmt"
23-
"net"
2423
"net/url"
2524
"strings"
2625
"time"
@@ -525,7 +524,7 @@ var _ = SIGDescribe("Probing container", func() {
525524
livenessProbe := &v1.Probe{
526525
ProbeHandler: v1.ProbeHandler{
527526
GRPC: &v1.GRPCAction{
528-
Port: 6379,
527+
Port: 2379,
529528
Service: nil,
530529
},
531530
},
@@ -548,7 +547,7 @@ var _ = SIGDescribe("Probing container", func() {
548547
livenessProbe := &v1.Probe{
549548
ProbeHandler: v1.ProbeHandler{
550549
GRPC: &v1.GRPCAction{
551-
Port: 6333, // this port is wrong
550+
Port: 2333, // this port is wrong
552551
},
553552
},
554553
InitialDelaySeconds: probeTestInitialDelaySeconds * 4,
@@ -1036,11 +1035,6 @@ func runReadinessFailTest(ctx context.Context, f *framework.Framework, pod *v1.P
10361035
}
10371036

10381037
func gRPCServerPodSpec(readinessProbe, livenessProbe *v1.Probe, containerName string) *v1.Pod {
1039-
agnhostLocalhostAddress := "127.0.0.1"
1040-
if framework.TestContext.ClusterIsIPv6() {
1041-
agnhostLocalhostAddress = "::1"
1042-
}
1043-
agnhostURL := fmt.Sprintf("http://%s", net.JoinHostPort(agnhostLocalhostAddress, "6379"))
10441038
return &v1.Pod{
10451039
ObjectMeta: metav1.ObjectMeta{Name: "test-grpc-" + string(uuid.NewUUID())},
10461040
Spec: v1.PodSpec{
@@ -1049,13 +1043,10 @@ func gRPCServerPodSpec(readinessProbe, livenessProbe *v1.Probe, containerName st
10491043
Name: containerName,
10501044
Image: imageutils.GetE2EImage(imageutils.Agnhost),
10511045
Command: []string{
1052-
"/usr/local/bin/agnhost",
1053-
"--listen-client-urls",
1054-
"http://0.0.0.0:6379", //should listen on all addresses
1055-
"--advertise-client-urls",
1056-
agnhostURL,
1046+
"/agnhost",
1047+
"grpc-health-checking",
10571048
},
1058-
Ports: []v1.ContainerPort{{ContainerPort: int32(6379)}},
1049+
Ports: []v1.ContainerPort{{ContainerPort: int32(5000)}, {ContainerPort: int32(8080)}},
10591050
LivenessProbe: livenessProbe,
10601051
ReadinessProbe: readinessProbe,
10611052
},

0 commit comments

Comments
 (0)