Skip to content

Commit 4453bbc

Browse files
committed
config/v1: add installNetworkObservability field for day-0 installation
Add installNetworkObservability field to enable network observability installation during cluster deployment (day-0). - Add InstallNetworkObservability field to NetworkSpec - Add NetworkObservabilityInstall feature gate enabled in DevPreview and TechPreview - Add integration test suite for the new field Related: openshift/enhancements#1908
1 parent 5e946e2 commit 4453bbc

3 files changed

Lines changed: 34 additions & 0 deletions

File tree

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
2+
name: "Network"
3+
crdName: networks.config.openshift.io
4+
featureGates:
5+
- NetworkObservabilityInstall
6+
tests:
7+
onCreate:
8+
- name: Should be able to set InstallNetworkObservability
9+
initial: |
10+
apiVersion: config.openshift.io/v1
11+
kind: Network
12+
spec:
13+
installNetworkObservability: "Enable"
14+
expected: |
15+
apiVersion: config.openshift.io/v1
16+
kind: Network
17+
spec:
18+
installNetworkObservability: "Enable"

config/v1/types_network.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,14 @@ type NetworkSpec struct {
8686
//
8787
// +optional
8888
NetworkDiagnostics NetworkDiagnostics `json:"networkDiagnostics"`
89+
90+
// installNetworkObservability is an optional field that enables network observability
91+
// when omitted or set to enable. If the field is set to disable, it does nothing.
92+
// Valid values are "", "Enable", "Disable".
93+
// +openshift:enable:FeatureGate=NetworkObservabilityInstall
94+
// +kubebuilder:validation:Enum:="";Enable;Disable
95+
// +optional
96+
InstallNetworkObservability *string `json:"installNetworkObservability,omitempty"`
8997
}
9098

9199
// NetworkStatus is the current network configuration.

features/features.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,4 +1004,12 @@ var (
10041004
enhancementPR("https://github.com/openshift/enhancements/pull/1933").
10051005
enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()).
10061006
mustRegister()
1007+
1008+
FeatureGateNetworkObservabilityInstall = newFeatureGate("NetworkObservabilityInstall").
1009+
reportProblemsToJiraComponent("netobserv").
1010+
contactPerson("jtakvori").
1011+
productScope(ocpSpecific).
1012+
enhancementPR("https://github.com/openshift/enhancements/pull/1908").
1013+
enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()).
1014+
mustRegister()
10071015
)

0 commit comments

Comments
 (0)