fix: remove PodSweeperWithinWorkloadLauncher feature flag (#15079)

airbytehq · Jan 23, 2025 · 346b299 · 346b299
1 parent 76ed278
commit 346b299
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/airbyte-featureflag/src/main/kotlin/FlagDefinitions.kt b/airbyte-featureflag/src/main/kotlin/FlagDefinitions.kt
@@ -170,8 +170,6 @@ object NodeSelectorOverride : Temporary<String>(key = "platform.node-selector-ov
 
 object ReportConnectorDiskUsage : Temporary<Boolean>(key = "platform.report-connector-disk-usage", default = false)
 
-object PodSweeperWithinWorkloadLauncher : Temporary<Boolean>(key = "platform.pod-sweeper-within-workload-launcher", default = false)
-
 object PlatformInitContainerImage : Temporary<String>(key = "platform.init-container-image", default = "")
 
 object SubOneHourSyncSchedules : Permanent<Boolean>(key = "platform.allow-sub-one-hour-sync-frequency", default = true)

diff --git a/airbyte-workload-launcher/src/main/kotlin/PodSweeper.kt b/airbyte-workload-launcher/src/main/kotlin/PodSweeper.kt
@@ -2,9 +2,6 @@ package io.airbyte.workload.launcher
 
 import dev.failsafe.Failsafe
 import dev.failsafe.RetryPolicy
-import io.airbyte.featureflag.Connection
-import io.airbyte.featureflag.FeatureFlagClient
-import io.airbyte.featureflag.PodSweeperWithinWorkloadLauncher
 import io.airbyte.metrics.lib.MetricAttribute
 import io.airbyte.metrics.lib.MetricClient
 import io.airbyte.metrics.lib.OssMetricsRegistry
@@ -35,13 +32,11 @@ import kotlin.time.toJavaDuration
  * @param unsuccessfulTtl If non-null, failed/unknown pods older than now - unsuccessfulTtl will be deleted
  */
 private val logger = KotlinLogging.logger {}
-private const val DUMMY_CONNECTION_ID = "a213d2df-d98e-44f8-a1a9-79b5e1a3d3b6"
 
 @Singleton
 class PodSweeper(
   private val kubernetesClient: KubernetesClient,
   private val metricClient: MetricClient,
-  private val featureFlagClient: FeatureFlagClient,
   private val clock: Clock,
   @Value("\${airbyte.worker.job.kube.namespace}") private val namespace: String,
   @Named("kubernetesClientRetryPolicy") private val kubernetesClientRetryPolicy: RetryPolicy<Any>,
@@ -53,11 +48,6 @@ class PodSweeper(
   fun sweepPods() {
     logger.info { "Starting pod sweeper cycle in namespace [$namespace]..." }
 
-    if (!featureFlagClient.boolVariation(PodSweeperWithinWorkloadLauncher, Connection(DUMMY_CONNECTION_ID))) {
-      logger.info { "Feature flag is disabled, sweeper cycle ended." }
-      return
-    }
-
     val now = Instant.ofEpochMilli(clock.millis())
     val runningCutoff = runningTtl?.minutes?.let { now.minus(it.toJavaDuration()) }
     val succeededCutoff = succeededTtl?.minutes?.let { now.minus(it.toJavaDuration()) }

diff --git a/airbyte-workload-launcher/src/test/kotlin/PodSweeperTest.kt b/airbyte-workload-launcher/src/test/kotlin/PodSweeperTest.kt
@@ -1,7 +1,4 @@
 import dev.failsafe.RetryPolicy
-import io.airbyte.featureflag.FeatureFlagClient
-import io.airbyte.featureflag.PodSweeperWithinWorkloadLauncher
-import io.airbyte.featureflag.TestClient
 import io.airbyte.metrics.lib.MetricClient
 import io.airbyte.metrics.lib.NotImplementedMetricClient
 import io.airbyte.workload.launcher.PodSweeper
@@ -27,7 +24,6 @@ class PodSweeperTest {
 
   private val mockRetryPolicy: RetryPolicy<Any> = RetryPolicy.ofDefaults()
   private val mockMetricClient: MetricClient = NotImplementedMetricClient()
-  private val mockFeatureFlagClient: FeatureFlagClient = TestClient(mapOf(PodSweeperWithinWorkloadLauncher.key to true))
 
   private lateinit var client: KubernetesClient
 
@@ -271,8 +267,14 @@ class PodSweeperTest {
     unSucceededTtl: Long?,
   ): PodSweeper {
     return PodSweeper(
-      client, mockMetricClient, mockFeatureFlagClient,
-      Clock.systemUTC(), "default", mockRetryPolicy, runningTtL, succeededTtl, unSucceededTtl,
+      client,
+      mockMetricClient,
+      Clock.systemUTC(),
+      "default",
+      mockRetryPolicy,
+      runningTtL,
+      succeededTtl,
+      unSucceededTtl,
     )
   }
 }