remove ctx within the condition func

[peterzhongyi]

The ctx and cancelCtx was added to avoid helper.DeleteAgonesPod from failing from deadline exceeded. However, it doesn't work as desired because ctx can get cancelled by retryTimeout, which will in turn fail the grpc.Allocate(ctx, request). We actually don't even need to call helper.DeleteAgonesPod thanks to the namespace clean up in main_test.go, so I removed it, along with the ctx and cancelCtx.

Tested by patching #3933 and running the test.

Towards #3919

[agones-bot]

Build Succeeded 🥳

Build Id: 4e7fa5cb-f356-4acb-bca7-fdc50ea677f4

The following development artifacts have been built, and will exist for the next 30 days:

• image: us-docker.pkg.dev/agones-images/ci/agones-controller:1.43.0-dev-fd0ef66
• image: us-docker.pkg.dev/agones-images/ci/agones-extensions:1.43.0-dev-fd0ef66
• image: us-docker.pkg.dev/agones-images/ci/agones-sdk:1.43.0-dev-fd0ef66-linux
• image: us-docker.pkg.dev/agones-images/ci/agones-ping:1.43.0-dev-fd0ef66
• image: us-docker.pkg.dev/agones-images/ci/agones-allocator:1.43.0-dev-fd0ef66
• Linux C++ SDK (build): agonessdk-1.43.0-dev-fd0ef66-linux-arch_64.tar.gz
• SDK Server: agonessdk-server-1.43.0-dev-fd0ef66.zip

A preview of the website (the last 30 builds are retained):

• https://fd0ef66-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/3959/head:pr_3959 && git checkout pr_3959
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.registry=us-docker.pkg.dev/agones-images/ci --set agones.image.tag=1.43.0-dev-fd0ef66

[gongmax]

So this will leave the Agones Pod running until next set of tests start to run. Can we modify the main_test.go so it performs the cleanup not only before the test but also after the test?

[peterzhongyi]

So this will leave the Agones Pod running until next set of tests start to run. Can we modify the main_test.go so it performs the cleanup not only before the test but also after the test?

I believe the main_test.go also performs a clean up after the test (it performs a lot of clean ups):

agones/test/e2e/allocator/main_test.go

Lines 58 to 89 in a348312

	if framework.Namespace == "" {
	// use a custom namespace - Unix timestamp
	framework.Namespace = strconv.Itoa(int(time.Now().Unix()))
	log.Infof("Custom namespace is set: %s", framework.Namespace)
	if err := framework.CreateNamespace(framework.Namespace); err != nil {
	log.WithError(err).Error("failed to create a custom namespace")
	os.Exit(1)
	}
	defer func() {
	if derr := framework.DeleteNamespace(framework.Namespace); derr != nil {
	log.Error(derr)
	}
	os.Exit(exitCode)
	}()
	} else {
	// use an already existing namespace
	// run cleanup before tests to ensure no resources from previous runs exist
	err = framework.CleanUp(framework.Namespace)
	if err != nil {
	log.WithError(err).Error("failed to cleanup resources")
	}
	defer func() {
	err = framework.CleanUp(framework.Namespace)
	if err != nil {
	log.WithError(err).Error("failed to cleanup resources")
	}
	os.Exit(exitCode)
	}()
	}

Specifically, checking on the logs, I see

INFO[2024-08-20 21:39:30.925] Namespace 1724189094 is deleted              
ok  	agones.dev/agones/test/e2e/allocator	878.180s

at the end of the test, which means framework.DeleteNamespace was called as a deferred step:

agones/test/e2e/allocator/main_test.go

Line 69 in a348312

if derr := framework.DeleteNamespace(framework.Namespace); derr != nil {

I was also checking the pods in the namespace 1724189094, and they were all deleted after the test.

[gongmax]

So this will leave the Agones Pod running until next set of tests start to run. Can we modify the main_test.go so it performs the cleanup not only before the test but also after the test?

I believe the main_test.go also performs a clean up after the test (it performs a lot of clean ups):

agones/test/e2e/allocator/main_test.go

Lines 58 to 89 in a348312

	if framework.Namespace == "" {
	// use a custom namespace - Unix timestamp
	framework.Namespace = strconv.Itoa(int(time.Now().Unix()))
	log.Infof("Custom namespace is set: %s", framework.Namespace)
	if err := framework.CreateNamespace(framework.Namespace); err != nil {
	log.WithError(err).Error("failed to create a custom namespace")
	os.Exit(1)
	}
	defer func() {
	if derr := framework.DeleteNamespace(framework.Namespace); derr != nil {
	log.Error(derr)
	}
	os.Exit(exitCode)
	}()
	} else {
	// use an already existing namespace
	// run cleanup before tests to ensure no resources from previous runs exist
	err = framework.CleanUp(framework.Namespace)
	if err != nil {
	log.WithError(err).Error("failed to cleanup resources")
	}
	defer func() {
	err = framework.CleanUp(framework.Namespace)
	if err != nil {
	log.WithError(err).Error("failed to cleanup resources")
	}
	os.Exit(exitCode)
	}()
	}

Specifically, checking on the logs, I see

INFO[2024-08-20 21:39:30.925] Namespace 1724189094 is deleted              
ok  	agones.dev/agones/test/e2e/allocator	878.180s

at the end of the test, which means framework.DeleteNamespace was called as a deferred step:

agones/test/e2e/allocator/main_test.go

Line 69 in a348312

if derr := framework.DeleteNamespace(framework.Namespace); derr != nil {

I was also checking the pods in the namespace 1724189094, and they were all deleted after the test.

Yep you're right! I missed that defer part.