github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #130080 from elizabeth-dev/replace-network-e2e-replicationcontrollers-2

Browse Source 
test(network): replace RCs with Deployments in util function StartServeHostnameService
This commit is contained in:
Kubernetes Prow Robot 2025-02-16 09:44:21 -08:00 committed by GitHub
commit e7b03ea0d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 68 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
test/conformance/testdata/conformance.yaml vendored
View File

@ -1865,9 +1865,9 @@
description: 'Create a service of type "NodePort" and provide service port and protocol. description: 'Create a service of type "NodePort" and provide service port and protocol.
Service''s sessionAffinity is set to "ClientIP". Service creation MUST be successful Service''s sessionAffinity is set to "ClientIP". Service creation MUST be successful
by assigning a "ClusterIP" to the service and allocating NodePort on all the nodes. by assigning a "ClusterIP" to the service and allocating NodePort on all the nodes.
Create a Replication Controller to ensure that 3 pods are running and are targeted Create a Deployment to ensure that 3 pods are running and are targeted by the
by the service to serve hostname of the pod when requests are sent to the service. service to serve hostname of the pod when requests are sent to the service. Create
Create another pod to make requests to the service. Update the service''s sessionAffinity another pod to make requests to the service. Update the service''s sessionAffinity
to "None". Service update MUST be successful. When a requests are made to the to "None". Service update MUST be successful. When a requests are made to the
service on node''s IP and NodePort, service MUST be able serve the hostname from service on node''s IP and NodePort, service MUST be able serve the hostname from
any pod of the replica. When service''s sessionAffinily is updated back to "ClientIP", any pod of the replica. When service''s sessionAffinily is updated back to "ClientIP",
@ -1882,15 +1882,15 @@
service with type clusterIP [LinuxOnly] [Conformance]' service with type clusterIP [LinuxOnly] [Conformance]'
description: 'Create a service of type "ClusterIP". Service''s sessionAffinity is description: 'Create a service of type "ClusterIP". Service''s sessionAffinity is
set to "ClientIP". Service creation MUST be successful by assigning "ClusterIP" set to "ClientIP". Service creation MUST be successful by assigning "ClusterIP"
to the service. Create a Replication Controller to ensure that 3 pods are running to the service. Create a Deployment to ensure that 3 pods are running and are
and are targeted by the service to serve hostname of the pod when requests are targeted by the service to serve hostname of the pod when requests are sent to
sent to the service. Create another pod to make requests to the service. Update the service. Create another pod to make requests to the service. Update the service''s
the service''s sessionAffinity to "None". Service update MUST be successful. When sessionAffinity to "None". Service update MUST be successful. When a requests
a requests are made to the service, it MUST be able serve the hostname from any are made to the service, it MUST be able serve the hostname from any pod of the
pod of the replica. When service''s sessionAffinily is updated back to "ClientIP", replica. When service''s sessionAffinily is updated back to "ClientIP", service
service MUST serve the hostname from the same pod of the replica for all consecutive MUST serve the hostname from the same pod of the replica for all consecutive requests.
requests. Service MUST be reachable over serviceName and the ClusterIP on servicePort. Service MUST be reachable over serviceName and the ClusterIP on servicePort. [LinuxOnly]:
[LinuxOnly]: Windows does not support session affinity.' Windows does not support session affinity.'
release: v1.19 release: v1.19
file: test/e2e/network/service.go file: test/e2e/network/service.go
- testname: Service, complete ServiceStatus lifecycle - testname: Service, complete ServiceStatus lifecycle
@ -1922,13 +1922,13 @@
description: 'Create a service of type "NodePort" and provide service port and protocol. description: 'Create a service of type "NodePort" and provide service port and protocol.
Service''s sessionAffinity is set to "ClientIP". Service creation MUST be successful Service''s sessionAffinity is set to "ClientIP". Service creation MUST be successful
by assigning a "ClusterIP" to service and allocating NodePort on all nodes. Create by assigning a "ClusterIP" to service and allocating NodePort on all nodes. Create
a Replication Controller to ensure that 3 pods are running and are targeted by a Deployment to ensure that 3 pods are running and are targeted by the service
the service to serve hostname of the pod when a requests are sent to the service. to serve hostname of the pod when a requests are sent to the service. Create another
Create another pod to make requests to the service on node''s IP and NodePort. pod to make requests to the service on node''s IP and NodePort. Service MUST serve
Service MUST serve the hostname from the same pod of the replica for all consecutive the hostname from the same pod of the replica for all consecutive requests. Service
requests. Service MUST be reachable over serviceName and the ClusterIP on servicePort. MUST be reachable over serviceName and the ClusterIP on servicePort. Service MUST
Service MUST also be reachable over node''s IP on NodePort. [LinuxOnly]: Windows also be reachable over node''s IP on NodePort. [LinuxOnly]: Windows does not support
does not support session affinity.' session affinity.'
release: v1.19 release: v1.19
file: test/e2e/network/service.go file: test/e2e/network/service.go
- testname: Service, ClusterIP type, session affinity to ClientIP - testname: Service, ClusterIP type, session affinity to ClientIP
@ -1936,10 +1936,10 @@
with type clusterIP [LinuxOnly] [Conformance]' with type clusterIP [LinuxOnly] [Conformance]'
description: 'Create a service of type "ClusterIP". Service''s sessionAffinity is description: 'Create a service of type "ClusterIP". Service''s sessionAffinity is
set to "ClientIP". Service creation MUST be successful by assigning "ClusterIP" set to "ClientIP". Service creation MUST be successful by assigning "ClusterIP"
to the service. Create a Replication Controller to ensure that 3 pods are running to the service. Create a Deployment to ensure that 3 pods are running and are
and are targeted by the service to serve hostname of the pod when requests are targeted by the service to serve hostname of the pod when requests are sent to
sent to the service. Create another pod to make requests to the service. Service the service. Create another pod to make requests to the service. Service MUST
MUST serve the hostname from the same pod of the replica for all consecutive requests. serve the hostname from the same pod of the replica for all consecutive requests.
Service MUST be reachable over serviceName and the ClusterIP on servicePort. [LinuxOnly]: Service MUST be reachable over serviceName and the ClusterIP on servicePort. [LinuxOnly]:
Windows does not support session affinity.' Windows does not support session affinity.'
release: v1.19 release: v1.19

92
test/e2e/network/service.go
View File

@ -64,11 +64,9 @@ import (
e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2enode "k8s.io/kubernetes/test/e2e/framework/node"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2eoutput "k8s.io/kubernetes/test/e2e/framework/pod/output" e2eoutput "k8s.io/kubernetes/test/e2e/framework/pod/output"
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
e2eservice "k8s.io/kubernetes/test/e2e/framework/service" e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"k8s.io/kubernetes/test/e2e/network/common" "k8s.io/kubernetes/test/e2e/network/common"
testutils "k8s.io/kubernetes/test/utils"
imageutils "k8s.io/kubernetes/test/utils/image" imageutils "k8s.io/kubernetes/test/utils/image"
"github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2"
@ -264,7 +262,7 @@ func checkAffinityFailed(tracker affinityTracker, err string) {
framework.Fail(err) framework.Fail(err)
} }
// StartServeHostnameService creates a replication controller that serves its // StartServeHostnameService creates a deployment that serves its
// hostname and a service on top of it. // hostname and a service on top of it.
func StartServeHostnameService(ctx context.Context, c clientset.Interface, svc *v1.Service, ns string, replicas int) ([]string, string, error) { func StartServeHostnameService(ctx context.Context, c clientset.Interface, svc *v1.Service, ns string, replicas int) ([]string, string, error) {
podNames := make([]string, replicas) podNames := make([]string, replicas)
@ -275,31 +273,28 @@ func StartServeHostnameService(ctx context.Context, c clientset.Interface, svc *
return podNames, "", err return podNames, "", err
} }
var createdPods []*v1.Pod deploymentConfig := e2edeployment.NewDeployment(name,
maxContainerFailures := 0 int32(replicas),
config := testutils.RCConfig{ map[string]string{"name": name},
Client: c, name,
Image: imageutils.GetE2EImage(imageutils.Agnhost), imageutils.GetE2EImage(imageutils.Agnhost),
Command: []string{"/agnhost", "serve-hostname"}, appsv1.RecreateDeploymentStrategyType)
Name: name, deploymentConfig.Spec.Template.Spec.Containers[0].Command = []string{"/agnhost", "serve-hostname"}
Namespace: ns, deployment, err := c.AppsV1().Deployments(ns).Create(ctx, deploymentConfig, metav1.CreateOptions{})
PollInterval: 3 * time.Second, framework.ExpectNoError(err, "failed to create deployment %s in namespace %s", name, ns)
Timeout: framework.PodReadyBeforeTimeout,
Replicas: replicas, err = e2edeployment.WaitForDeploymentComplete(c, deployment)
CreatedPods: &createdPods, framework.ExpectNoError(err, "failed to wait for deployment %s in namespace %s", name, ns)
MaxContainerFailures: &maxContainerFailures,
} pods, err := e2edeployment.GetPodsForDeployment(ctx, c, deployment)
err = e2erc.RunRC(ctx, config) framework.ExpectNoError(err, "failed to get pods for deployment %s in namespace %s", name, ns)
if err != nil {
return podNames, "", err if len(pods.Items) != replicas {
return podNames, "", fmt.Errorf("incorrect number of running pods: %v", len(pods.Items))
} }
if len(createdPods) != replicas { for i := range pods.Items {
return podNames, "", fmt.Errorf("incorrect number of running pods: %v", len(createdPods)) podNames[i] = pods.Items[i].ObjectMeta.Name
}
for i := range createdPods {
podNames[i] = createdPods[i].ObjectMeta.Name
} }
sort.StringSlice(podNames).Sort() sort.StringSlice(podNames).Sort()
@ -316,7 +311,7 @@ func StartServeHostnameService(ctx context.Context, c clientset.Interface, svc *
// StopServeHostnameService stops the given service. // StopServeHostnameService stops the given service.
func StopServeHostnameService(ctx context.Context, clientset clientset.Interface, ns, name string) error { func StopServeHostnameService(ctx context.Context, clientset clientset.Interface, ns, name string) error {
if err := e2erc.DeleteRCAndWaitForGC(ctx, clientset, ns, name); err != nil { if err := clientset.AppsV1().Deployments(ns).Delete(ctx, name, metav1.DeleteOptions{}); err != nil {
return err return err
} }
if err := clientset.CoreV1().Services(ns).Delete(ctx, name, metav1.DeleteOptions{}); err != nil { if err := clientset.CoreV1().Services(ns).Delete(ctx, name, metav1.DeleteOptions{}); err != nil {
@ -1101,10 +1096,10 @@ var _ = common.SIGDescribe("Services", func() {
ginkgo.By("creating " + svc1 + " in namespace " + ns) ginkgo.By("creating " + svc1 + " in namespace " + ns)
podNames1, svc1IP, err := StartServeHostnameService(ctx, cs, getServeHostnameService(svc1), ns, numPods) podNames1, svc1IP, err := StartServeHostnameService(ctx, cs, getServeHostnameService(svc1), ns, numPods)
framework.ExpectNoError(err, "failed to create replication controller with service: %s in the namespace: %s", svc1, ns) framework.ExpectNoError(err, "failed to create deployment with service: %s in the namespace: %s", svc1, ns)
ginkgo.By("creating " + svc2 + " in namespace " + ns) ginkgo.By("creating " + svc2 + " in namespace " + ns)
podNames2, svc2IP, err := StartServeHostnameService(ctx, cs, getServeHostnameService(svc2), ns, numPods) podNames2, svc2IP, err := StartServeHostnameService(ctx, cs, getServeHostnameService(svc2), ns, numPods)
framework.ExpectNoError(err, "failed to create replication controller with service: %s in the namespace: %s", svc2, ns) framework.ExpectNoError(err, "failed to create deployment with service: %s in the namespace: %s", svc2, ns)
ginkgo.By("verifying service " + svc1 + " is up") ginkgo.By("verifying service " + svc1 + " is up")
framework.ExpectNoError(verifyServeHostnameServiceUp(ctx, cs, ns, podNames1, svc1IP, servicePort)) framework.ExpectNoError(verifyServeHostnameServiceUp(ctx, cs, ns, podNames1, svc1IP, servicePort))
@ -1124,7 +1119,7 @@ var _ = common.SIGDescribe("Services", func() {
// Start another service and verify both are up. // Start another service and verify both are up.
ginkgo.By("creating service " + svc3 + " in namespace " + ns) ginkgo.By("creating service " + svc3 + " in namespace " + ns)
podNames3, svc3IP, err := StartServeHostnameService(ctx, cs, getServeHostnameService(svc3), ns, numPods) podNames3, svc3IP, err := StartServeHostnameService(ctx, cs, getServeHostnameService(svc3), ns, numPods)
framework.ExpectNoError(err, "failed to create replication controller with service: %s in the namespace: %s", svc3, ns) framework.ExpectNoError(err, "failed to create deployment with service: %s in the namespace: %s", svc3, ns)
if svc2IP == svc3IP { if svc2IP == svc3IP {
framework.Failf("service IPs conflict: %v", svc2IP) framework.Failf("service IPs conflict: %v", svc2IP)
@ -1186,11 +1181,11 @@ var _ = common.SIGDescribe("Services", func() {
ginkgo.DeferCleanup(StopServeHostnameService, f.ClientSet, ns, svc1) ginkgo.DeferCleanup(StopServeHostnameService, f.ClientSet, ns, svc1)
podNames1, svc1IP, err := StartServeHostnameService(ctx, cs, getServeHostnameService(svc1), ns, numPods) podNames1, svc1IP, err := StartServeHostnameService(ctx, cs, getServeHostnameService(svc1), ns, numPods)
framework.ExpectNoError(err, "failed to create replication controller with service: %s in the namespace: %s", svc1, ns) framework.ExpectNoError(err, "failed to create deployment with service: %s in the namespace: %s", svc1, ns)
ginkgo.DeferCleanup(StopServeHostnameService, f.ClientSet, ns, svc2) ginkgo.DeferCleanup(StopServeHostnameService, f.ClientSet, ns, svc2)
podNames2, svc2IP, err := StartServeHostnameService(ctx, cs, getServeHostnameService(svc2), ns, numPods) podNames2, svc2IP, err := StartServeHostnameService(ctx, cs, getServeHostnameService(svc2), ns, numPods)
framework.ExpectNoError(err, "failed to create replication controller with service: %s in the namespace: %s", svc2, ns) framework.ExpectNoError(err, "failed to create deployment with service: %s in the namespace: %s", svc2, ns)
if svc1IP == svc2IP { if svc1IP == svc2IP {
framework.Failf("VIPs conflict: %v", svc1IP) framework.Failf("VIPs conflict: %v", svc1IP)
@ -1219,7 +1214,7 @@ var _ = common.SIGDescribe("Services", func() {
ginkgo.DeferCleanup(StopServeHostnameService, f.ClientSet, ns, svc1) ginkgo.DeferCleanup(StopServeHostnameService, f.ClientSet, ns, svc1)
podNames1, svc1IP, err := StartServeHostnameService(ctx, cs, getServeHostnameService(svc1), ns, numPods) podNames1, svc1IP, err := StartServeHostnameService(ctx, cs, getServeHostnameService(svc1), ns, numPods)
framework.ExpectNoError(err, "failed to create replication controller with service: %s in the namespace: %s", svc1, ns) framework.ExpectNoError(err, "failed to create deployment with service: %s in the namespace: %s", svc1, ns)
framework.ExpectNoError(verifyServeHostnameServiceUp(ctx, cs, ns, podNames1, svc1IP, servicePort)) framework.ExpectNoError(verifyServeHostnameServiceUp(ctx, cs, ns, podNames1, svc1IP, servicePort))
@ -1237,7 +1232,7 @@ var _ = common.SIGDescribe("Services", func() {
// Create a new service and check if it's not reusing IP. // Create a new service and check if it's not reusing IP.
ginkgo.DeferCleanup(StopServeHostnameService, f.ClientSet, ns, svc2) ginkgo.DeferCleanup(StopServeHostnameService, f.ClientSet, ns, svc2)
podNames2, svc2IP, err := StartServeHostnameService(ctx, cs, getServeHostnameService(svc2), ns, numPods) podNames2, svc2IP, err := StartServeHostnameService(ctx, cs, getServeHostnameService(svc2), ns, numPods)
framework.ExpectNoError(err, "failed to create replication controller with service: %s in the namespace: %s", svc2, ns) framework.ExpectNoError(err, "failed to create deployment with service: %s in the namespace: %s", svc2, ns)
if svc1IP == svc2IP { if svc1IP == svc2IP {
framework.Failf("VIPs conflict: %v", svc1IP) framework.Failf("VIPs conflict: %v", svc1IP)
@ -2182,7 +2177,7 @@ var _ = common.SIGDescribe("Services", func() {
Release: v1.19 Release: v1.19
Testname: Service, ClusterIP type, session affinity to ClientIP Testname: Service, ClusterIP type, session affinity to ClientIP
Description: Create a service of type "ClusterIP". Service's sessionAffinity is set to "ClientIP". Service creation MUST be successful by assigning "ClusterIP" to the service. Description: Create a service of type "ClusterIP". Service's sessionAffinity is set to "ClientIP". Service creation MUST be successful by assigning "ClusterIP" to the service.
Create a Replication Controller to ensure that 3 pods are running and are targeted by the service to serve hostname of the pod when requests are sent to the service. Create a Deployment to ensure that 3 pods are running and are targeted by the service to serve hostname of the pod when requests are sent to the service.
Create another pod to make requests to the service. Service MUST serve the hostname from the same pod of the replica for all consecutive requests. Create another pod to make requests to the service. Service MUST serve the hostname from the same pod of the replica for all consecutive requests.
Service MUST be reachable over serviceName and the ClusterIP on servicePort. Service MUST be reachable over serviceName and the ClusterIP on servicePort.
[LinuxOnly]: Windows does not support session affinity. [LinuxOnly]: Windows does not support session affinity.
@ -2203,7 +2198,7 @@ var _ = common.SIGDescribe("Services", func() {
Release: v1.19 Release: v1.19
Testname: Service, ClusterIP type, session affinity to None Testname: Service, ClusterIP type, session affinity to None
Description: Create a service of type "ClusterIP". Service's sessionAffinity is set to "ClientIP". Service creation MUST be successful by assigning "ClusterIP" to the service. Description: Create a service of type "ClusterIP". Service's sessionAffinity is set to "ClientIP". Service creation MUST be successful by assigning "ClusterIP" to the service.
Create a Replication Controller to ensure that 3 pods are running and are targeted by the service to serve hostname of the pod when requests are sent to the service. Create a Deployment to ensure that 3 pods are running and are targeted by the service to serve hostname of the pod when requests are sent to the service.
Create another pod to make requests to the service. Update the service's sessionAffinity to "None". Service update MUST be successful. When a requests are made to the service, it MUST be able serve the hostname from any pod of the replica. Create another pod to make requests to the service. Update the service's sessionAffinity to "None". Service update MUST be successful. When a requests are made to the service, it MUST be able serve the hostname from any pod of the replica.
When service's sessionAffinily is updated back to "ClientIP", service MUST serve the hostname from the same pod of the replica for all consecutive requests. When service's sessionAffinily is updated back to "ClientIP", service MUST serve the hostname from the same pod of the replica for all consecutive requests.
Service MUST be reachable over serviceName and the ClusterIP on servicePort. Service MUST be reachable over serviceName and the ClusterIP on servicePort.
@ -2219,7 +2214,7 @@ var _ = common.SIGDescribe("Services", func() {
Release: v1.19 Release: v1.19
Testname: Service, NodePort type, session affinity to ClientIP Testname: Service, NodePort type, session affinity to ClientIP
Description: Create a service of type "NodePort" and provide service port and protocol. Service's sessionAffinity is set to "ClientIP". Service creation MUST be successful by assigning a "ClusterIP" to service and allocating NodePort on all nodes. Description: Create a service of type "NodePort" and provide service port and protocol. Service's sessionAffinity is set to "ClientIP". Service creation MUST be successful by assigning a "ClusterIP" to service and allocating NodePort on all nodes.
Create a Replication Controller to ensure that 3 pods are running and are targeted by the service to serve hostname of the pod when a requests are sent to the service. Create a Deployment to ensure that 3 pods are running and are targeted by the service to serve hostname of the pod when a requests are sent to the service.
Create another pod to make requests to the service on node's IP and NodePort. Service MUST serve the hostname from the same pod of the replica for all consecutive requests. Create another pod to make requests to the service on node's IP and NodePort. Service MUST serve the hostname from the same pod of the replica for all consecutive requests.
Service MUST be reachable over serviceName and the ClusterIP on servicePort. Service MUST also be reachable over node's IP on NodePort. Service MUST be reachable over serviceName and the ClusterIP on servicePort. Service MUST also be reachable over node's IP on NodePort.
[LinuxOnly]: Windows does not support session affinity. [LinuxOnly]: Windows does not support session affinity.
@ -2240,7 +2235,7 @@ var _ = common.SIGDescribe("Services", func() {
Release: v1.19 Release: v1.19
Testname: Service, NodePort type, session affinity to None Testname: Service, NodePort type, session affinity to None
Description: Create a service of type "NodePort" and provide service port and protocol. Service's sessionAffinity is set to "ClientIP". Service creation MUST be successful by assigning a "ClusterIP" to the service and allocating NodePort on all the nodes. Description: Create a service of type "NodePort" and provide service port and protocol. Service's sessionAffinity is set to "ClientIP". Service creation MUST be successful by assigning a "ClusterIP" to the service and allocating NodePort on all the nodes.
Create a Replication Controller to ensure that 3 pods are running and are targeted by the service to serve hostname of the pod when requests are sent to the service. Create a Deployment to ensure that 3 pods are running and are targeted by the service to serve hostname of the pod when requests are sent to the service.
Create another pod to make requests to the service. Update the service's sessionAffinity to "None". Service update MUST be successful. When a requests are made to the service on node's IP and NodePort, service MUST be able serve the hostname from any pod of the replica. Create another pod to make requests to the service. Update the service's sessionAffinity to "None". Service update MUST be successful. When a requests are made to the service on node's IP and NodePort, service MUST be able serve the hostname from any pod of the replica.
When service's sessionAffinily is updated back to "ClientIP", service MUST serve the hostname from the same pod of the replica for all consecutive requests. When service's sessionAffinily is updated back to "ClientIP", service MUST serve the hostname from the same pod of the replica for all consecutive requests.
Service MUST be reachable over serviceName and the ClusterIP on servicePort. Service MUST also be reachable over node's IP on NodePort. Service MUST be reachable over serviceName and the ClusterIP on servicePort. Service MUST also be reachable over node's IP on NodePort.
@ -2266,12 +2261,12 @@ var _ = common.SIGDescribe("Services", func() {
svcDisabled := getServeHostnameService("service-proxy-disabled") svcDisabled := getServeHostnameService("service-proxy-disabled")
svcDisabled.ObjectMeta.Labels = serviceProxyNameLabels svcDisabled.ObjectMeta.Labels = serviceProxyNameLabels
_, svcDisabledIP, err := StartServeHostnameService(ctx, cs, svcDisabled, ns, numPods) _, svcDisabledIP, err := StartServeHostnameService(ctx, cs, svcDisabled, ns, numPods)
framework.ExpectNoError(err, "failed to create replication controller with service: %s in the namespace: %s", svcDisabledIP, ns) framework.ExpectNoError(err, "failed to create deployment with service: %s in the namespace: %s", svcDisabledIP, ns)
ginkgo.By("creating service in namespace " + ns) ginkgo.By("creating service in namespace " + ns)
svcToggled := getServeHostnameService("service-proxy-toggled") svcToggled := getServeHostnameService("service-proxy-toggled")
podToggledNames, svcToggledIP, err := StartServeHostnameService(ctx, cs, svcToggled, ns, numPods) podToggledNames, svcToggledIP, err := StartServeHostnameService(ctx, cs, svcToggled, ns, numPods)
framework.ExpectNoError(err, "failed to create replication controller with service: %s in the namespace: %s", svcToggledIP, ns) framework.ExpectNoError(err, "failed to create deployment with service: %s in the namespace: %s", svcToggledIP, ns)
jig := e2eservice.NewTestJig(cs, ns, svcToggled.ObjectMeta.Name) jig := e2eservice.NewTestJig(cs, ns, svcToggled.ObjectMeta.Name)
@ -2318,12 +2313,12 @@ var _ = common.SIGDescribe("Services", func() {
svcHeadless.ObjectMeta.Labels = serviceHeadlessLabels svcHeadless.ObjectMeta.Labels = serviceHeadlessLabels
// This should be improved, as we do not want a Headlesss Service to contain an IP... // This should be improved, as we do not want a Headlesss Service to contain an IP...
_, svcHeadlessIP, err := StartServeHostnameService(ctx, cs, svcHeadless, ns, numPods) _, svcHeadlessIP, err := StartServeHostnameService(ctx, cs, svcHeadless, ns, numPods)
framework.ExpectNoError(err, "failed to create replication controller with headless service: %s in the namespace: %s", svcHeadlessIP, ns) framework.ExpectNoError(err, "failed to create deployment with headless service: %s in the namespace: %s", svcHeadlessIP, ns)
ginkgo.By("creating service in namespace " + ns) ginkgo.By("creating service in namespace " + ns)
svcHeadlessToggled := getServeHostnameService("service-headless-toggled") svcHeadlessToggled := getServeHostnameService("service-headless-toggled")
podHeadlessToggledNames, svcHeadlessToggledIP, err := StartServeHostnameService(ctx, cs, svcHeadlessToggled, ns, numPods) podHeadlessToggledNames, svcHeadlessToggledIP, err := StartServeHostnameService(ctx, cs, svcHeadlessToggled, ns, numPods)
framework.ExpectNoError(err, "failed to create replication controller with service: %s in the namespace: %s", svcHeadlessToggledIP, ns) framework.ExpectNoError(err, "failed to create deployment with service: %s in the namespace: %s", svcHeadlessToggledIP, ns)
jig := e2eservice.NewTestJig(cs, ns, svcHeadlessToggled.ObjectMeta.Name) jig := e2eservice.NewTestJig(cs, ns, svcHeadlessToggled.ObjectMeta.Name)
@ -2831,10 +2826,13 @@ var _ = common.SIGDescribe("Services", func() {
healthCheckNodePortAddr := net.JoinHostPort(nodeIPs[0], strconv.Itoa(int(svc.Spec.HealthCheckNodePort))) healthCheckNodePortAddr := net.JoinHostPort(nodeIPs[0], strconv.Itoa(int(svc.Spec.HealthCheckNodePort)))
// validate that the health check node port from kube-proxy returns 200 when there are ready endpoints // validate that the health check node port from kube-proxy returns 200 when there are ready endpoints
err = wait.PollImmediate(time.Second, time.Minute, func() (bool, error) { err = wait.PollImmediate(time.Second, time.Minute, func() (bool, error) {
cmd := fmt.Sprintf(`curl -s -o /dev/null -w "%%{http_code}" --max-time 5 http://%s/healthz`, healthCheckNodePortAddr) cmd := fmt.Sprintf(`curl -s -o /dev/null -w "%%{http_code}" --max-time 5 http://%s/healthz`,
healthCheckNodePortAddr)
out, err := e2eoutput.RunHostCmd(pausePod0.Namespace, pausePod0.Name, cmd) out, err := e2eoutput.RunHostCmd(pausePod0.Namespace, pausePod0.Name, cmd)
if err != nil { if err != nil {
framework.Logf("unexpected error trying to connect to nodeport %s : %v", healthCheckNodePortAddr, err) framework.Logf("unexpected error trying to connect to nodeport %s : %v",
healthCheckNodePortAddr,
err)
return false, nil return false, nil
} }
@ -4245,7 +4243,7 @@ func execAffinityTestForSessionAffinityTimeout(ctx context.Context, f *framework
ClientIP: &v1.ClientIPConfig{TimeoutSeconds: &svcSessionAffinityTimeout}, ClientIP: &v1.ClientIPConfig{TimeoutSeconds: &svcSessionAffinityTimeout},
} }
_, _, err := StartServeHostnameService(ctx, cs, svc, ns, numPods) _, _, err := StartServeHostnameService(ctx, cs, svc, ns, numPods)
framework.ExpectNoError(err, "failed to create replication controller with service in the namespace: %s", ns) framework.ExpectNoError(err, "failed to create deployment with service in the namespace: %s", ns)
ginkgo.DeferCleanup(StopServeHostnameService, cs, ns, serviceName) ginkgo.DeferCleanup(StopServeHostnameService, cs, ns, serviceName)
jig := e2eservice.NewTestJig(cs, ns, serviceName) jig := e2eservice.NewTestJig(cs, ns, serviceName)
svc, err = jig.Client.CoreV1().Services(ns).Get(ctx, serviceName, metav1.GetOptions{}) svc, err = jig.Client.CoreV1().Services(ns).Get(ctx, serviceName, metav1.GetOptions{})
@ -4328,7 +4326,7 @@ func execAffinityTestForNonLBServiceWithOptionalTransition(ctx context.Context,
serviceType := svc.Spec.Type serviceType := svc.Spec.Type
svc.Spec.SessionAffinity = v1.ServiceAffinityClientIP svc.Spec.SessionAffinity = v1.ServiceAffinityClientIP
_, _, err := StartServeHostnameService(ctx, cs, svc, ns, numPods) _, _, err := StartServeHostnameService(ctx, cs, svc, ns, numPods)
framework.ExpectNoError(err, "failed to create replication controller with service in the namespace: %s", ns) framework.ExpectNoError(err, "failed to create deployment with service in the namespace: %s", ns)
ginkgo.DeferCleanup(StopServeHostnameService, cs, ns, serviceName) ginkgo.DeferCleanup(StopServeHostnameService, cs, ns, serviceName)
jig := e2eservice.NewTestJig(cs, ns, serviceName) jig := e2eservice.NewTestJig(cs, ns, serviceName)
svc, err = jig.Client.CoreV1().Services(ns).Get(ctx, serviceName, metav1.GetOptions{}) svc, err = jig.Client.CoreV1().Services(ns).Get(ctx, serviceName, metav1.GetOptions{})
@ -4398,7 +4396,7 @@ func execAffinityTestForLBServiceWithOptionalTransition(ctx context.Context, f *
ginkgo.By("creating service in namespace " + ns) ginkgo.By("creating service in namespace " + ns)
svc.Spec.SessionAffinity = v1.ServiceAffinityClientIP svc.Spec.SessionAffinity = v1.ServiceAffinityClientIP
_, _, err := StartServeHostnameService(ctx, cs, svc, ns, numPods) _, _, err := StartServeHostnameService(ctx, cs, svc, ns, numPods)
framework.ExpectNoError(err, "failed to create replication controller with service in the namespace: %s", ns) framework.ExpectNoError(err, "failed to create deployment with service in the namespace: %s", ns)
jig := e2eservice.NewTestJig(cs, ns, serviceName) jig := e2eservice.NewTestJig(cs, ns, serviceName)
ginkgo.By("waiting for loadbalancer for service " + ns + "/" + serviceName) ginkgo.By("waiting for loadbalancer for service " + ns + "/" + serviceName)
svc, err = jig.WaitForLoadBalancer(ctx, e2eservice.GetServiceLoadBalancerCreationTimeout(ctx, cs)) svc, err = jig.WaitForLoadBalancer(ctx, e2eservice.GetServiceLoadBalancerCreationTimeout(ctx, cs))