Skip to content

[release-4.5] Bug 1828858: use net/http instead of client-go for e2e PDB test #25635

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

Merged
openshift-merge-robot merged 1 commit into from
Nov 19, 2020
Merged

[release-4.5] Bug 1828858: use net/http instead of client-go for e2e PDB test #25635

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 19 additions & 25 deletions test/e2e/upgrade/service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"context"
"fmt"
"io/ioutil"
"net"
"net/http"
"strconv"
Expand All @@ -14,10 +15,8 @@ import (
"github.com/openshift/origin/pkg/monitor"
"github.com/openshift/origin/test/extended/util/disruption"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/events"
"k8s.io/kubernetes/test/e2e/framework"
e2enetwork "k8s.io/kubernetes/test/e2e/framework/network"
Expand Down Expand Up @@ -151,29 +150,27 @@ func (t *UpgradeTest) Teardown(f *framework.Framework) {
func startEndpointMonitoring(ctx context.Context, m *monitor.Monitor, svc *v1.Service, r events.EventRecorder) error {
tcpIngressIP := service.GetIngressPoint(&svc.Status.LoadBalancer.Ingress[0])
svcPort := int(svc.Spec.Ports[0].Port)

url := fmt.Sprintf("http://%s/echo?msg=Hello", net.JoinHostPort(tcpIngressIP, strconv.Itoa(svcPort)))
// this client reuses connections and detects abrupt breaks
continuousClient, err := rest.UnversionedRESTClientFor(&rest.Config{
Host: fmt.Sprintf("http://%s", net.JoinHostPort(tcpIngressIP, strconv.Itoa(svcPort))),
continuousClient := &http.Client{
Timeout: 10 * time.Second,
Transport: &http.Transport{
Dial: (&net.Dialer{
Timeout: 15 * time.Second,
}).Dial,
TLSHandshakeTimeout: 15 * time.Second,
},
ContentConfig: rest.ContentConfig{
NegotiatedSerializer: runtime.NewSimpleNegotiatedSerializer(scheme.Codecs.SupportedMediaTypes()[0]),
},
})
if err != nil {
return err
}

m.AddSampler(
monitor.StartSampling(ctx, m, time.Second, func(previous bool) (condition *monitor.Condition, next bool) {
data, err := continuousClient.Get().AbsPath("echo").Param("msg", "Hello").DoRaw(ctx)
if err == nil && !bytes.Contains(data, []byte("Hello")) {
err = fmt.Errorf("service returned success but did not contain the correct body contents: %q", string(data))
resp, err := continuousClient.Get(url)
if err == nil {
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
if err == nil && !bytes.Contains(body, []byte("Hello")) {
err = fmt.Errorf("service returned success but did not contain the correct body contents: %q", string(body))
}
}
switch {
case err == nil && !previous:
Expand Down Expand Up @@ -202,8 +199,7 @@ func startEndpointMonitoring(ctx context.Context, m *monitor.Monitor, svc *v1.Se
)

// this client creates fresh connections and detects failure to establish connections
client, err := rest.UnversionedRESTClientFor(&rest.Config{
Host: fmt.Sprintf("http://%s", net.JoinHostPort(tcpIngressIP, strconv.Itoa(svcPort))),
client := &http.Client{
Timeout: 10 * time.Second,
Transport: &http.Transport{
Dial: (&net.Dialer{
Expand All @@ -214,18 +210,16 @@ func startEndpointMonitoring(ctx context.Context, m *monitor.Monitor, svc *v1.Se
IdleConnTimeout: 15 * time.Second,
DisableKeepAlives: true,
},
ContentConfig: rest.ContentConfig{
NegotiatedSerializer: runtime.NewSimpleNegotiatedSerializer(scheme.Codecs.SupportedMediaTypes()[0]),
},
})
if err != nil {
return err
}
m.AddSampler(
monitor.StartSampling(ctx, m, time.Second, func(previous bool) (condition *monitor.Condition, next bool) {
data, err := client.Get().AbsPath("echo").Param("msg", "Hello").DoRaw(ctx)
if err == nil && !bytes.Contains(data, []byte("Hello")) {
err = fmt.Errorf("service returned success but did not contain the correct body contents: %q", string(data))
resp, err := client.Get(url)
if err == nil {
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
if err == nil && !bytes.Contains(body, []byte("Hello")) {
err = fmt.Errorf("service returned success but did not contain the correct body contents: %q", string(body))
}
}
switch {
case err == nil && !previous:
Expand Down