From 63d1eff406f476422c663b465e2a4b289c2253fa Mon Sep 17 00:00:00 2001 From: Olivier Cazade Date: Fri, 26 Jun 2026 21:53:42 +0200 Subject: [PATCH] Adding documentation related to some cases for the network observability instalation field --- config/v1/types_network.go | 3 +++ ...000_10_config-operator_01_networks-CustomNoUpgrade.crd.yaml | 3 +++ ...10_config-operator_01_networks-DevPreviewNoUpgrade.crd.yaml | 3 +++ ...0_config-operator_01_networks-TechPreviewNoUpgrade.crd.yaml | 3 +++ .../NetworkObservabilityInstall.yaml | 3 +++ config/v1/zz_generated.swagger_doc_generated.go | 2 +- openapi/generated_openapi/zz_generated.openapi.go | 2 +- ...000_10_config-operator_01_networks-CustomNoUpgrade.crd.yaml | 3 +++ ...10_config-operator_01_networks-DevPreviewNoUpgrade.crd.yaml | 3 +++ ...0_config-operator_01_networks-TechPreviewNoUpgrade.crd.yaml | 3 +++ 10 files changed, 26 insertions(+), 2 deletions(-) diff --git a/config/v1/types_network.go b/config/v1/types_network.go index 5e2eb933726..80b022de9fd 100644 --- a/config/v1/types_network.go +++ b/config/v1/types_network.go @@ -331,6 +331,9 @@ type NetworkObservabilitySpec struct { // 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. + // During the installation of NetworkObservability, the platform checks for any existing manual installations. + // If a successful installation using the OLMv0 or OLMv1 API is detected, it will be used. + // If the platform cannot determine how the current version was installed, or if the existing installation is incomplete, the installation process will stop. // +required InstallationPolicy NetworkObservabilityInstallationPolicy `json:"installationPolicy,omitempty"` } diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks-CustomNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks-CustomNoUpgrade.crd.yaml index be28f85b6fa..0dcaabb04e4 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks-CustomNoUpgrade.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks-CustomNoUpgrade.crd.yaml @@ -273,6 +273,9 @@ spec: 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. + During the installation of NetworkObservability, the platform checks for any existing manual installations. + If a successful installation using the OLMv0 or OLMv1 API is detected, it will be used. + If the platform cannot determine how the current version was installed, or if the existing installation is incomplete, the installation process will stop. enum: - InstallAndEnable - NoAction diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks-DevPreviewNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks-DevPreviewNoUpgrade.crd.yaml index 0d2254bcf48..8fa80a904fa 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks-DevPreviewNoUpgrade.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks-DevPreviewNoUpgrade.crd.yaml @@ -273,6 +273,9 @@ spec: 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. + During the installation of NetworkObservability, the platform checks for any existing manual installations. + If a successful installation using the OLMv0 or OLMv1 API is detected, it will be used. + If the platform cannot determine how the current version was installed, or if the existing installation is incomplete, the installation process will stop. enum: - InstallAndEnable - NoAction diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks-TechPreviewNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks-TechPreviewNoUpgrade.crd.yaml index b7f19df1f74..574142d908b 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks-TechPreviewNoUpgrade.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks-TechPreviewNoUpgrade.crd.yaml @@ -273,6 +273,9 @@ spec: 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. + During the installation of NetworkObservability, the platform checks for any existing manual installations. + If a successful installation using the OLMv0 or OLMv1 API is detected, it will be used. + If the platform cannot determine how the current version was installed, or if the existing installation is incomplete, the installation process will stop. enum: - InstallAndEnable - NoAction diff --git a/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/NetworkObservabilityInstall.yaml b/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/NetworkObservabilityInstall.yaml index 5c7af8d9211..b813669c417 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/NetworkObservabilityInstall.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/NetworkObservabilityInstall.yaml @@ -273,6 +273,9 @@ spec: 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. + During the installation of NetworkObservability, the platform checks for any existing manual installations. + If a successful installation using the OLMv0 or OLMv1 API is detected, it will be used. + If the platform cannot determine how the current version was installed, or if the existing installation is incomplete, the installation process will stop. enum: - InstallAndEnable - NoAction diff --git a/config/v1/zz_generated.swagger_doc_generated.go b/config/v1/zz_generated.swagger_doc_generated.go index b321d3d7e18..e853db97935 100644 --- a/config/v1/zz_generated.swagger_doc_generated.go +++ b/config/v1/zz_generated.swagger_doc_generated.go @@ -2645,7 +2645,7 @@ func (NetworkMigration) SwaggerDoc() map[string]string { var map_NetworkObservabilitySpec = map[string]string{ "": "NetworkObservabilitySpec defines the configuration for network observability installation", - "installationPolicy": "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.", + "installationPolicy": "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. During the installation of NetworkObservability, the platform checks for any existing manual installations. If a successful installation using the OLMv0 or OLMv1 API is detected, it will be used. If the platform cannot determine how the current version was installed, or if the existing installation is incomplete, the installation process will stop.", } func (NetworkObservabilitySpec) SwaggerDoc() map[string]string { diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index d81301eaaa6..759a2390980 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -17515,7 +17515,7 @@ func schema_openshift_api_config_v1_NetworkObservabilitySpec(ref common.Referenc Properties: map[string]spec.Schema{ "installationPolicy": { SchemaProps: spec.SchemaProps{ - Description: "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.", + Description: "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. During the installation of NetworkObservability, the platform checks for any existing manual installations. If a successful installation using the OLMv0 or OLMv1 API is detected, it will be used. If the platform cannot determine how the current version was installed, or if the existing installation is incomplete, the installation process will stop.", Type: []string{"string"}, Format: "", }, diff --git a/payload-manifests/crds/0000_10_config-operator_01_networks-CustomNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_networks-CustomNoUpgrade.crd.yaml index be28f85b6fa..0dcaabb04e4 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_networks-CustomNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_networks-CustomNoUpgrade.crd.yaml @@ -273,6 +273,9 @@ spec: 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. + During the installation of NetworkObservability, the platform checks for any existing manual installations. + If a successful installation using the OLMv0 or OLMv1 API is detected, it will be used. + If the platform cannot determine how the current version was installed, or if the existing installation is incomplete, the installation process will stop. enum: - InstallAndEnable - NoAction diff --git a/payload-manifests/crds/0000_10_config-operator_01_networks-DevPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_networks-DevPreviewNoUpgrade.crd.yaml index 0d2254bcf48..8fa80a904fa 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_networks-DevPreviewNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_networks-DevPreviewNoUpgrade.crd.yaml @@ -273,6 +273,9 @@ spec: 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. + During the installation of NetworkObservability, the platform checks for any existing manual installations. + If a successful installation using the OLMv0 or OLMv1 API is detected, it will be used. + If the platform cannot determine how the current version was installed, or if the existing installation is incomplete, the installation process will stop. enum: - InstallAndEnable - NoAction diff --git a/payload-manifests/crds/0000_10_config-operator_01_networks-TechPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_networks-TechPreviewNoUpgrade.crd.yaml index b7f19df1f74..574142d908b 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_networks-TechPreviewNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_networks-TechPreviewNoUpgrade.crd.yaml @@ -273,6 +273,9 @@ spec: 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. + During the installation of NetworkObservability, the platform checks for any existing manual installations. + If a successful installation using the OLMv0 or OLMv1 API is detected, it will be used. + If the platform cannot determine how the current version was installed, or if the existing installation is incomplete, the installation process will stop. enum: - InstallAndEnable - NoAction