Skip to content
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

Jump to bottom

Switch image in gRPC probe tests to agnhost #115800

Merged
merged 3 commits into from Feb 18, 2023
Merged

Switch image in gRPC probe tests to agnhost #115800

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58ae449
Change etcd to agnhost
shogohida Feb 15, 2023
26f95f4
Fix arguments
shogohida Feb 18, 2023
7cbf007
Fix port number
shogohida Feb 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 9 additions & 19 deletions test/e2e/common/node/container_probe.go
View file
Open in desktop
Expand Up @@ -20,7 +20,6 @@ import (
"context"
"errors"
"fmt"
"net"
"net/url"
"strings"
"time"
Expand Down Expand Up @@ -525,7 +524,7 @@ var _ = SIGDescribe("Probing container", func() {
livenessProbe := &v1.Probe{
ProbeHandler: v1.ProbeHandler{
GRPC: &v1.GRPCAction{
Port: 2379,
Port: 5000,
Service: nil,
},
},
Expand All @@ -534,7 +533,7 @@ var _ = SIGDescribe("Probing container", func() {
FailureThreshold: 1,
}

pod := gRPCServerPodSpec(nil, livenessProbe, "etcd")
pod := gRPCServerPodSpec(nil, livenessProbe, "agnhost")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you run the test? You still hasn;t updated the port in liveness probe definition on the line 527

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh sorry about that. I changed it to 5000

RunLivenessTest(ctx, f, pod, 0, defaultObservationTimeout)
})

Expand All @@ -555,7 +554,7 @@ var _ = SIGDescribe("Probing container", func() {
TimeoutSeconds: 5, // default 1s can be pretty aggressive in CI environments with low resources
FailureThreshold: 1,
}
pod := gRPCServerPodSpec(nil, livenessProbe, "etcd")
pod := gRPCServerPodSpec(nil, livenessProbe, "agnhost")
RunLivenessTest(ctx, f, pod, 1, defaultObservationTimeout)
})

Expand Down Expand Up @@ -630,7 +629,7 @@ done
podClient := e2epod.NewPodClient(f)
terminationGracePeriod := int64(30)
script := `
_term() {
_term() {
Copy link
Contributor Author

@shogohida shogohida Feb 18, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blank space was deleted automatically by Visual Studio Code.

rm -f /tmp/ready
rm -f /tmp/liveness
sleep 20
Expand All @@ -641,7 +640,7 @@ trap _term SIGTERM
touch /tmp/ready
touch /tmp/liveness

while true; do
while true; do
Copy link
Contributor Author

@shogohida shogohida Feb 18, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blank space was deleted automatically by Visual Studio Code.

echo \"hello\"
sleep 10
done
Expand Down Expand Up @@ -1036,27 +1035,18 @@ func runReadinessFailTest(ctx context.Context, f *framework.Framework, pod *v1.P
}

func gRPCServerPodSpec(readinessProbe, livenessProbe *v1.Probe, containerName string) *v1.Pod {
etcdLocalhostAddress := "127.0.0.1"
if framework.TestContext.ClusterIsIPv6() {
etcdLocalhostAddress = "::1"
}
etcdURL := fmt.Sprintf("http://%s", net.JoinHostPort(etcdLocalhostAddress, "2379"))
return &v1.Pod{
ObjectMeta: metav1.ObjectMeta{Name: "test-grpc-" + string(uuid.NewUUID())},
Spec: v1.PodSpec{
Containers: []v1.Container{
{
Name: containerName,
Image: imageutils.GetE2EImage(imageutils.Etcd),
Image: imageutils.GetE2EImage(imageutils.Agnhost),
Command: []string{
"/usr/local/bin/etcd",
"--listen-client-urls",
"http://0.0.0.0:2379", //should listen on all addresses
"--advertise-client-urls",
etcdURL,
"/agnhost",
"grpc-health-checking",
},
// 2380 is an automatic peer URL
Ports: []v1.ContainerPort{{ContainerPort: int32(2379)}, {ContainerPort: int32(2380)}},
Ports: []v1.ContainerPort{{ContainerPort: int32(5000)}, {ContainerPort: int32(8080)}},
LivenessProbe: livenessProbe,
ReadinessProbe: readinessProbe,
},
Expand Down