diff --git a/features.md b/features.md index 46daafe9bdc..50576155a72 100644 --- a/features.md +++ b/features.md @@ -6,7 +6,6 @@ | MachineAPIMigration| | | | | | | | MachineAPIOperatorDisableMachineHealthCheckController| | | | | | | | MultiArchInstallAzure| | | | | | | -| ResilientWatchCacheInitialization| | | | | | | | GatewayAPI| | | Enabled | Enabled | | | | NewOLM| | Enabled | | Enabled | | Enabled | | AWSClusterHostedDNS| | | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 84623cde237..dcaf5712c02 100644 --- 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 index 591dcdeaf9c..a6c802e3d1e 100644 --- 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 index fd07c1dc1c9..6ec226a1af3 100644 --- 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 index 211231953ff..404c7d4d9f8 100644 --- 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 index f5717d2fdae..06d18accaea 100644 --- 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 index 2af279b02e4..13a79357ad6 100644 --- 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 index 05e04d8eaba..b085aa4e23d 100644 --- 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": [