Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
name: "Network"
crdName: networks.config.openshift.io
featureGates:
- NetworkObservabilityInstall
tests:
onCreate:
- name: Should be able to set NetworkObservability with empty string (default)
initial: |
apiVersion: config.openshift.io/v1
kind: Network
spec:
networkObservability:
installationPolicy: ""
expected: |
apiVersion: config.openshift.io/v1
kind: Network
spec:
networkObservability:
installationPolicy: ""
- name: Should be able to set NetworkObservability InstallAndEnable
initial: |
apiVersion: config.openshift.io/v1
kind: Network
spec:
networkObservability:
installationPolicy: InstallAndEnable
expected: |
apiVersion: config.openshift.io/v1
kind: Network
spec:
networkObservability:
installationPolicy: InstallAndEnable
- name: Should be able to set NetworkObservability NoAction
initial: |
apiVersion: config.openshift.io/v1
kind: Network
spec:
networkObservability:
installationPolicy: NoAction
expected: |
apiVersion: config.openshift.io/v1
kind: Network
spec:
networkObservability:
installationPolicy: NoAction
30 changes: 30 additions & 0 deletions config/v1/types_network.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@ type NetworkSpec struct {
//
// +optional
NetworkDiagnostics NetworkDiagnostics `json:"networkDiagnostics"`

// networkObservability is an optional field that configures network observability installation
// during cluster deployment (day-0).
// When omitted, unless this is a SNO cluster, network observability will be installed if not already present, after that, no action taken.
// +openshift:enable:FeatureGate=NetworkObservabilityInstall
// +optional
NetworkObservability NetworkObservabilitySpec `json:"networkObservability,omitempty,omitzero"`
}

// NetworkStatus is the current network configuration.
Expand Down Expand Up @@ -304,3 +311,26 @@ type NetworkDiagnosticsTargetPlacement struct {
// +listType=atomic
Tolerations []corev1.Toleration `json:"tolerations"`
}

// NetworkObservabilityInstallationPolicy is an enumeration of the available network observability installation policies
// Valid values are "InstallAndEnable", "NoAction".
// +kubebuilder:validation:Enum=InstallAndEnable;NoAction
type NetworkObservabilityInstallationPolicy string

const (
// NetworkObservabilityInstallAndEnable means that network observability should be installed and enabled during cluster deployment
// Since this was explicitly set to install, if the user remove NetworkObservability, it will be installed again unless the value of InstallationPolicy is changed
NetworkObservabilityInstallAndEnable NetworkObservabilityInstallationPolicy = "InstallAndEnable"
// NetworkObservabilityNoAction means that nothing will be done regarding Network Observability
NetworkObservabilityNoAction NetworkObservabilityInstallationPolicy = "NoAction"
)

// NetworkObservabilitySpec defines the configuration for network observability installation
type NetworkObservabilitySpec struct {
// installationPolicy controls whether network observability is installed during cluster deployment.
// Valid values are "InstallAndEnable" and "NoAction".
// When set to "InstallAndEnable", ensure that network observability will be installed and enabled on the cluster. If already installed, no action taken, but if it gets uninstalled, it will install it again.
// When set to "NoAction", nothing will be done regarding Network observability.
Comment thread
everettraven marked this conversation as resolved.
// +required
InstallationPolicy NetworkObservabilityInstallationPolicy `json:"installationPolicy,omitempty"`
}

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ metadata:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/bootstrap-required: "true"
release.openshift.io/feature-set: OKD
name: networks.config.openshift.io
spec:
group: config.openshift.io
Expand Down

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions config/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion config/v1/zz_generated.featuregated-crd-manifests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,8 @@ networks.config.openshift.io:
CRDName: networks.config.openshift.io
Capability: ""
Category: ""
FeatureGates: []
FeatureGates:
- NetworkObservabilityInstall
FilenameOperatorName: config-operator
FilenameOperatorOrdering: "01"
FilenameRunLevel: "0000_10"
Expand Down
Loading