Skip to content

Graceful termination for service connectivity tests #2611

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
merged 1 commit into from
Oct 11, 2023
Merged

Graceful termination for service connectivity tests #2611

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions test/framework/resources/k8s/resources/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ func (d *defaultDeploymentManager) CreateAndWaitTillDeploymentIsReady(deployment
func (d *defaultDeploymentManager) DeleteAndWaitTillDeploymentIsDeleted(deployment *v1.Deployment) error {
ctx := context.Background()
err := d.k8sClient.Delete(ctx, deployment)

if errors.IsNotFound(err) {
return nil
}

if err != nil {
return err
}
Expand Down
5 changes: 5 additions & 0 deletions test/framework/resources/k8s/resources/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ func (s *defaultServiceManager) CreateService(ctx context.Context, service *v1.S

func (s *defaultServiceManager) DeleteAndWaitTillServiceDeleted(ctx context.Context, service *v1.Service) error {
err := s.k8sClient.Delete(ctx, service)

if errors.IsNotFound(err) {
return nil
}

if err != nil {
return err
}
Expand Down
33 changes: 21 additions & 12 deletions test/integration/cni/service_connectivity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const (
)

// Verifies connectivity to deployment behind different service types
var _ = Describe("[CANARY] test service connectivity", func() {
var _ = Describe("[CANARY] test service connectivity", FlakeAttempts(3), func() {
var err error

// Deployment running the http server
Expand Down Expand Up @@ -99,7 +99,7 @@ var _ = Describe("[CANARY] test service connectivity", func() {
fmt.Fprintf(GinkgoWriter, "created service\n: %+v\n", service.Status)

By("sleeping for some time to allow service to become ready")
time.Sleep(3 * utils.PollIntervalLong)
time.Sleep(utils.PollIntervalLong)

testerContainer = manifest.NewBusyBoxContainerBuilder(f.Options.TestImageRegistry).
Command([]string{"wget"}).
Expand Down Expand Up @@ -145,17 +145,26 @@ var _ = Describe("[CANARY] test service connectivity", func() {
})

JustAfterEach(func() {
err := f.K8sResourceManagers.JobManager().DeleteAndWaitTillJobIsDeleted(testerJob)
Expect(err).ToNot(HaveOccurred())

err = f.K8sResourceManagers.JobManager().DeleteAndWaitTillJobIsDeleted(negativeTesterJob)
Expect(err).ToNot(HaveOccurred())

err = f.K8sResourceManagers.ServiceManager().DeleteAndWaitTillServiceDeleted(context.Background(), service)
Expect(err).ToNot(HaveOccurred())

err = f.K8sResourceManagers.DeploymentManager().DeleteAndWaitTillDeploymentIsDeleted(deployment)
Expect(err).ToNot(HaveOccurred())
if testerJob != nil {
err := f.K8sResourceManagers.JobManager().DeleteAndWaitTillJobIsDeleted(testerJob)
Expect(err).ToNot(HaveOccurred())
}

if negativeTesterJob != nil {
err = f.K8sResourceManagers.JobManager().DeleteAndWaitTillJobIsDeleted(negativeTesterJob)
Expect(err).ToNot(HaveOccurred())
}

if service != nil {
err = f.K8sResourceManagers.ServiceManager().DeleteAndWaitTillServiceDeleted(context.Background(), service)
Expect(err).ToNot(HaveOccurred())
}

if deployment != nil {
err = f.K8sResourceManagers.DeploymentManager().DeleteAndWaitTillDeploymentIsDeleted(deployment)
Expect(err).ToNot(HaveOccurred())
}

// Sleep for IP cooldown period to ensure IPs are added back to datastore for future test runs
time.Sleep(5 * time.Second)
Expand Down