Skip to content

Commit edc1fd2

Browse files
authored
Merge pull request kubernetes#130081 from elizabeth-dev/replace-network-e2e-replicationcontrollers-3
test(network): replace RCs with Deployments in util function CreateServicePods
2 parents 05ab777 + 98d600b commit edc1fd2

File tree

1 file changed

+14
-14
lines changed
  • test/e2e/framework/service

1 file changed

+14
-14
lines changed

test/e2e/framework/service/jig.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ import (
4444
e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment"
4545
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
4646
e2epodoutput "k8s.io/kubernetes/test/e2e/framework/pod/output"
47-
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
48-
testutils "k8s.io/kubernetes/test/utils"
4947
imageutils "k8s.io/kubernetes/test/utils/image"
5048
netutils "k8s.io/utils/net"
5149
"k8s.io/utils/ptr"
@@ -1025,18 +1023,20 @@ func (j *TestJig) CheckServiceReachability(ctx context.Context, svc *v1.Service,
10251023

10261024
// CreateServicePods creates a replication controller with the label same as service. Service listens to TCP and UDP.
10271025
func (j *TestJig) CreateServicePods(ctx context.Context, replica int) error {
1028-
config := testutils.RCConfig{
1029-
Client: j.Client,
1030-
Name: j.Name,
1031-
Image: imageutils.GetE2EImage(imageutils.Agnhost),
1032-
Command: []string{"/agnhost", "serve-hostname", "--http=false", "--tcp", "--udp"},
1033-
Namespace: j.Namespace,
1034-
Labels: j.Labels,
1035-
PollInterval: 3 * time.Second,
1036-
Timeout: framework.PodReadyBeforeTimeout,
1037-
Replicas: replica,
1038-
}
1039-
return e2erc.RunRC(ctx, config)
1026+
deploymentConfig := e2edeployment.NewDeployment(j.Name,
1027+
int32(replica),
1028+
j.Labels,
1029+
j.Name,
1030+
imageutils.GetE2EImage(imageutils.Agnhost),
1031+
appsv1.RecreateDeploymentStrategyType)
1032+
deploymentConfig.Spec.Template.Spec.Containers[0].Command = []string{"/agnhost", "serve-hostname", "--http=false", "--tcp", "--udp"}
1033+
1034+
deployment, err := j.Client.AppsV1().Deployments(j.Namespace).Create(ctx, deploymentConfig, metav1.CreateOptions{})
1035+
if err != nil {
1036+
return err
1037+
}
1038+
1039+
return e2edeployment.WaitForDeploymentComplete(j.Client, deployment)
10401040
}
10411041

10421042
// CreateSCTPServiceWithPort creates a new SCTP Service with given port based on the

0 commit comments

Comments
 (0)