diff --git a/features.md b/features.md
index 750b68d62fc..fab7f75ef0b 100644
--- a/features.md
+++ b/features.md
@@ -63,6 +63,7 @@
| HyperShiftOnlyDynamicResourceAllocation| Enabled | | Enabled | | Enabled | | Enabled | |
| ImageModeStatusReporting| | | Enabled | Enabled | | | Enabled | Enabled |
| IngressControllerDynamicConfigurationManager| | | Enabled | Enabled | | | Enabled | Enabled |
+| IngressControllerMultipleHAProxyVersions| | | Enabled | Enabled | | | Enabled | Enabled |
| IrreconcilableMachineConfig| | | Enabled | Enabled | | | Enabled | Enabled |
| KMSEncryption| | | Enabled | Enabled | | | Enabled | Enabled |
| MachineAPIMigration| | | Enabled | Enabled | | | Enabled | Enabled |
diff --git a/features/features.go b/features/features.go
index c17075aa867..5eda3a56bd2 100644
--- a/features/features.go
+++ b/features/features.go
@@ -630,6 +630,14 @@ var (
enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()).
mustRegister()
+ FeatureGateIngressControllerMultipleHAProxyVersions = newFeatureGate("IngressControllerMultipleHAProxyVersions").
+ reportProblemsToJiraComponent("Networking/router").
+ contactPerson("miciah").
+ productScope(ocpSpecific).
+ enhancementPR("https://github.com/openshift/enhancements/pull/1965").
+ enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()).
+ mustRegister()
+
FeatureGateMinimumKubeletVersion = newFeatureGate("MinimumKubeletVersion").
reportProblemsToJiraComponent("Node").
contactPerson("haircommander").
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
index cc76fcf6894..893b596232a 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -161,6 +161,9 @@
{
"name": "IngressControllerDynamicConfigurationManager"
},
+ {
+ "name": "IngressControllerMultipleHAProxyVersions"
+ },
{
"name": "IrreconcilableMachineConfig"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
index e835596f8f5..42fddec2916 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
@@ -237,6 +237,9 @@
{
"name": "IngressControllerDynamicConfigurationManager"
},
+ {
+ "name": "IngressControllerMultipleHAProxyVersions"
+ },
{
"name": "InsightsConfig"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
index cc297eee295..1283c5af7d5 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -163,6 +163,9 @@
{
"name": "IngressControllerDynamicConfigurationManager"
},
+ {
+ "name": "IngressControllerMultipleHAProxyVersions"
+ },
{
"name": "IrreconcilableMachineConfig"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
index 866ae402c88..5542b229567 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
@@ -249,6 +249,9 @@
{
"name": "IngressControllerDynamicConfigurationManager"
},
+ {
+ "name": "IngressControllerMultipleHAProxyVersions"
+ },
{
"name": "InsightsConfig"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
index c74894c2ff6..d4cc53fac92 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -161,6 +161,9 @@
{
"name": "IngressControllerDynamicConfigurationManager"
},
+ {
+ "name": "IngressControllerMultipleHAProxyVersions"
+ },
{
"name": "IrreconcilableMachineConfig"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
index 09a06e3f443..7a4feef7843 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -210,6 +210,9 @@
{
"name": "IngressControllerDynamicConfigurationManager"
},
+ {
+ "name": "IngressControllerMultipleHAProxyVersions"
+ },
{
"name": "InsightsConfig"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
index 9c33c4dc09f..326d4b8f56b 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -163,6 +163,9 @@
{
"name": "IngressControllerDynamicConfigurationManager"
},
+ {
+ "name": "IngressControllerMultipleHAProxyVersions"
+ },
{
"name": "IrreconcilableMachineConfig"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
index b7ca758c340..e3e1ef9d787 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -222,6 +222,9 @@
{
"name": "IngressControllerDynamicConfigurationManager"
},
+ {
+ "name": "IngressControllerMultipleHAProxyVersions"
+ },
{
"name": "InsightsConfig"
},