From 6d010706ea411affd28dd89a0054e03b8b2c2747 Mon Sep 17 00:00:00 2001
From: Aldo Culquicondor <acondor@google.com>
Date: Thu, 14 Apr 2022 11:55:01 -0400
Subject: [PATCH] Disable JobTrackingWithFinalizers due to unresolved bug

Change-Id: Ieeeab689ae51dfe0dc06bdca88519d0ecf66d636
---
 pkg/features/kube_features.go    | 2 +-
 test/integration/job/job_test.go | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go
index bcc80f8fd44..566e037827c 100644
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -910,7 +910,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
 	ProcMountType:                                  {Default: false, PreRelease: featuregate.Alpha},
 	TTLAfterFinished:                               {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.25
 	IndexedJob:                                     {Default: true, PreRelease: featuregate.Beta},
-	JobTrackingWithFinalizers:                      {Default: true, PreRelease: featuregate.Beta},
+	JobTrackingWithFinalizers:                      {Default: false, PreRelease: featuregate.Beta}, // Disabled due to #109485
 	JobReadyPods:                                   {Default: false, PreRelease: featuregate.Alpha},
 	KubeletPodResources:                            {Default: true, PreRelease: featuregate.Beta},
 	LocalStorageCapacityIsolationFSQuotaMonitoring: {Default: false, PreRelease: featuregate.Alpha},
diff --git a/test/integration/job/job_test.go b/test/integration/job/job_test.go
index d888c813220..f3fcb6b6316 100644
--- a/test/integration/job/job_test.go
+++ b/test/integration/job/job_test.go
@@ -728,7 +728,7 @@ func TestSuspendJob(t *testing.T) {
 			validate := func(s string, active int, status v1.ConditionStatus, reason string) {
 				validateJobPodsStatus(ctx, t, clientSet, job, podsByStatus{
 					Active: active,
-				}, true)
+				}, feature.DefaultFeatureGate.Enabled(features.JobTrackingWithFinalizers))
 				job, err = clientSet.BatchV1().Jobs(ns.Name).Get(ctx, job.Name, metav1.GetOptions{})
 				if err != nil {
 					t.Fatalf("Failed to get Job after %s: %v", s, err)
@@ -754,6 +754,7 @@ func TestSuspendJob(t *testing.T) {
 
 func TestSuspendJobControllerRestart(t *testing.T) {
 	defer featuregatetesting.SetFeatureGateDuringTest(t, feature.DefaultFeatureGate, features.SuspendJob, true)()
+	trackingWithFinalizers := feature.DefaultFeatureGate.Enabled(features.JobTrackingWithFinalizers)
 
 	closeFn, restConfig, clientSet, ns := setup(t, "suspend")
 	defer closeFn()
@@ -774,7 +775,7 @@ func TestSuspendJobControllerRestart(t *testing.T) {
 	}
 	validateJobPodsStatus(ctx, t, clientSet, job, podsByStatus{
 		Active: 0,
-	}, true)
+	}, trackingWithFinalizers)
 
 	// Disable feature gate and restart controller to test that pods get created.
 	defer featuregatetesting.SetFeatureGateDuringTest(t, feature.DefaultFeatureGate, features.SuspendJob, false)()
@@ -786,7 +787,7 @@ func TestSuspendJobControllerRestart(t *testing.T) {
 	}
 	validateJobPodsStatus(ctx, t, clientSet, job, podsByStatus{
 		Active: 2,
-	}, true)
+	}, trackingWithFinalizers)
 }
 
 func TestNodeSelectorUpdate(t *testing.T) {