github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

test(network): replace calls to e2erc.RunRC with Deployments in service proxying tests

Browse Source 
See #119021
This commit is contained in:
Elizabeth Martin Campos
2025-02-18 17:41:12 +01:00
parent 4e7e14203d
commit cd0df9786e
1 changed files with 82 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
test/e2e/network/proxy.go
View File

@@ -29,6 +29,7 @@ import (
"sync"
"time"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -38,11 +39,10 @@ import (
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/transport"
"k8s.io/kubernetes/test/e2e/framework"
e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment"
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
"k8s.io/kubernetes/test/e2e/network/common"
testutils "k8s.io/kubernetes/test/utils"
imageutils "k8s.io/kubernetes/test/utils/image"
admissionapi "k8s.io/pod-security-admission/api"
@@ -133,52 +133,95 @@ var _ = common.SIGDescribe("Proxy", func() {
}, metav1.CreateOptions{})
framework.ExpectNoError(err)
// Make an RC with a single pod. The 'porter' image is
// Make a deployment with a single pod. The 'porter' image is
// a simple server which serves the values of the
// environmental variables below.
ginkgo.By("starting an echo server on multiple ports")
pods := []*v1.Pod{}
cfg := testutils.RCConfig{
Client: f.ClientSet,
Image: imageutils.GetE2EImage(imageutils.Agnhost),
Command: []string{"/agnhost", "porter"},
Name: service.Name,
Namespace: f.Namespace.Name,
Replicas: 1,
PollInterval: time.Second,
Env: map[string]string{
"SERVE_PORT_80": `<a href="/rewriteme">test</a>`,
"SERVE_PORT_1080": `<a href="/rewriteme">test</a>`,
"SERVE_PORT_160": "foo",
"SERVE_PORT_162": "bar",
"SERVE_TLS_PORT_443": `<a href="/tlsrewriteme">test</a>`,
"SERVE_TLS_PORT_460": `tls baz`,
"SERVE_TLS_PORT_462": `tls qux`,
deploymentConfig := e2edeployment.NewDeployment(service.Name,
1,
labels,
service.Name,
imageutils.GetE2EImage(imageutils.Agnhost),
appsv1.RecreateDeploymentStrategyType)
deploymentConfig.Spec.Template.Spec.Containers[0].Command = []string{"/agnhost", "porter"}
deploymentConfig.Spec.Template.Spec.Containers[0].Env = []v1.EnvVar{
{
Name: "SERVE_PORT_80",
Value: `<a href="/rewriteme">test</a>`,
},
Ports: map[string]int{
"dest1": 160,
"dest2": 162,
"tlsdest1": 460,
"tlsdest2": 462,
{
Name: "SERVE_PORT_1080",
Value: `<a href="/rewriteme">test</a>`,
},
ReadinessProbe: &v1.Probe{
ProbeHandler: v1.ProbeHandler{
HTTPGet: &v1.HTTPGetAction{
Port: intstr.FromInt32(80),
},
},
InitialDelaySeconds: 1,
TimeoutSeconds: 5,
PeriodSeconds: 10,
{
Name: "SERVE_PORT_160",
Value: "foo",
},
{
Name: "SERVE_PORT_162",
Value: "bar",
},
{
Name: "SERVE_TLS_PORT_443",
Value: `<a href="/tlsrewriteme">test</a>`,
},
{
Name: "SERVE_TLS_PORT_460",
Value: "tls baz",
},
{
Name: "SERVE_TLS_PORT_462",
Value: "tls qux",
},
Labels: labels,
CreatedPods: &pods,
}
err = e2erc.RunRC(ctx, cfg)
deploymentConfig.Spec.Template.Spec.Containers[0].Ports = []v1.ContainerPort{
{
ContainerPort: 80,
},
{
Name: "dest1",
ContainerPort: 160,
},
{
Name: "dest2",
ContainerPort: 162,
},
{
Name: "tlsdest1",
ContainerPort: 460,
},
{
Name: "tlsdest2",
ContainerPort: 462,
},
}
deploymentConfig.Spec.Template.Spec.Containers[0].ReadinessProbe = &v1.Probe{
ProbeHandler: v1.ProbeHandler{
HTTPGet: &v1.HTTPGetAction{
Port: intstr.FromInt32(80),
},
},
InitialDelaySeconds: 1,
TimeoutSeconds: 5,
PeriodSeconds: 10,
}
deployment, err := f.ClientSet.AppsV1().Deployments(f.Namespace.Name).Create(ctx,
deploymentConfig,
metav1.CreateOptions{})
framework.ExpectNoError(err)
ginkgo.DeferCleanup(e2erc.DeleteRCAndWaitForGC, f.ClientSet, f.Namespace.Name, cfg.Name)
ginkgo.DeferCleanup(func(ctx context.Context, name string) error {
return f.ClientSet.AppsV1().Deployments(f.Namespace.Name).Delete(ctx, name, metav1.DeleteOptions{})
}, deployment.Name)
err = e2edeployment.WaitForDeploymentComplete(f.ClientSet, deployment)
framework.ExpectNoError(err)
podList, err := e2edeployment.GetPodsForDeployment(ctx, f.ClientSet, deployment)
framework.ExpectNoError(err)
pods := podList.Items
err = waitForEndpoint(ctx, f.ClientSet, f.Namespace.Name, service.Name)
framework.ExpectNoError(err)