CORS-4308: Enable Network Observability during installation #10382
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,7 @@ import ( | |
| ) | ||
|
|
||
| func defaultInstallConfig() *types.InstallConfig { | ||
| installationPolicy := types.NetworkObservabilityInstallAndEnable | ||
| return &types.InstallConfig{ | ||
| AdditionalTrustBundlePolicy: defaultAdditionalTrustBundlePolicy(), | ||
| Networking: &types.Networking{ | ||
|
|
@@ -34,6 +35,9 @@ func defaultInstallConfig() *types.InstallConfig { | |
| HostPrefix: int32(defaultHostPrefix), | ||
| }, | ||
| }, | ||
| NetworkObservability: &types.NetworkObservability{ | ||
| InstallationPolicy: &installationPolicy, | ||
| }, | ||
| }, | ||
| ControlPlane: defaultMachinePool("master"), | ||
| Compute: []types.MachinePool{*defaultMachinePool("worker")}, | ||
|
|
@@ -285,6 +289,39 @@ func TestSetInstallConfigDefaults(t *testing.T) { | |
| return c | ||
| }(), | ||
| }, | ||
| { | ||
| name: "NetworkObservability nil", | ||
| config: &types.InstallConfig{ | ||
| Networking: &types.Networking{ | ||
| NetworkObservability: nil, | ||
| }, | ||
| }, | ||
| expected: func() *types.InstallConfig { | ||
| c := defaultInstallConfig() | ||
| return c | ||
| }(), | ||
| }, | ||
| { | ||
| name: "NetworkObservability DoNotInstall", | ||
| config: &types.InstallConfig{ | ||
| Networking: &types.Networking{ | ||
| NetworkObservability: &types.NetworkObservability{ | ||
| InstallationPolicy: func() *types.NetworkObservabilityInstallationPolicy { | ||
| p := types.NetworkObservabilityDoNotInstall | ||
| return &p | ||
| }(), | ||
| }, | ||
| }, | ||
| }, | ||
| expected: func() *types.InstallConfig { | ||
| c := defaultInstallConfig() | ||
| doNotInstall := types.NetworkObservabilityDoNotInstall | ||
| c.Networking.NetworkObservability = &types.NetworkObservability{ | ||
| InstallationPolicy: &doNotInstall, | ||
| } | ||
| return c | ||
| }(), | ||
| }, | ||
| } | ||
| for _, tc := range cases { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -426,6 +426,13 @@ type Networking struct { | |
| // pod network when NetworkType is set to OVNKubernetes. | ||
| OVNKubernetesConfig *OVNKubernetesConfig `json:"ovnKubernetesConfig,omitempty"` | ||
|
|
||
| // NetworkObservability is an optional field that configures network observability installation | ||
| // during cluster deployment (day-0). | ||
| // When omitted, network observability will be installed unless this is a SNO cluster. | ||
| // | ||
| // +optional | ||
| NetworkObservability *NetworkObservability `json:"networkObservability,omitempty"` | ||
|
|
||
| // Deprecated types, scheduled to be removed | ||
|
|
||
| // Deprecated way to configure an IP address pool for machines. | ||
|
|
@@ -681,3 +688,30 @@ var OSImageStreamValues = []OSImageStream{ | |
| OSImageStreamRHCOS9, | ||
| OSImageStreamRHCOS10, | ||
| } | ||
|
|
||
| // NetworkObservabilityInstallationPolicy is an enumeration of the available network observability installation policies | ||
| // Valid values are "", "InstallAndEnable", "DoNotInstall". | ||
| // +kubebuilder:validation:Enum="";InstallAndEnable;DoNotInstall | ||
| type NetworkObservabilityInstallationPolicy string | ||
|
|
||
| const ( | ||
| // NetworkObservabilityNoOpinion means that the user has no opinion and the platform is left | ||
| // to choose reasonable defaults. The current default is to install and enable network observability. | ||
| // This is subject to change over time. | ||
| NetworkObservabilityNoOpinion NetworkObservabilityInstallationPolicy = "" | ||
| // NetworkObservabilityInstallAndEnable means that network observability should be installed and enabled during cluster deployment | ||
| NetworkObservabilityInstallAndEnable NetworkObservabilityInstallationPolicy = "InstallAndEnable" | ||
| // NetworkObservabilityDoNotInstall means that network observability should not be installed | ||
| NetworkObservabilityDoNotInstall NetworkObservabilityInstallationPolicy = "DoNotInstall" | ||
| ) | ||
|
|
||
| // NetworkObservability defines the configuration for network observability installation | ||
| type NetworkObservability struct { | ||
| // InstallationPolicy controls whether network observability is installed during cluster deployment. | ||
| // Valid values are "", "InstallAndEnable" and "DoNotInstall". | ||
| // When set to "", network observability will be installed unless this is a SNO cluster. | ||
| // When set to "InstallAndEnable", network observability will be installed and enabled. | ||
| // When set to "DoNotInstall", network observability will not be installed. | ||
| // +optional | ||
| InstallationPolicy *NetworkObservabilityInstallationPolicy `json:"installationPolicy,omitempty"` | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Handle explicit
networkObservability: {}deterministically.installationPolicyis optional here, but installer defaulting only runs when the wholenetworkObservabilityobject isnil(pkg/types/defaults/installconfig.go:59-66), and manifest emission only runs wheninstallationPolicyis non-nil (pkg/asset/manifests/network.go:83-88). An explicit empty object can therefore bypass day-0 defaulting and leave behavior implicit downstream.Please either require
installationPolicyin this schema or ensure defaulting fills it whennetworkObservabilityis present but empty, and add a regression test fornetworkObservability: {}.🤖 Prompt for AI Agents