Skip to content

Commit 3f584b2

Browse files
Merge pull request #2629 from tssurya/network-connect-feature-gate
DevPreview: `NetworkConnect` feature gate
2 parents d4b2fef + 5964209 commit 3f584b2

11 files changed

+40
-4
lines changed

features.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
| Example2| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | | |
1212
| ExternalSnapshotMetadata| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | | |
1313
| IngressControllerDynamicConfigurationManager| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | | |
14+
| NetworkConnect| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | | |
1415
| NewOLMCatalogdAPIV1Metas| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span> |
1516
| NewOLMOwnSingleNamespace| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span> |
1617
| NewOLMPreflightPermissionChecks| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span> |

features/features.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,14 @@ var (
187187
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
188188
mustRegister()
189189

190+
FeatureGateNetworkConnect = newFeatureGate("NetworkConnect").
191+
reportProblemsToJiraComponent("Networking/ovn-kubernetes").
192+
contactPerson("tssurya").
193+
productScope(ocpSpecific).
194+
enhancementPR("https://github.com/ovn-kubernetes/ovn-kubernetes/pull/5246").
195+
enableIn(configv1.DevPreviewNoUpgrade).
196+
mustRegister()
197+
190198
FeatureGateAdditionalRoutingCapabilities = newFeatureGate("AdditionalRoutingCapabilities").
191199
reportProblemsToJiraComponent("Networking/cluster-network-operator").
192200
contactPerson("jcaamano").
@@ -783,7 +791,7 @@ var (
783791
mustRegister()
784792

785793
FeatureGateImageVolume = newFeatureGate("ImageVolume").
786-
reportProblemsToJiraComponent("Node").
794+
reportProblemsToJiraComponent("Node").
787795
contactPerson("haircommander").
788796
productScope(kubernetes).
789797
enhancementPR("https://github.com/openshift/enhancements/pull/1792").

features/util.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ package features
22

33
import (
44
"fmt"
5-
configv1 "github.com/openshift/api/config/v1"
65
"net/url"
76
"strings"
7+
8+
configv1 "github.com/openshift/api/config/v1"
89
)
910

1011
// 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) {
133134
case len(b.enhancementPRURL) == 0:
134135
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)
135136

136-
case !strings.HasPrefix(b.enhancementPRURL, "https://github.com/openshift/enhancements/pull/") && !strings.HasPrefix(b.enhancementPRURL, "https://github.com/kubernetes/enhancements/issues/"):
137-
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)
137+
case !strings.HasPrefix(b.enhancementPRURL, "https://github.com/openshift/enhancements/pull/") &&
138+
!strings.HasPrefix(b.enhancementPRURL, "https://github.com/kubernetes/enhancements/issues/") &&
139+
!strings.HasPrefix(b.enhancementPRURL, "https://github.com/ovn-kubernetes/ovn-kubernetes/pull/"):
140+
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)
138141

139142
case enhancementPRErr != nil:
140143
return "", fmt.Errorf("FeatureGate/%s is enhancementPR is invalid: %w", b.name, enhancementPRErr)

payload-manifests/featuregates/featureGate-Hypershift-Default.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@
165165
{
166166
"name": "MutatingAdmissionPolicy"
167167
},
168+
{
169+
"name": "NetworkConnect"
170+
},
168171
{
169172
"name": "NewOLM"
170173
},

payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,9 @@
262262
{
263263
"name": "MutatingAdmissionPolicy"
264264
},
265+
{
266+
"name": "NetworkConnect"
267+
},
265268
{
266269
"name": "NetworkDiagnosticsConfig"
267270
},

payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@
167167
{
168168
"name": "MutatingAdmissionPolicy"
169169
},
170+
{
171+
"name": "NetworkConnect"
172+
},
170173
{
171174
"name": "NewOLM"
172175
},

payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
{
4242
"name": "MultiArchInstallAzure"
4343
},
44+
{
45+
"name": "NetworkConnect"
46+
},
4447
{
4548
"name": "NewOLM"
4649
},

payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@
168168
{
169169
"name": "MutatingAdmissionPolicy"
170170
},
171+
{
172+
"name": "NetworkConnect"
173+
},
171174
{
172175
"name": "NewOLMBoxCutterRuntime"
173176
},

payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,9 @@
244244
{
245245
"name": "MutatingAdmissionPolicy"
246246
},
247+
{
248+
"name": "NetworkConnect"
249+
},
247250
{
248251
"name": "NetworkDiagnosticsConfig"
249252
},

payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@
170170
{
171171
"name": "MutatingAdmissionPolicy"
172172
},
173+
{
174+
"name": "NetworkConnect"
175+
},
173176
{
174177
"name": "NewOLMBoxCutterRuntime"
175178
},

0 commit comments

Comments
 (0)