Merge pull request #2113 from p0lyn0mial/revert-disable-resilient-watch-cache-init

openshift-merge-bot[bot] · web-flow · commit 58d4ac495429 · 2024-12-03T09:17:51.000Z
Revert "OCPBUGS-44693: Disable ResilientWatchCacheInitialization"
diff --git a/features.md b/features.md
@@ -6,7 +6,6 @@
 | MachineAPIMigration| | | | | |  |
 | MachineAPIOperatorDisableMachineHealthCheckController| | | | | |  |
 | MultiArchInstallAzure| | | | | |  |
-| ResilientWatchCacheInitialization| | | | | |  |
 | GatewayAPI| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | NewOLM| | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span>  |
 | AWSClusterHostedDNS| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/features/features.go b/features/features.go
@@ -694,11 +694,4 @@ var (
 					enhancementPR("https://github.com/openshift/enhancements/pull/1711").
 					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
-
-	FeatureGateResilientWatchCacheInitialization = newFeatureGate("ResilientWatchCacheInitialization").
-							reportProblemsToJiraComponent("kube-apiserver").
-							contactPerson("p0lyn0mial").
-							productScope(kubernetes).
-							enhancementPR("https://github.com/kubernetes/enhancements/issues/4568").
-							mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -136,9 +136,6 @@
                     {
                         "name": "ProcMountType"
                     },
-                    {
-                        "name": "ResilientWatchCacheInitialization"
-                    },
                     {
                         "name": "RouteAdvertisements"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -35,9 +35,6 @@
                     },
                     {
                         "name": "NewOLM"
-                    },
-                    {
-                        "name": "ResilientWatchCacheInitialization"
                     }
                 ],
                 "enabled": [
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -38,9 +38,6 @@
                     },
                     {
                         "name": "NewOLM"
-                    },
-                    {
-                        "name": "ResilientWatchCacheInitialization"
                     }
                 ],
                 "enabled": [
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -136,9 +136,6 @@
                     {
                         "name": "ProcMountType"
                     },
-                    {
-                        "name": "ResilientWatchCacheInitialization"
-                    },
                     {
                         "name": "RouteAdvertisements"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -32,9 +32,6 @@
                     },
                     {
                         "name": "MultiArchInstallAzure"
-                    },
-                    {
-                        "name": "ResilientWatchCacheInitialization"
                     }
                 ],
                 "enabled": [
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -35,9 +35,6 @@
                     },
                     {
                         "name": "MultiArchInstallAzure"
-                    },
-                    {
-                        "name": "ResilientWatchCacheInitialization"
                     }
                 ],
                 "enabled": [

Original file line number	Diff line number	Diff line change
`@@ -136,9 +136,6 @@`
`136`	`136`	`{`
`137`	`137`	`"name": "ProcMountType"`
`138`	`138`	`},`
`139`		`- {`
`140`		`- "name": "ResilientWatchCacheInitialization"`
`141`		`- },`
`142`	`139`	`{`
`143`	`140`	`"name": "RouteAdvertisements"`
`144`	`141`	`},`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,6 @@`
`35`	`35`	`},`
`36`	`36`	`{`
`37`	`37`	`"name": "NewOLM"`
`38`		`- },`
`39`		`- {`
`40`		`- "name": "ResilientWatchCacheInitialization"`
`41`	`38`	`}`
`42`	`39`	`],`
`43`	`40`	`"enabled": [`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,6 @@`
`38`	`38`	`},`
`39`	`39`	`{`
`40`	`40`	`"name": "NewOLM"`
`41`		`- },`
`42`		`- {`
`43`		`- "name": "ResilientWatchCacheInitialization"`
`44`	`41`	`}`
`45`	`42`	`],`
`46`	`43`	`"enabled": [`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,6 @@`
`32`	`32`	`},`
`33`	`33`	`{`
`34`	`34`	`"name": "MultiArchInstallAzure"`
`35`		`- },`
`36`		`- {`
`37`		`- "name": "ResilientWatchCacheInitialization"`
`38`	`35`	`}`
`39`	`36`	`],`
`40`	`37`	`"enabled": [`