diff --git a/features.md b/features.md
index 056ae3719a7..6b21a4ae5d6 100644
--- a/features.md
+++ b/features.md
@@ -11,6 +11,7 @@
| Example2| | | Enabled | Enabled | | | | |
| ExternalSnapshotMetadata| | | Enabled | Enabled | | | | |
| IngressControllerDynamicConfigurationManager| | | Enabled | Enabled | | | | |
+| NetworkConnect| | | Enabled | Enabled | | | | |
| NewOLMCatalogdAPIV1Metas| | | | Enabled | | | | Enabled |
| NewOLMOwnSingleNamespace| | | | Enabled | | | | Enabled |
| NewOLMPreflightPermissionChecks| | | | Enabled | | | | Enabled |
diff --git a/features/features.go b/features/features.go
index fdecf485b7b..660e5758b6f 100644
--- a/features/features.go
+++ b/features/features.go
@@ -187,6 +187,14 @@ var (
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
mustRegister()
+ FeatureGateNetworkConnect = newFeatureGate("NetworkConnect").
+ reportProblemsToJiraComponent("Networking/ovn-kubernetes").
+ contactPerson("tssurya").
+ productScope(ocpSpecific).
+ enhancementPR("https://github.com/ovn-kubernetes/ovn-kubernetes/pull/5246").
+ enableIn(configv1.DevPreviewNoUpgrade).
+ mustRegister()
+
FeatureGateAdditionalRoutingCapabilities = newFeatureGate("AdditionalRoutingCapabilities").
reportProblemsToJiraComponent("Networking/cluster-network-operator").
contactPerson("jcaamano").
@@ -783,7 +791,7 @@ var (
mustRegister()
FeatureGateImageVolume = newFeatureGate("ImageVolume").
- reportProblemsToJiraComponent("Node").
+ reportProblemsToJiraComponent("Node").
contactPerson("haircommander").
productScope(kubernetes).
enhancementPR("https://github.com/openshift/enhancements/pull/1792").
diff --git a/features/util.go b/features/util.go
index 59bb7bff407..8606b6befd5 100644
--- a/features/util.go
+++ b/features/util.go
@@ -2,9 +2,10 @@ package features
import (
"fmt"
- configv1 "github.com/openshift/api/config/v1"
"net/url"
"strings"
+
+ configv1 "github.com/openshift/api/config/v1"
)
// FeatureGateDescription is a golang-only interface used to contains details for a feature gate.
@@ -133,8 +134,10 @@ func (b *featureGateBuilder) register() (configv1.FeatureGateName, error) {
case len(b.enhancementPRURL) == 0:
return "", fmt.Errorf("FeatureGate/%s is missing an enhancementPR with GA Graduation Criteria like https://github.com/openshift/enhancements/pull/#### or https://github.com/kubernetes/enhancements/issues/####", b.name)
- case !strings.HasPrefix(b.enhancementPRURL, "https://github.com/openshift/enhancements/pull/") && !strings.HasPrefix(b.enhancementPRURL, "https://github.com/kubernetes/enhancements/issues/"):
- return "", fmt.Errorf("FeatureGate/%s enhancementPR format is incorrect; must be like https://github.com/openshift/enhancements/pull/#### or https://github.com/kubernetes/enhancements/issues/####", b.name)
+ case !strings.HasPrefix(b.enhancementPRURL, "https://github.com/openshift/enhancements/pull/") &&
+ !strings.HasPrefix(b.enhancementPRURL, "https://github.com/kubernetes/enhancements/issues/") &&
+ !strings.HasPrefix(b.enhancementPRURL, "https://github.com/ovn-kubernetes/ovn-kubernetes/pull/"):
+ return "", fmt.Errorf("FeatureGate/%s enhancementPR format is incorrect; must be like https://github.com/openshift/enhancements/pull/#### or https://github.com/kubernetes/enhancements/issues/#### or https://github.com/ovn-kubernetes/ovn-kubernetes/pull/####", b.name)
case enhancementPRErr != nil:
return "", fmt.Errorf("FeatureGate/%s is enhancementPR is invalid: %w", b.name, enhancementPRErr)
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
index 0bd47341153..49bfa1ad505 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -165,6 +165,9 @@
{
"name": "MutatingAdmissionPolicy"
},
+ {
+ "name": "NetworkConnect"
+ },
{
"name": "NewOLM"
},
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
index e48b33c3740..86116dbdffc 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -262,6 +262,9 @@
{
"name": "MutatingAdmissionPolicy"
},
+ {
+ "name": "NetworkConnect"
+ },
{
"name": "NetworkDiagnosticsConfig"
},
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml
index 4c15290965c..cce0b86cb81 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml
@@ -167,6 +167,9 @@
{
"name": "MutatingAdmissionPolicy"
},
+ {
+ "name": "NetworkConnect"
+ },
{
"name": "NewOLM"
},
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
index 4073a258e0d..6880fa3e6b6 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -41,6 +41,9 @@
{
"name": "MultiArchInstallAzure"
},
+ {
+ "name": "NetworkConnect"
+ },
{
"name": "NewOLM"
},
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
index 8ff3c059e25..4d1fd6dd684 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -168,6 +168,9 @@
{
"name": "MutatingAdmissionPolicy"
},
+ {
+ "name": "NetworkConnect"
+ },
{
"name": "NewOLMBoxCutterRuntime"
},
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
index f0723f55c2c..fbb2ed5c184 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -244,6 +244,9 @@
{
"name": "MutatingAdmissionPolicy"
},
+ {
+ "name": "NetworkConnect"
+ },
{
"name": "NetworkDiagnosticsConfig"
},
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml
index 4d1a0c92682..3b097317f4a 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml
@@ -170,6 +170,9 @@
{
"name": "MutatingAdmissionPolicy"
},
+ {
+ "name": "NetworkConnect"
+ },
{
"name": "NewOLMBoxCutterRuntime"
},
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
index 509d0d49d80..9c68cf67d44 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -44,6 +44,9 @@
{
"name": "MultiArchInstallAzure"
},
+ {
+ "name": "NetworkConnect"
+ },
{
"name": "NewOLMBoxCutterRuntime"
},