Merge pull request #2113 from p0lyn0mial/revert-disable-resilient-wat…

…ch-cache-init Revert "OCPBUGS-44693: Disable ResilientWatchCacheInitialization"
openshift · Dec 3, 2024 · 58d4ac4 · 58d4ac4
2 parents 14a6da2 + fbcb0f6
commit 58d4ac4
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 26 deletions.
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 change
@@ Expand Up / @@ -136,9 +136,6 @@ @@
                         {
                             "name": "ProcMountType"
                         },
-                        {
-                            "name": "ResilientWatchCacheInitialization"
-                        },
                         {
                             "name": "RouteAdvertisements"
                         },
@@ Expand Down @@