From 7b2c90f7c610d74253339294c6c92f3c19f208e5 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 5 Aug 2024 09:15:47 -0400 Subject: [PATCH 1/3] Deprecate network type migration. We never want to do that again. --- config/v1/types_network.go | 15 ++++----- operator/v1/types_network.go | 61 ++++++++++++++++++------------------ 2 files changed, 36 insertions(+), 40 deletions(-) diff --git a/config/v1/types_network.go b/config/v1/types_network.go index 211d5c0886d..c2873c21981 100644 --- a/config/v1/types_network.go +++ b/config/v1/types_network.go @@ -111,15 +111,12 @@ type NetworkStatus struct { Migration *NetworkMigration `json:"migration,omitempty"` // conditions represents the observations of a network.config current state. - // Known .status.conditions.type are: "NetworkTypeMigrationInProgress", "NetworkTypeMigrationMTUReady", - // "NetworkTypeMigrationTargetCNIAvailable", "NetworkTypeMigrationTargetCNIInUse", - // "NetworkTypeMigrationOriginalCNIPurged" and "NetworkDiagnosticsAvailable" + // Known .status.conditions.type are: "NetworkDiagnosticsAvailable" // +optional // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type - // +openshift:enable:FeatureGate=NetworkLiveMigration // +openshift:enable:FeatureGate=NetworkDiagnosticsConfig Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"` } @@ -186,15 +183,15 @@ type NetworkList struct { Items []Network `json:"items"` } -// NetworkMigration represents the cluster network configuration. +// NetworkMigration represents the network migration status. type NetworkMigration struct { - // NetworkType is the target plugin that is to be deployed. - // Currently supported values are: OpenShiftSDN, OVNKubernetes - // +kubebuilder:validation:Enum={"OpenShiftSDN","OVNKubernetes"} + // NetworkType is the target plugin that is being deployed. + // DEPRECATED: network type migration is no longer supported, + // so this should always be unset. // +optional NetworkType string `json:"networkType,omitempty"` - // MTU contains the MTU migration configuration. + // MTU is the MTU configuration that is being deployed. // +optional MTU *MTUMigration `json:"mtu,omitempty"` } diff --git a/operator/v1/types_network.go b/operator/v1/types_network.go index 1e2d25109fb..5dc0c5497b9 100644 --- a/operator/v1/types_network.go +++ b/operator/v1/types_network.go @@ -120,8 +120,8 @@ type NetworkSpec struct { // +optional ExportNetworkFlows *ExportNetworkFlows `json:"exportNetworkFlows,omitempty"` - // migration enables and configures the cluster network migration. The - // migration procedure allows to change the network type and the MTU. + // migration enables and configures cluster network migration, for network changes + // that cannot be made instantly. // +optional Migration *NetworkMigration `json:"migration,omitempty"` @@ -141,71 +141,70 @@ type NetworkSpec struct { // NetworkMigrationMode is an enumeration of the possible mode of the network migration // Valid values are "Live", "Offline" and omitted. +// DEPRECATED: network type migration is no longer supported. // +kubebuilder:validation:Enum:=Live;Offline;"" type NetworkMigrationMode string const ( // A "Live" migration operation will not cause service interruption by migrating the CNI of each node one by one. The cluster network will work as normal during the network migration. + // DEPRECATED: network type migration is no longer supported. LiveNetworkMigrationMode NetworkMigrationMode = "Live" // An "Offline" migration operation will cause service interruption. During an "Offline" migration, two rounds of node reboots are required. The cluster network will be malfunctioning during the network migration. + // DEPRECATED: network type migration is no longer supported. OfflineNetworkMigrationMode NetworkMigrationMode = "Offline" ) -// NetworkMigration represents the cluster network configuration. +// NetworkMigration represents the cluster network migration configuration. // +openshift:validation:FeatureGateAwareXValidation:featureGate=NetworkLiveMigration,rule="!has(self.mtu) || !has(self.networkType) || self.networkType == \"\" || has(self.mode) && self.mode == 'Live'",message="networkType migration in mode other than 'Live' may not be configured at the same time as mtu migration" type NetworkMigration struct { - // networkType is the target type of network migration. Set this to the - // target network type to allow changing the default network. If unset, the - // operation of changing cluster default network plugin will be rejected. - // The supported values are OpenShiftSDN, OVNKubernetes - // +optional - NetworkType string `json:"networkType,omitempty"` - // mtu contains the MTU migration configuration. Set this to allow changing // the MTU values for the default network. If unset, the operation of // changing the MTU for the default network will be rejected. // +optional MTU *MTUMigration `json:"mtu,omitempty"` - // features contains the features migration configuration. Set this to migrate - // feature configuration when changing the cluster default network provider. - // if unset, the default operation is to migrate all the configuration of - // supported features. + // networkType was previously used when changing the default network type. + // DEPRECATED: network type migration is no longer supported, and setting + // this to a non-empty value will result in the network operator rejecting + // the configuration. + // +optional + NetworkType string `json:"networkType,omitempty"` + + // features was previously used to configure which network plugin features + // would be migrated in a network type migration. + // DEPRECATED: network type migration is no longer supported, and setting + // this to a non-empty value will result in the network operator rejecting + // the configuration. // +optional Features *FeaturesMigration `json:"features,omitempty"` - // mode indicates the mode of network migration. - // The supported values are "Live", "Offline" and omitted. - // A "Live" migration operation will not cause service interruption by migrating the CNI of each node one by one. The cluster network will work as normal during the network migration. - // An "Offline" migration operation will cause service interruption. During an "Offline" migration, two rounds of node reboots are required. The cluster network will be malfunctioning during the network migration. - // When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. - // The current default value is "Offline". + // mode indicates the mode of network type migration. + // DEPRECATED: network type migration is no longer supported, and setting + // this to a non-empty value will result in the network operator rejecting + // the configuration. // +optional - Mode NetworkMigrationMode `json:"mode"` + Mode NetworkMigrationMode `json:"mode,omitempty"` } type FeaturesMigration struct { - // egressIP specifies whether or not the Egress IP configuration is migrated - // automatically when changing the cluster default network provider. - // If unset, this property defaults to 'true' and Egress IP configure is migrated. + // egressIP specified whether or not the Egress IP configuration was migrated. + // DEPRECATED: network type migration is no longer supported. // +optional // +kubebuilder:default:=true EgressIP bool `json:"egressIP,omitempty"` - // egressFirewall specifies whether or not the Egress Firewall configuration is migrated - // automatically when changing the cluster default network provider. - // If unset, this property defaults to 'true' and Egress Firewall configure is migrated. + // egressFirewall specified whether or not the Egress Firewall configuration was migrated. + // DEPRECATED: network type migration is no longer supported. // +optional // +kubebuilder:default:=true EgressFirewall bool `json:"egressFirewall,omitempty"` - // multicast specifies whether or not the multicast configuration is migrated - // automatically when changing the cluster default network provider. - // If unset, this property defaults to 'true' and multicast configure is migrated. + // multicast specified whether or not the multicast configuration was migrated. + // DEPRECATED: network type migration is no longer supported. // +optional // +kubebuilder:default:=true Multicast bool `json:"multicast,omitempty"` } -// MTUMigration MTU contains infomation about MTU migration. +// MTUMigration contains infomation about MTU migration. type MTUMigration struct { // network contains information about MTU migration for the default network. // Migrations are only allowed to MTU values lower than the machine's uplink From a8126f0c0dcd9b2c4281bc772e0e3d9b6ad9f47e Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 31 Jul 2024 10:15:29 -0400 Subject: [PATCH 2/3] Deprecate openshift-sdn --- config/v1/types_network.go | 6 +++--- network/v1/types.go | 25 ++++++++++++------------- operator/v1/types_network.go | 30 +++++++++++++++++------------- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/config/v1/types_network.go b/config/v1/types_network.go index c2873c21981..1eeae69dac9 100644 --- a/config/v1/types_network.go +++ b/config/v1/types_network.go @@ -55,11 +55,11 @@ type NetworkSpec struct { // +listType=atomic ServiceNetwork []string `json:"serviceNetwork"` - // NetworkType is the plugin that is to be deployed (e.g. OpenShiftSDN). + // NetworkType is the plugin that is to be deployed (e.g. OVNKubernetes). // This should match a value that the cluster-network-operator understands, // or else no networking will be installed. // Currently supported values are: - // - OpenShiftSDN + // - OVNKubernetes // This field is immutable after installation. NetworkType string `json:"networkType"` @@ -101,7 +101,7 @@ type NetworkStatus struct { // +listType=atomic ServiceNetwork []string `json:"serviceNetwork,omitempty"` - // NetworkType is the plugin that is deployed (e.g. OpenShiftSDN). + // NetworkType is the plugin that is deployed (e.g. OVNKubernetes). NetworkType string `json:"networkType,omitempty"` // ClusterNetworkMTU is the MTU for inter-pod networking. diff --git a/network/v1/types.go b/network/v1/types.go index f39e786c209..89015cf6b1b 100644 --- a/network/v1/types.go +++ b/network/v1/types.go @@ -12,9 +12,9 @@ const ( // +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// ClusterNetwork describes the cluster network. There is normally only one object of this type, -// named "default", which is created by the SDN network plugin based on the master configuration -// when the cluster is brought up for the first time. +// ClusterNetwork was used by OpenShift SDN. +// DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in +// any way by OpenShift. // // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer). // +kubebuilder:object:root=true @@ -112,8 +112,9 @@ type HostSubnetEgressCIDR string // +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// HostSubnet describes the container subnet network on a node. The HostSubnet object must have the -// same name as the Node object it corresponds to. +// HostSubnet was used by OpenShift SDN. +// DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in +// any way by OpenShift. // // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer). // +kubebuilder:object:root=true @@ -184,9 +185,9 @@ type NetNamespaceEgressIP string // +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// NetNamespace describes a single isolated network. When using the redhat/openshift-ovs-multitenant -// plugin, every Namespace will have a corresponding NetNamespace object with the same name. -// (When using redhat/openshift-ovs-subnet, NetNamespaces are not used.) +// NetNamespace was used by OpenShift SDN. +// DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in +// any way by OpenShift. // // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer). // +kubebuilder:object:root=true @@ -274,11 +275,9 @@ type EgressNetworkPolicySpec struct { // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// EgressNetworkPolicy describes the current egress network policy for a Namespace. When using -// the 'redhat/openshift-ovs-multitenant' network plugin, traffic from a pod to an IP address -// outside the cluster will be checked against each EgressNetworkPolicyRule in the pod's -// namespace's EgressNetworkPolicy, in order. If no rule matches (or no EgressNetworkPolicy -// is present) then the traffic will be allowed by default. +// EgressNetworkPolicy was used by OpenShift SDN. +// DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in +// any way by OpenShift. // // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer). // +kubebuilder:object:root=true diff --git a/operator/v1/types_network.go b/operator/v1/types_network.go index 5dc0c5497b9..afe773192a1 100644 --- a/operator/v1/types_network.go +++ b/operator/v1/types_network.go @@ -58,7 +58,7 @@ type NetworkSpec struct { OperatorSpec `json:",inline"` // clusterNetwork is the IP address pool to use for pod IPs. - // Some network providers, e.g. OpenShift SDN, support multiple ClusterNetworks. + // Some network providers support multiple ClusterNetworks. // Others only support one. This is equivalent to the cluster-cidr. // +listType=atomic ClusterNetwork []ClusterNetworkEntry `json:"clusterNetwork"` @@ -96,8 +96,8 @@ type NetworkSpec struct { // deployKubeProxy specifies whether or not a standalone kube-proxy should // be deployed by the operator. Some network providers include kube-proxy // or similar functionality. If unset, the plugin will attempt to select - // the correct value, which is false when OpenShift SDN and ovn-kubernetes are - // used and true otherwise. + // the correct value, which is false when ovn-kubernetes is used and true + // otherwise. // +optional DeployKubeProxy *bool `json:"deployKubeProxy,omitempty"` @@ -109,9 +109,9 @@ type NetworkSpec struct { // +kubebuilder:default:=false DisableNetworkDiagnostics bool `json:"disableNetworkDiagnostics"` - // kubeProxyConfig lets us configure desired proxy configuration. - // If not specified, sensible defaults will be chosen by OpenShift directly. - // Not consumed by all network providers - currently only openshift-sdn. + // kubeProxyConfig lets us configure desired proxy configuration, if + // deployKubeProxy is true. If not specified, sensible defaults will be chosen by + // OpenShift directly. KubeProxyConfig *ProxyConfig `json:"kubeProxyConfig,omitempty"` // exportNetworkFlows enables and configures the export of network flow metadata from the pod network @@ -249,7 +249,8 @@ type DefaultNetworkDefinition struct { // All NetworkTypes are supported except for NetworkTypeRaw Type NetworkType `json:"type"` - // openShiftSDNConfig configures the openshift-sdn plugin + // openShiftSDNConfig was previously used to configure the openshift-sdn plugin. + // DEPRECATED: OpenShift SDN is no longer supported. // +optional OpenShiftSDNConfig *OpenShiftSDNConfig `json:"openshiftSDNConfig,omitempty"` @@ -367,7 +368,7 @@ type AdditionalNetworkDefinition struct { SimpleMacvlanConfig *SimpleMacvlanConfig `json:"simpleMacvlanConfig,omitempty"` } -// OpenShiftSDNConfig configures the three openshift-sdn plugins +// OpenShiftSDNConfig was used to configure the OpenShift SDN plugin. It is no longer used. type OpenShiftSDNConfig struct { // mode is one of "Multitenant", "Subnet", or "NetworkPolicy" Mode SDNMode `json:"mode"` @@ -386,7 +387,6 @@ type OpenShiftSDNConfig struct { // useExternalOpenvswitch used to control whether the operator would deploy an OVS // DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always // run as a system service, and this flag is ignored. - // DEPRECATED: non-functional as of 4.6 // +optional UseExternalOpenvswitch *bool `json:"useExternalOpenvswitch,omitempty"` @@ -759,11 +759,11 @@ type EgressIPConfig struct { } const ( - // NetworkTypeOpenShiftSDN means the openshift-sdn plugin will be configured + // NetworkTypeOpenShiftSDN means the openshift-sdn plugin will be configured. + // DEPRECATED: OpenShift SDN is no longer supported NetworkTypeOpenShiftSDN NetworkType = "OpenShiftSDN" - // NetworkTypeOVNKubernetes means the ovn-kubernetes project will be configured. - // This is currently not implemented. + // NetworkTypeOVNKubernetes means the ovn-kubernetes plugin will be configured. NetworkTypeOVNKubernetes NetworkType = "OVNKubernetes" // NetworkTypeRaw @@ -773,19 +773,23 @@ const ( NetworkTypeSimpleMacvlan NetworkType = "SimpleMacvlan" ) -// SDNMode is the Mode the openshift-sdn plugin is in +// SDNMode is the Mode the openshift-sdn plugin is in. +// DEPRECATED: OpenShift SDN is no longer supported type SDNMode string const ( // SDNModeSubnet is a simple mode that offers no isolation between pods + // DEPRECATED: OpenShift SDN is no longer supported SDNModeSubnet SDNMode = "Subnet" // SDNModeMultitenant is a special "multitenant" mode that offers limited // isolation configuration between namespaces + // DEPRECATED: OpenShift SDN is no longer supported SDNModeMultitenant SDNMode = "Multitenant" // SDNModeNetworkPolicy is a full NetworkPolicy implementation that allows // for sophisticated network isolation and segmenting. This is the default. + // DEPRECATED: OpenShift SDN is no longer supported SDNModeNetworkPolicy SDNMode = "NetworkPolicy" ) From 9843e2e032a8d3ce4a006c069337983c3f20dba7 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 31 Jul 2024 10:15:40 -0400 Subject: [PATCH 3/3] update generated files --- ...00_10_config-operator_01_networks.crd.yaml | 21 +- ..._generated.featuregated-crd-manifests.yaml | 1 - .../AAA_ungated.yaml | 16 +- .../NetworkDiagnosticsConfig.yaml | 89 +++++- .../NetworkLiveMigration.yaml | 292 ------------------ .../v1/zz_generated.swagger_doc_generated.go | 12 +- network/v1/generated.proto | 25 +- .../001_clusternetworks.crd.yaml | 10 +- .../002_hostsubnets.crd.yaml | 8 +- .../003_netnamespaces.crd.yaml | 9 +- .../004_egressnetworkpolicies.crd.yaml | 12 +- .../AAA_ungated.yaml | 10 +- .../AAA_ungated.yaml | 12 +- .../AAA_ungated.yaml | 8 +- .../AAA_ungated.yaml | 9 +- .../v1/zz_generated.swagger_doc_generated.go | 8 +- .../generated_openapi/zz_generated.openapi.go | 63 ++-- openapi/openapi.json | 53 ++-- ...twork_01_networks-CustomNoUpgrade.crd.yaml | 84 +++-- ...00_70_network_01_networks-Default.crd.yaml | 84 +++-- ...k_01_networks-DevPreviewNoUpgrade.crd.yaml | 84 +++-- ..._01_networks-TechPreviewNoUpgrade.crd.yaml | 84 +++-- .../AAA_ungated.yaml | 84 +++-- .../AdditionalRoutingCapabilities.yaml | 84 +++-- .../NetworkLiveMigration.yaml | 84 +++-- .../RouteAdvertisements.yaml | 84 +++-- .../v1/zz_generated.swagger_doc_generated.go | 30 +- ...00_10_config-operator_01_networks.crd.yaml | 21 +- 28 files changed, 517 insertions(+), 864 deletions(-) delete mode 100644 config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/NetworkLiveMigration.yaml diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks.crd.yaml index 16ac576d292..04e14d9f22f 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks.crd.yaml @@ -248,9 +248,9 @@ spec: type: object networkType: description: 'NetworkType is the plugin that is to be deployed (e.g. - OpenShiftSDN). This should match a value that the cluster-network-operator + OVNKubernetes). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently - supported values are: - OpenShiftSDN This field is immutable after + supported values are: - OVNKubernetes This field is immutable after installation.' type: string serviceNetwork: @@ -303,10 +303,7 @@ spec: type: integer conditions: description: 'conditions represents the observations of a network.config - current state. Known .status.conditions.type are: "NetworkTypeMigrationInProgress", - "NetworkTypeMigrationMTUReady", "NetworkTypeMigrationTargetCNIAvailable", - "NetworkTypeMigrationTargetCNIInUse", "NetworkTypeMigrationOriginalCNIPurged" - and "NetworkDiagnosticsAvailable"' + current state. Known .status.conditions.type are: "NetworkDiagnosticsAvailable"' items: description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct @@ -381,7 +378,7 @@ spec: description: Migration contains the cluster network migration configuration. properties: mtu: - description: MTU contains the MTU migration configuration. + description: MTU is the MTU configuration that is being deployed. properties: machine: description: Machine contains MTU migration configuration @@ -415,15 +412,13 @@ spec: type: object type: object networkType: - description: 'NetworkType is the target plugin that is to be deployed. - Currently supported values are: OpenShiftSDN, OVNKubernetes' - enum: - - OpenShiftSDN - - OVNKubernetes + description: 'NetworkType is the target plugin that is being deployed. + DEPRECATED: network type migration is no longer supported, so + this should always be unset.' type: string type: object networkType: - description: NetworkType is the plugin that is deployed (e.g. OpenShiftSDN). + description: NetworkType is the plugin that is deployed (e.g. OVNKubernetes). type: string serviceNetwork: description: IP address pool for services. Currently, we only support diff --git a/config/v1/zz_generated.featuregated-crd-manifests.yaml b/config/v1/zz_generated.featuregated-crd-manifests.yaml index ddc7594f75f..88ffbaf0a76 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests.yaml @@ -359,7 +359,6 @@ networks.config.openshift.io: Category: "" FeatureGates: - NetworkDiagnosticsConfig - - NetworkLiveMigration FilenameOperatorName: config-operator FilenameOperatorOrdering: "01" FilenameRunLevel: "0000_10" diff --git a/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/AAA_ungated.yaml b/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/AAA_ungated.yaml index 335dd676592..753f025ec1c 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/AAA_ungated.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/AAA_ungated.yaml @@ -106,9 +106,9 @@ spec: type: object networkType: description: 'NetworkType is the plugin that is to be deployed (e.g. - OpenShiftSDN). This should match a value that the cluster-network-operator + OVNKubernetes). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently - supported values are: - OpenShiftSDN This field is immutable after + supported values are: - OVNKubernetes This field is immutable after installation.' type: string serviceNetwork: @@ -157,7 +157,7 @@ spec: description: Migration contains the cluster network migration configuration. properties: mtu: - description: MTU contains the MTU migration configuration. + description: MTU is the MTU configuration that is being deployed. properties: machine: description: Machine contains MTU migration configuration @@ -191,15 +191,13 @@ spec: type: object type: object networkType: - description: 'NetworkType is the target plugin that is to be deployed. - Currently supported values are: OpenShiftSDN, OVNKubernetes' - enum: - - OpenShiftSDN - - OVNKubernetes + description: 'NetworkType is the target plugin that is being deployed. + DEPRECATED: network type migration is no longer supported, so + this should always be unset.' type: string type: object networkType: - description: NetworkType is the plugin that is deployed (e.g. OpenShiftSDN). + description: NetworkType is the plugin that is deployed (e.g. OVNKubernetes). type: string serviceNetwork: description: IP address pool for services. Currently, we only support diff --git a/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/NetworkDiagnosticsConfig.yaml b/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/NetworkDiagnosticsConfig.yaml index 08806553752..0afca6f38ba 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/NetworkDiagnosticsConfig.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/NetworkDiagnosticsConfig.yaml @@ -249,9 +249,9 @@ spec: type: object networkType: description: 'NetworkType is the plugin that is to be deployed (e.g. - OpenShiftSDN). This should match a value that the cluster-network-operator + OVNKubernetes). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently - supported values are: - OpenShiftSDN This field is immutable after + supported values are: - OVNKubernetes This field is immutable after installation.' type: string serviceNetwork: @@ -302,11 +302,84 @@ spec: clusterNetworkMTU: description: ClusterNetworkMTU is the MTU for inter-pod networking. type: integer + conditions: + description: 'conditions represents the observations of a network.config + current state. Known .status.conditions.type are: "NetworkDiagnosticsAvailable"' + items: + description: "Condition contains details for one aspect of the current + state of this API Resource. --- This struct is intended for direct + use as an array at the field path .status.conditions. For example, + \n type FooStatus struct{ // Represents the observations of a + foo's current state. // Known .status.conditions.type are: \"Available\", + \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge + // +listType=map // +listMapKey=type Conditions []metav1.Condition + `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" + protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }" + properties: + lastTransitionTime: + description: lastTransitionTime is the last time the condition + transitioned from one status to another. This should be when + the underlying condition changed. If that is not known, then + using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: message is a human readable message indicating + details about the transition. This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: observedGeneration represents the .metadata.generation + that the condition was set based upon. For instance, if .metadata.generation + is currently 12, but the .status.conditions[x].observedGeneration + is 9, the condition is out of date with respect to the current + state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: reason contains a programmatic identifier indicating + the reason for the condition's last transition. Producers + of specific condition types may define expected values and + meanings for this field, and whether the values are considered + a guaranteed API. The value should be a CamelCase string. + This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. + --- Many .condition.type values are consistent across resources + like Available, but because arbitrary conditions can be useful + (see .node.status.conditions), the ability to deconflict is + important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array + x-kubernetes-list-map-keys: + - type + x-kubernetes-list-type: map migration: description: Migration contains the cluster network migration configuration. properties: mtu: - description: MTU contains the MTU migration configuration. + description: MTU is the MTU configuration that is being deployed. properties: machine: description: Machine contains MTU migration configuration @@ -340,15 +413,13 @@ spec: type: object type: object networkType: - description: 'NetworkType is the target plugin that is to be deployed. - Currently supported values are: OpenShiftSDN, OVNKubernetes' - enum: - - OpenShiftSDN - - OVNKubernetes + description: 'NetworkType is the target plugin that is being deployed. + DEPRECATED: network type migration is no longer supported, so + this should always be unset.' type: string type: object networkType: - description: NetworkType is the plugin that is deployed (e.g. OpenShiftSDN). + description: NetworkType is the plugin that is deployed (e.g. OVNKubernetes). type: string serviceNetwork: description: IP address pool for services. Currently, we only support diff --git a/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/NetworkLiveMigration.yaml b/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/NetworkLiveMigration.yaml deleted file mode 100644 index de8fc71b256..00000000000 --- a/config/v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/NetworkLiveMigration.yaml +++ /dev/null @@ -1,292 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/470 - api.openshift.io/filename-cvo-runlevel: "0000_10" - api.openshift.io/filename-operator: config-operator - api.openshift.io/filename-ordering: "01" - feature-gate.release.openshift.io/NetworkLiveMigration: "true" - release.openshift.io/bootstrap-required: "true" - name: networks.config.openshift.io -spec: - group: config.openshift.io - names: - kind: Network - listKind: NetworkList - plural: networks - singular: network - scope: Cluster - versions: - - name: v1 - schema: - openAPIV3Schema: - description: "Network holds cluster-wide information about Network. The canonical - name is `cluster`. It is used to configure the desired network configuration, - such as: IP address pools for services/pod IPs, network plugin, etc. Please - view network.spec for an explanation on what applies when configuring this - resource. \n Compatibility level 1: Stable within a major release for a - minimum of 12 months or 3 minor releases (whichever is longer)." - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: spec holds user settable values for configuration. As a general - rule, this SHOULD NOT be read directly. Instead, you should consume - the NetworkStatus, as it indicates the currently deployed configuration. - Currently, most spec fields are immutable after installation. Please - view the individual ones for further details on each. - properties: - clusterNetwork: - description: IP address pool to use for pod IPs. This field is immutable - after installation. - items: - description: ClusterNetworkEntry is a contiguous block of IP addresses - from which pod IPs are allocated. - properties: - cidr: - description: The complete block for pod IPs. - type: string - hostPrefix: - description: The size (prefix) of block to allocate to each - node. If this field is not used by the plugin, it can be left - unset. - format: int32 - minimum: 0 - type: integer - type: object - type: array - x-kubernetes-list-type: atomic - externalIP: - description: externalIP defines configuration for controllers that - affect Service.ExternalIP. If nil, then ExternalIP is not allowed - to be set. - properties: - autoAssignCIDRs: - description: autoAssignCIDRs is a list of CIDRs from which to - automatically assign Service.ExternalIP. These are assigned - when the service is of type LoadBalancer. In general, this is - only useful for bare-metal clusters. In Openshift 3.x, this - was misleadingly called "IngressIPs". Automatically assigned - External IPs are not affected by any ExternalIPPolicy rules. - Currently, only one entry may be provided. - items: - type: string - type: array - x-kubernetes-list-type: atomic - policy: - description: policy is a set of restrictions applied to the ExternalIP - field. If nil or empty, then ExternalIP is not allowed to be - set. - properties: - allowedCIDRs: - description: allowedCIDRs is the list of allowed CIDRs. - items: - type: string - type: array - x-kubernetes-list-type: atomic - rejectedCIDRs: - description: rejectedCIDRs is the list of disallowed CIDRs. - These take precedence over allowedCIDRs. - items: - type: string - type: array - x-kubernetes-list-type: atomic - type: object - type: object - networkType: - description: 'NetworkType is the plugin that is to be deployed (e.g. - OpenShiftSDN). This should match a value that the cluster-network-operator - understands, or else no networking will be installed. Currently - supported values are: - OpenShiftSDN This field is immutable after - installation.' - type: string - serviceNetwork: - description: IP address pool for services. Currently, we only support - a single entry here. This field is immutable after installation. - items: - type: string - type: array - x-kubernetes-list-type: atomic - serviceNodePortRange: - description: The port range allowed for Services of type NodePort. - If not specified, the default of 30000-32767 will be used. Such - Services without a NodePort specified will have one automatically - allocated from this range. This parameter can be updated after the - cluster is installed. - pattern: ^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])-([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ - type: string - type: object - status: - description: status holds observed values from the cluster. They may not - be overridden. - properties: - clusterNetwork: - description: IP address pool to use for pod IPs. - items: - description: ClusterNetworkEntry is a contiguous block of IP addresses - from which pod IPs are allocated. - properties: - cidr: - description: The complete block for pod IPs. - type: string - hostPrefix: - description: The size (prefix) of block to allocate to each - node. If this field is not used by the plugin, it can be left - unset. - format: int32 - minimum: 0 - type: integer - type: object - type: array - x-kubernetes-list-type: atomic - clusterNetworkMTU: - description: ClusterNetworkMTU is the MTU for inter-pod networking. - type: integer - conditions: - description: 'conditions represents the observations of a network.config - current state. Known .status.conditions.type are: "NetworkTypeMigrationInProgress", - "NetworkTypeMigrationMTUReady", "NetworkTypeMigrationTargetCNIAvailable", - "NetworkTypeMigrationTargetCNIInUse", "NetworkTypeMigrationOriginalCNIPurged" - and "NetworkDiagnosticsAvailable"' - items: - description: "Condition contains details for one aspect of the current - state of this API Resource. --- This struct is intended for direct - use as an array at the field path .status.conditions. For example, - \n type FooStatus struct{ // Represents the observations of a - foo's current state. // Known .status.conditions.type are: \"Available\", - \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge - // +listType=map // +listMapKey=type Conditions []metav1.Condition - `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" - protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }" - properties: - lastTransitionTime: - description: lastTransitionTime is the last time the condition - transitioned from one status to another. This should be when - the underlying condition changed. If that is not known, then - using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: message is a human readable message indicating - details about the transition. This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: observedGeneration represents the .metadata.generation - that the condition was set based upon. For instance, if .metadata.generation - is currently 12, but the .status.conditions[x].observedGeneration - is 9, the condition is out of date with respect to the current - state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: reason contains a programmatic identifier indicating - the reason for the condition's last transition. Producers - of specific condition types may define expected values and - meanings for this field, and whether the values are considered - a guaranteed API. The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: type of condition in CamelCase or in foo.example.com/CamelCase. - --- Many .condition.type values are consistent across resources - like Available, but because arbitrary conditions can be useful - (see .node.status.conditions), the ability to deconflict is - important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - type: array - x-kubernetes-list-map-keys: - - type - x-kubernetes-list-type: map - migration: - description: Migration contains the cluster network migration configuration. - properties: - mtu: - description: MTU contains the MTU migration configuration. - properties: - machine: - description: Machine contains MTU migration configuration - for the machine's uplink. - properties: - from: - description: From is the MTU to migrate from. - format: int32 - minimum: 0 - type: integer - to: - description: To is the MTU to migrate to. - format: int32 - minimum: 0 - type: integer - type: object - network: - description: Network contains MTU migration configuration - for the default network. - properties: - from: - description: From is the MTU to migrate from. - format: int32 - minimum: 0 - type: integer - to: - description: To is the MTU to migrate to. - format: int32 - minimum: 0 - type: integer - type: object - type: object - networkType: - description: 'NetworkType is the target plugin that is to be deployed. - Currently supported values are: OpenShiftSDN, OVNKubernetes' - enum: - - OpenShiftSDN - - OVNKubernetes - type: string - type: object - networkType: - description: NetworkType is the plugin that is deployed (e.g. OpenShiftSDN). - type: string - serviceNetwork: - description: IP address pool for services. Currently, we only support - a single entry here. - items: - type: string - type: array - x-kubernetes-list-type: atomic - type: object - required: - - spec - type: object - served: true - storage: true diff --git a/config/v1/zz_generated.swagger_doc_generated.go b/config/v1/zz_generated.swagger_doc_generated.go index e5e9bdb897d..52c4b72f4c6 100644 --- a/config/v1/zz_generated.swagger_doc_generated.go +++ b/config/v1/zz_generated.swagger_doc_generated.go @@ -2027,9 +2027,9 @@ func (NetworkList) SwaggerDoc() map[string]string { } var map_NetworkMigration = map[string]string{ - "": "NetworkMigration represents the cluster network configuration.", - "networkType": "NetworkType is the target plugin that is to be deployed. Currently supported values are: OpenShiftSDN, OVNKubernetes", - "mtu": "MTU contains the MTU migration configuration.", + "": "NetworkMigration represents the network migration status.", + "networkType": "NetworkType is the target plugin that is being deployed. DEPRECATED: network type migration is no longer supported, so this should always be unset.", + "mtu": "MTU is the MTU configuration that is being deployed.", } func (NetworkMigration) SwaggerDoc() map[string]string { @@ -2040,7 +2040,7 @@ var map_NetworkSpec = map[string]string{ "": "NetworkSpec is the desired network configuration. As a general rule, this SHOULD NOT be read directly. Instead, you should consume the NetworkStatus, as it indicates the currently deployed configuration. Currently, most spec fields are immutable after installation. Please view the individual ones for further details on each.", "clusterNetwork": "IP address pool to use for pod IPs. This field is immutable after installation.", "serviceNetwork": "IP address pool for services. Currently, we only support a single entry here. This field is immutable after installation.", - "networkType": "NetworkType is the plugin that is to be deployed (e.g. OpenShiftSDN). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently supported values are: - OpenShiftSDN This field is immutable after installation.", + "networkType": "NetworkType is the plugin that is to be deployed (e.g. OVNKubernetes). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently supported values are: - OVNKubernetes This field is immutable after installation.", "externalIP": "externalIP defines configuration for controllers that affect Service.ExternalIP. If nil, then ExternalIP is not allowed to be set.", "serviceNodePortRange": "The port range allowed for Services of type NodePort. If not specified, the default of 30000-32767 will be used. Such Services without a NodePort specified will have one automatically allocated from this range. This parameter can be updated after the cluster is installed.", "networkDiagnostics": "networkDiagnostics defines network diagnostics configuration.\n\nTakes precedence over spec.disableNetworkDiagnostics in network.operator.openshift.io. If networkDiagnostics is not specified or is empty, and the spec.disableNetworkDiagnostics flag in network.operator.openshift.io is set to true, the network diagnostics feature will be disabled.", @@ -2054,10 +2054,10 @@ var map_NetworkStatus = map[string]string{ "": "NetworkStatus is the current network configuration.", "clusterNetwork": "IP address pool to use for pod IPs.", "serviceNetwork": "IP address pool for services. Currently, we only support a single entry here.", - "networkType": "NetworkType is the plugin that is deployed (e.g. OpenShiftSDN).", + "networkType": "NetworkType is the plugin that is deployed (e.g. OVNKubernetes).", "clusterNetworkMTU": "ClusterNetworkMTU is the MTU for inter-pod networking.", "migration": "Migration contains the cluster network migration configuration.", - "conditions": "conditions represents the observations of a network.config current state. Known .status.conditions.type are: \"NetworkTypeMigrationInProgress\", \"NetworkTypeMigrationMTUReady\", \"NetworkTypeMigrationTargetCNIAvailable\", \"NetworkTypeMigrationTargetCNIInUse\", \"NetworkTypeMigrationOriginalCNIPurged\" and \"NetworkDiagnosticsAvailable\"", + "conditions": "conditions represents the observations of a network.config current state. Known .status.conditions.type are: \"NetworkDiagnosticsAvailable\"", } func (NetworkStatus) SwaggerDoc() map[string]string { diff --git a/network/v1/generated.proto b/network/v1/generated.proto index b7016bfb251..d2e75548bb6 100644 --- a/network/v1/generated.proto +++ b/network/v1/generated.proto @@ -11,9 +11,9 @@ import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; // Package-wide variables from generator "generated". option go_package = "github.com/openshift/api/network/v1"; -// ClusterNetwork describes the cluster network. There is normally only one object of this type, -// named "default", which is created by the SDN network plugin based on the master configuration -// when the cluster is brought up for the first time. +// ClusterNetwork was used by OpenShift SDN. +// DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in +// any way by OpenShift. // // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer). // +kubebuilder:object:root=true @@ -91,11 +91,9 @@ message ClusterNetworkList { repeated ClusterNetwork items = 2; } -// EgressNetworkPolicy describes the current egress network policy for a Namespace. When using -// the 'redhat/openshift-ovs-multitenant' network plugin, traffic from a pod to an IP address -// outside the cluster will be checked against each EgressNetworkPolicyRule in the pod's -// namespace's EgressNetworkPolicy, in order. If no rule matches (or no EgressNetworkPolicy -// is present) then the traffic will be allowed by default. +// EgressNetworkPolicy was used by OpenShift SDN. +// DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in +// any way by OpenShift. // // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer). // +kubebuilder:object:root=true @@ -154,8 +152,9 @@ message EgressNetworkPolicySpec { repeated EgressNetworkPolicyRule egress = 1; } -// HostSubnet describes the container subnet network on a node. The HostSubnet object must have the -// same name as the Node object it corresponds to. +// HostSubnet was used by OpenShift SDN. +// DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in +// any way by OpenShift. // // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer). // +kubebuilder:object:root=true @@ -211,9 +210,9 @@ message HostSubnetList { repeated HostSubnet items = 2; } -// NetNamespace describes a single isolated network. When using the redhat/openshift-ovs-multitenant -// plugin, every Namespace will have a corresponding NetNamespace object with the same name. -// (When using redhat/openshift-ovs-subnet, NetNamespaces are not used.) +// NetNamespace was used by OpenShift SDN. +// DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in +// any way by OpenShift. // // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer). // +kubebuilder:object:root=true diff --git a/network/v1/zz_generated.crd-manifests/001_clusternetworks.crd.yaml b/network/v1/zz_generated.crd-manifests/001_clusternetworks.crd.yaml index 3e6a95c8a2a..20149c1c621 100644 --- a/network/v1/zz_generated.crd-manifests/001_clusternetworks.crd.yaml +++ b/network/v1/zz_generated.crd-manifests/001_clusternetworks.crd.yaml @@ -32,12 +32,10 @@ spec: name: v1 schema: openAPIV3Schema: - description: "ClusterNetwork describes the cluster network. There is normally - only one object of this type, named \"default\", which is created by the - SDN network plugin based on the master configuration when the cluster is - brought up for the first time. \n Compatibility level 1: Stable within a - major release for a minimum of 12 months or 3 minor releases (whichever - is longer)." + description: "ClusterNetwork was used by OpenShift SDN. DEPRECATED: OpenShift + SDN is no longer supported and this object is no longer used in any way + by OpenShift. \n Compatibility level 1: Stable within a major release for + a minimum of 12 months or 3 minor releases (whichever is longer)." properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation diff --git a/network/v1/zz_generated.crd-manifests/002_hostsubnets.crd.yaml b/network/v1/zz_generated.crd-manifests/002_hostsubnets.crd.yaml index cd814a9ccce..70644ed3ae3 100644 --- a/network/v1/zz_generated.crd-manifests/002_hostsubnets.crd.yaml +++ b/network/v1/zz_generated.crd-manifests/002_hostsubnets.crd.yaml @@ -42,10 +42,10 @@ spec: name: v1 schema: openAPIV3Schema: - description: "HostSubnet describes the container subnet network on a node. - The HostSubnet object must have the same name as the Node object it corresponds - to. \n Compatibility level 1: Stable within a major release for a minimum - of 12 months or 3 minor releases (whichever is longer)." + description: "HostSubnet was used by OpenShift SDN. DEPRECATED: OpenShift + SDN is no longer supported and this object is no longer used in any way + by OpenShift. \n Compatibility level 1: Stable within a major release for + a minimum of 12 months or 3 minor releases (whichever is longer)." properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation diff --git a/network/v1/zz_generated.crd-manifests/003_netnamespaces.crd.yaml b/network/v1/zz_generated.crd-manifests/003_netnamespaces.crd.yaml index 15f42ad8708..909166b681a 100644 --- a/network/v1/zz_generated.crd-manifests/003_netnamespaces.crd.yaml +++ b/network/v1/zz_generated.crd-manifests/003_netnamespaces.crd.yaml @@ -28,11 +28,10 @@ spec: name: v1 schema: openAPIV3Schema: - description: "NetNamespace describes a single isolated network. When using - the redhat/openshift-ovs-multitenant plugin, every Namespace will have a - corresponding NetNamespace object with the same name. (When using redhat/openshift-ovs-subnet, - NetNamespaces are not used.) \n Compatibility level 1: Stable within a major - release for a minimum of 12 months or 3 minor releases (whichever is longer)." + description: "NetNamespace was used by OpenShift SDN. DEPRECATED: OpenShift + SDN is no longer supported and this object is no longer used in any way + by OpenShift. \n Compatibility level 1: Stable within a major release for + a minimum of 12 months or 3 minor releases (whichever is longer)." properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation diff --git a/network/v1/zz_generated.crd-manifests/004_egressnetworkpolicies.crd.yaml b/network/v1/zz_generated.crd-manifests/004_egressnetworkpolicies.crd.yaml index 9efa2e4a84e..97cac5e0499 100644 --- a/network/v1/zz_generated.crd-manifests/004_egressnetworkpolicies.crd.yaml +++ b/network/v1/zz_generated.crd-manifests/004_egressnetworkpolicies.crd.yaml @@ -19,14 +19,10 @@ spec: - name: v1 schema: openAPIV3Schema: - description: "EgressNetworkPolicy describes the current egress network policy - for a Namespace. When using the 'redhat/openshift-ovs-multitenant' network - plugin, traffic from a pod to an IP address outside the cluster will be - checked against each EgressNetworkPolicyRule in the pod's namespace's EgressNetworkPolicy, - in order. If no rule matches (or no EgressNetworkPolicy is present) then - the traffic will be allowed by default. \n Compatibility level 1: Stable - within a major release for a minimum of 12 months or 3 minor releases (whichever - is longer)." + description: "EgressNetworkPolicy was used by OpenShift SDN. DEPRECATED: OpenShift + SDN is no longer supported and this object is no longer used in any way + by OpenShift. \n Compatibility level 1: Stable within a major release for + a minimum of 12 months or 3 minor releases (whichever is longer)." properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation diff --git a/network/v1/zz_generated.featuregated-crd-manifests/clusternetworks.network.openshift.io/AAA_ungated.yaml b/network/v1/zz_generated.featuregated-crd-manifests/clusternetworks.network.openshift.io/AAA_ungated.yaml index 02130015681..703b497ecc0 100644 --- a/network/v1/zz_generated.featuregated-crd-manifests/clusternetworks.network.openshift.io/AAA_ungated.yaml +++ b/network/v1/zz_generated.featuregated-crd-manifests/clusternetworks.network.openshift.io/AAA_ungated.yaml @@ -31,12 +31,10 @@ spec: name: v1 schema: openAPIV3Schema: - description: "ClusterNetwork describes the cluster network. There is normally - only one object of this type, named \"default\", which is created by the - SDN network plugin based on the master configuration when the cluster is - brought up for the first time. \n Compatibility level 1: Stable within a - major release for a minimum of 12 months or 3 minor releases (whichever - is longer)." + description: "ClusterNetwork was used by OpenShift SDN. DEPRECATED: OpenShift + SDN is no longer supported and this object is no longer used in any way + by OpenShift. \n Compatibility level 1: Stable within a major release for + a minimum of 12 months or 3 minor releases (whichever is longer)." properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation diff --git a/network/v1/zz_generated.featuregated-crd-manifests/egressnetworkpolicies.network.openshift.io/AAA_ungated.yaml b/network/v1/zz_generated.featuregated-crd-manifests/egressnetworkpolicies.network.openshift.io/AAA_ungated.yaml index 00fe5d5fc3d..d636e70a450 100644 --- a/network/v1/zz_generated.featuregated-crd-manifests/egressnetworkpolicies.network.openshift.io/AAA_ungated.yaml +++ b/network/v1/zz_generated.featuregated-crd-manifests/egressnetworkpolicies.network.openshift.io/AAA_ungated.yaml @@ -18,14 +18,10 @@ spec: - name: v1 schema: openAPIV3Schema: - description: "EgressNetworkPolicy describes the current egress network policy - for a Namespace. When using the 'redhat/openshift-ovs-multitenant' network - plugin, traffic from a pod to an IP address outside the cluster will be - checked against each EgressNetworkPolicyRule in the pod's namespace's EgressNetworkPolicy, - in order. If no rule matches (or no EgressNetworkPolicy is present) then - the traffic will be allowed by default. \n Compatibility level 1: Stable - within a major release for a minimum of 12 months or 3 minor releases (whichever - is longer)." + description: "EgressNetworkPolicy was used by OpenShift SDN. DEPRECATED: OpenShift + SDN is no longer supported and this object is no longer used in any way + by OpenShift. \n Compatibility level 1: Stable within a major release for + a minimum of 12 months or 3 minor releases (whichever is longer)." properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation diff --git a/network/v1/zz_generated.featuregated-crd-manifests/hostsubnets.network.openshift.io/AAA_ungated.yaml b/network/v1/zz_generated.featuregated-crd-manifests/hostsubnets.network.openshift.io/AAA_ungated.yaml index 4b5afd3f5fb..a9a49f1806b 100644 --- a/network/v1/zz_generated.featuregated-crd-manifests/hostsubnets.network.openshift.io/AAA_ungated.yaml +++ b/network/v1/zz_generated.featuregated-crd-manifests/hostsubnets.network.openshift.io/AAA_ungated.yaml @@ -41,10 +41,10 @@ spec: name: v1 schema: openAPIV3Schema: - description: "HostSubnet describes the container subnet network on a node. - The HostSubnet object must have the same name as the Node object it corresponds - to. \n Compatibility level 1: Stable within a major release for a minimum - of 12 months or 3 minor releases (whichever is longer)." + description: "HostSubnet was used by OpenShift SDN. DEPRECATED: OpenShift + SDN is no longer supported and this object is no longer used in any way + by OpenShift. \n Compatibility level 1: Stable within a major release for + a minimum of 12 months or 3 minor releases (whichever is longer)." properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation diff --git a/network/v1/zz_generated.featuregated-crd-manifests/netnamespaces.network.openshift.io/AAA_ungated.yaml b/network/v1/zz_generated.featuregated-crd-manifests/netnamespaces.network.openshift.io/AAA_ungated.yaml index ca2178e3fb0..4cb39337c49 100644 --- a/network/v1/zz_generated.featuregated-crd-manifests/netnamespaces.network.openshift.io/AAA_ungated.yaml +++ b/network/v1/zz_generated.featuregated-crd-manifests/netnamespaces.network.openshift.io/AAA_ungated.yaml @@ -27,11 +27,10 @@ spec: name: v1 schema: openAPIV3Schema: - description: "NetNamespace describes a single isolated network. When using - the redhat/openshift-ovs-multitenant plugin, every Namespace will have a - corresponding NetNamespace object with the same name. (When using redhat/openshift-ovs-subnet, - NetNamespaces are not used.) \n Compatibility level 1: Stable within a major - release for a minimum of 12 months or 3 minor releases (whichever is longer)." + description: "NetNamespace was used by OpenShift SDN. DEPRECATED: OpenShift + SDN is no longer supported and this object is no longer used in any way + by OpenShift. \n Compatibility level 1: Stable within a major release for + a minimum of 12 months or 3 minor releases (whichever is longer)." properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation diff --git a/network/v1/zz_generated.swagger_doc_generated.go b/network/v1/zz_generated.swagger_doc_generated.go index f92172acaf8..743ddeab572 100644 --- a/network/v1/zz_generated.swagger_doc_generated.go +++ b/network/v1/zz_generated.swagger_doc_generated.go @@ -12,7 +12,7 @@ package v1 // AUTO-GENERATED FUNCTIONS START HERE var map_ClusterNetwork = map[string]string{ - "": "ClusterNetwork describes the cluster network. There is normally only one object of this type, named \"default\", which is created by the SDN network plugin based on the master configuration when the cluster is brought up for the first time.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "": "ClusterNetwork was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "metadata": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "network": "Network is a CIDR string specifying the global overlay network's L3 space", "hostsubnetlength": "HostSubnetLength is the number of bits of network to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods", @@ -48,7 +48,7 @@ func (ClusterNetworkList) SwaggerDoc() map[string]string { } var map_EgressNetworkPolicy = map[string]string{ - "": "EgressNetworkPolicy describes the current egress network policy for a Namespace. When using the 'redhat/openshift-ovs-multitenant' network plugin, traffic from a pod to an IP address outside the cluster will be checked against each EgressNetworkPolicyRule in the pod's namespace's EgressNetworkPolicy, in order. If no rule matches (or no EgressNetworkPolicy is present) then the traffic will be allowed by default.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "": "EgressNetworkPolicy was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "metadata": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "spec": "spec is the specification of the current egress network policy", } @@ -97,7 +97,7 @@ func (EgressNetworkPolicySpec) SwaggerDoc() map[string]string { } var map_HostSubnet = map[string]string{ - "": "HostSubnet describes the container subnet network on a node. The HostSubnet object must have the same name as the Node object it corresponds to.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "": "HostSubnet was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "metadata": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "host": "Host is the name of the node. (This is the same as the object's name, but both fields must be set.)", "hostIP": "HostIP is the IP address to be used as a VTEP by other nodes in the overlay network", @@ -121,7 +121,7 @@ func (HostSubnetList) SwaggerDoc() map[string]string { } var map_NetNamespace = map[string]string{ - "": "NetNamespace describes a single isolated network. When using the redhat/openshift-ovs-multitenant plugin, every Namespace will have a corresponding NetNamespace object with the same name. (When using redhat/openshift-ovs-subnet, NetNamespaces are not used.)\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "": "NetNamespace was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "metadata": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "netname": "NetName is the name of the network namespace. (This is the same as the object's name, but both fields must be set.)", "netid": "NetID is the network identifier of the network namespace assigned to each overlay network packet. This can be manipulated with the \"oc adm pod-network\" commands.", diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index 5dffa74bbf2..3ab691ec386 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -15157,19 +15157,19 @@ func schema_openshift_api_config_v1_NetworkMigration(ref common.ReferenceCallbac return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "NetworkMigration represents the cluster network configuration.", + Description: "NetworkMigration represents the network migration status.", Type: []string{"object"}, Properties: map[string]spec.Schema{ "networkType": { SchemaProps: spec.SchemaProps{ - Description: "NetworkType is the target plugin that is to be deployed. Currently supported values are: OpenShiftSDN, OVNKubernetes", + Description: "NetworkType is the target plugin that is being deployed. DEPRECATED: network type migration is no longer supported, so this should always be unset.", Type: []string{"string"}, Format: "", }, }, "mtu": { SchemaProps: spec.SchemaProps{ - Description: "MTU contains the MTU migration configuration.", + Description: "MTU is the MTU configuration that is being deployed.", Ref: ref("github.com/openshift/api/config/v1.MTUMigration"), }, }, @@ -15229,7 +15229,7 @@ func schema_openshift_api_config_v1_NetworkSpec(ref common.ReferenceCallback) co }, "networkType": { SchemaProps: spec.SchemaProps{ - Description: "NetworkType is the plugin that is to be deployed (e.g. OpenShiftSDN). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently supported values are: - OpenShiftSDN This field is immutable after installation.", + Description: "NetworkType is the plugin that is to be deployed (e.g. OVNKubernetes). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently supported values are: - OVNKubernetes This field is immutable after installation.", Default: "", Type: []string{"string"}, Format: "", @@ -15312,7 +15312,7 @@ func schema_openshift_api_config_v1_NetworkStatus(ref common.ReferenceCallback) }, "networkType": { SchemaProps: spec.SchemaProps{ - Description: "NetworkType is the plugin that is deployed (e.g. OpenShiftSDN).", + Description: "NetworkType is the plugin that is deployed (e.g. OVNKubernetes).", Type: []string{"string"}, Format: "", }, @@ -15342,7 +15342,7 @@ func schema_openshift_api_config_v1_NetworkStatus(ref common.ReferenceCallback) }, }, SchemaProps: spec.SchemaProps{ - Description: "conditions represents the observations of a network.config current state. Known .status.conditions.type are: \"NetworkTypeMigrationInProgress\", \"NetworkTypeMigrationMTUReady\", \"NetworkTypeMigrationTargetCNIAvailable\", \"NetworkTypeMigrationTargetCNIInUse\", \"NetworkTypeMigrationOriginalCNIPurged\" and \"NetworkDiagnosticsAvailable\"", + Description: "conditions represents the observations of a network.config current state. Known .status.conditions.type are: \"NetworkDiagnosticsAvailable\"", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ @@ -40537,7 +40537,7 @@ func schema_openshift_api_network_v1_ClusterNetwork(ref common.ReferenceCallback return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "ClusterNetwork describes the cluster network. There is normally only one object of this type, named \"default\", which is created by the SDN network plugin based on the master configuration when the cluster is brought up for the first time.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + Description: "ClusterNetwork was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", Type: []string{"object"}, Properties: map[string]spec.Schema{ "kind": { @@ -40712,7 +40712,7 @@ func schema_openshift_api_network_v1_EgressNetworkPolicy(ref common.ReferenceCal return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "EgressNetworkPolicy describes the current egress network policy for a Namespace. When using the 'redhat/openshift-ovs-multitenant' network plugin, traffic from a pod to an IP address outside the cluster will be checked against each EgressNetworkPolicyRule in the pod's namespace's EgressNetworkPolicy, in order. If no rule matches (or no EgressNetworkPolicy is present) then the traffic will be allowed by default.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + Description: "EgressNetworkPolicy was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", Type: []string{"object"}, Properties: map[string]spec.Schema{ "kind": { @@ -40895,7 +40895,7 @@ func schema_openshift_api_network_v1_HostSubnet(ref common.ReferenceCallback) co return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "HostSubnet describes the container subnet network on a node. The HostSubnet object must have the same name as the Node object it corresponds to.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + Description: "HostSubnet was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", Type: []string{"object"}, Properties: map[string]spec.Schema{ "kind": { @@ -41037,7 +41037,7 @@ func schema_openshift_api_network_v1_NetNamespace(ref common.ReferenceCallback) return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "NetNamespace describes a single isolated network. When using the redhat/openshift-ovs-multitenant plugin, every Namespace will have a corresponding NetNamespace object with the same name. (When using redhat/openshift-ovs-subnet, NetNamespaces are not used.)\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + Description: "NetNamespace was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", Type: []string{"object"}, Properties: map[string]spec.Schema{ "kind": { @@ -46504,7 +46504,7 @@ func schema_openshift_api_operator_v1_DefaultNetworkDefinition(ref common.Refere }, "openshiftSDNConfig": { SchemaProps: spec.SchemaProps{ - Description: "openShiftSDNConfig configures the openshift-sdn plugin", + Description: "openShiftSDNConfig was previously used to configure the openshift-sdn plugin. DEPRECATED: OpenShift SDN is no longer supported.", Ref: ref("github.com/openshift/api/operator/v1.OpenShiftSDNConfig"), }, }, @@ -47175,21 +47175,21 @@ func schema_openshift_api_operator_v1_FeaturesMigration(ref common.ReferenceCall Properties: map[string]spec.Schema{ "egressIP": { SchemaProps: spec.SchemaProps{ - Description: "egressIP specifies whether or not the Egress IP configuration is migrated automatically when changing the cluster default network provider. If unset, this property defaults to 'true' and Egress IP configure is migrated.", + Description: "egressIP specified whether or not the Egress IP configuration was migrated. DEPRECATED: network type migration is no longer supported.", Type: []string{"boolean"}, Format: "", }, }, "egressFirewall": { SchemaProps: spec.SchemaProps{ - Description: "egressFirewall specifies whether or not the Egress Firewall configuration is migrated automatically when changing the cluster default network provider. If unset, this property defaults to 'true' and Egress Firewall configure is migrated.", + Description: "egressFirewall specified whether or not the Egress Firewall configuration was migrated. DEPRECATED: network type migration is no longer supported.", Type: []string{"boolean"}, Format: "", }, }, "multicast": { SchemaProps: spec.SchemaProps{ - Description: "multicast specifies whether or not the multicast configuration is migrated automatically when changing the cluster default network provider. If unset, this property defaults to 'true' and multicast configure is migrated.", + Description: "multicast specified whether or not the multicast configuration was migrated. DEPRECATED: network type migration is no longer supported.", Type: []string{"boolean"}, Format: "", }, @@ -50323,7 +50323,7 @@ func schema_openshift_api_operator_v1_MTUMigration(ref common.ReferenceCallback) return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "MTUMigration MTU contains infomation about MTU migration.", + Description: "MTUMigration contains infomation about MTU migration.", Type: []string{"object"}, Properties: map[string]spec.Schema{ "network": { @@ -51044,32 +51044,31 @@ func schema_openshift_api_operator_v1_NetworkMigration(ref common.ReferenceCallb return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "NetworkMigration represents the cluster network configuration.", + Description: "NetworkMigration represents the cluster network migration configuration.", Type: []string{"object"}, Properties: map[string]spec.Schema{ - "networkType": { - SchemaProps: spec.SchemaProps{ - Description: "networkType is the target type of network migration. Set this to the target network type to allow changing the default network. If unset, the operation of changing cluster default network plugin will be rejected. The supported values are OpenShiftSDN, OVNKubernetes", - Type: []string{"string"}, - Format: "", - }, - }, "mtu": { SchemaProps: spec.SchemaProps{ Description: "mtu contains the MTU migration configuration. Set this to allow changing the MTU values for the default network. If unset, the operation of changing the MTU for the default network will be rejected.", Ref: ref("github.com/openshift/api/operator/v1.MTUMigration"), }, }, + "networkType": { + SchemaProps: spec.SchemaProps{ + Description: "networkType was previously used when changing the default network type. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", + Type: []string{"string"}, + Format: "", + }, + }, "features": { SchemaProps: spec.SchemaProps{ - Description: "features contains the features migration configuration. Set this to migrate feature configuration when changing the cluster default network provider. if unset, the default operation is to migrate all the configuration of supported features.", + Description: "features was previously used to configure which network plugin features would be migrated in a network type migration. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", Ref: ref("github.com/openshift/api/operator/v1.FeaturesMigration"), }, }, "mode": { SchemaProps: spec.SchemaProps{ - Description: "mode indicates the mode of network migration. The supported values are \"Live\", \"Offline\" and omitted. A \"Live\" migration operation will not cause service interruption by migrating the CNI of each node one by one. The cluster network will work as normal during the network migration. An \"Offline\" migration operation will cause service interruption. During an \"Offline\" migration, two rounds of node reboots are required. The cluster network will be malfunctioning during the network migration. When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The current default value is \"Offline\".", - Default: "", + Description: "mode indicates the mode of network type migration. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", Type: []string{"string"}, Format: "", }, @@ -51132,7 +51131,7 @@ func schema_openshift_api_operator_v1_NetworkSpec(ref common.ReferenceCallback) }, }, SchemaProps: spec.SchemaProps{ - Description: "clusterNetwork is the IP address pool to use for pod IPs. Some network providers, e.g. OpenShift SDN, support multiple ClusterNetworks. Others only support one. This is equivalent to the cluster-cidr.", + Description: "clusterNetwork is the IP address pool to use for pod IPs. Some network providers support multiple ClusterNetworks. Others only support one. This is equivalent to the cluster-cidr.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ @@ -51209,7 +51208,7 @@ func schema_openshift_api_operator_v1_NetworkSpec(ref common.ReferenceCallback) }, "deployKubeProxy": { SchemaProps: spec.SchemaProps{ - Description: "deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin will attempt to select the correct value, which is false when OpenShift SDN and ovn-kubernetes are used and true otherwise.", + Description: "deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin will attempt to select the correct value, which is false when ovn-kubernetes is used and true otherwise.", Type: []string{"boolean"}, Format: "", }, @@ -51224,7 +51223,7 @@ func schema_openshift_api_operator_v1_NetworkSpec(ref common.ReferenceCallback) }, "kubeProxyConfig": { SchemaProps: spec.SchemaProps{ - Description: "kubeProxyConfig lets us configure desired proxy configuration. If not specified, sensible defaults will be chosen by OpenShift directly. Not consumed by all network providers - currently only openshift-sdn.", + Description: "kubeProxyConfig lets us configure desired proxy configuration, if deployKubeProxy is true. If not specified, sensible defaults will be chosen by OpenShift directly.", Ref: ref("github.com/openshift/api/operator/v1.ProxyConfig"), }, }, @@ -51236,7 +51235,7 @@ func schema_openshift_api_operator_v1_NetworkSpec(ref common.ReferenceCallback) }, "migration": { SchemaProps: spec.SchemaProps{ - Description: "migration enables and configures the cluster network migration. The migration procedure allows to change the network type and the MTU.", + Description: "migration enables and configures cluster network migration, for network changes that cannot be made instantly.", Ref: ref("github.com/openshift/api/operator/v1.NetworkMigration"), }, }, @@ -52562,7 +52561,7 @@ func schema_openshift_api_operator_v1_OpenShiftSDNConfig(ref common.ReferenceCal return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "OpenShiftSDNConfig configures the three openshift-sdn plugins", + Description: "OpenShiftSDNConfig was used to configure the OpenShift SDN plugin. It is no longer used.", Type: []string{"object"}, Properties: map[string]spec.Schema{ "mode": { @@ -52589,7 +52588,7 @@ func schema_openshift_api_operator_v1_OpenShiftSDNConfig(ref common.ReferenceCal }, "useExternalOpenvswitch": { SchemaProps: spec.SchemaProps{ - Description: "useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run as a system service, and this flag is ignored. DEPRECATED: non-functional as of 4.6", + Description: "useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run as a system service, and this flag is ignored.", Type: []string{"boolean"}, Format: "", }, diff --git a/openapi/openapi.json b/openapi/openapi.json index 388bfefb957..fa73f25b0a6 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -8052,15 +8052,15 @@ } }, "com.github.openshift.api.config.v1.NetworkMigration": { - "description": "NetworkMigration represents the cluster network configuration.", + "description": "NetworkMigration represents the network migration status.", "type": "object", "properties": { "mtu": { - "description": "MTU contains the MTU migration configuration.", + "description": "MTU is the MTU configuration that is being deployed.", "$ref": "#/definitions/com.github.openshift.api.config.v1.MTUMigration" }, "networkType": { - "description": "NetworkType is the target plugin that is to be deployed. Currently supported values are: OpenShiftSDN, OVNKubernetes", + "description": "NetworkType is the target plugin that is being deployed. DEPRECATED: network type migration is no longer supported, so this should always be unset.", "type": "string" } } @@ -8093,7 +8093,7 @@ "$ref": "#/definitions/com.github.openshift.api.config.v1.NetworkDiagnostics" }, "networkType": { - "description": "NetworkType is the plugin that is to be deployed (e.g. OpenShiftSDN). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently supported values are: - OpenShiftSDN This field is immutable after installation.", + "description": "NetworkType is the plugin that is to be deployed (e.g. OVNKubernetes). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently supported values are: - OVNKubernetes This field is immutable after installation.", "type": "string", "default": "" }, @@ -8131,7 +8131,7 @@ "format": "int32" }, "conditions": { - "description": "conditions represents the observations of a network.config current state. Known .status.conditions.type are: \"NetworkTypeMigrationInProgress\", \"NetworkTypeMigrationMTUReady\", \"NetworkTypeMigrationTargetCNIAvailable\", \"NetworkTypeMigrationTargetCNIInUse\", \"NetworkTypeMigrationOriginalCNIPurged\" and \"NetworkDiagnosticsAvailable\"", + "description": "conditions represents the observations of a network.config current state. Known .status.conditions.type are: \"NetworkDiagnosticsAvailable\"", "type": "array", "items": { "default": {}, @@ -8149,7 +8149,7 @@ "$ref": "#/definitions/com.github.openshift.api.config.v1.NetworkMigration" }, "networkType": { - "description": "NetworkType is the plugin that is deployed (e.g. OpenShiftSDN).", + "description": "NetworkType is the plugin that is deployed (e.g. OVNKubernetes).", "type": "string" }, "serviceNetwork": { @@ -23470,7 +23470,7 @@ } }, "com.github.openshift.api.network.v1.ClusterNetwork": { - "description": "ClusterNetwork describes the cluster network. There is normally only one object of this type, named \"default\", which is created by the SDN network plugin based on the master configuration when the cluster is brought up for the first time.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "description": "ClusterNetwork was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "serviceNetwork", @@ -23580,7 +23580,7 @@ } }, "com.github.openshift.api.network.v1.EgressNetworkPolicy": { - "description": "EgressNetworkPolicy describes the current egress network policy for a Namespace. When using the 'redhat/openshift-ovs-multitenant' network plugin, traffic from a pod to an IP address outside the cluster will be checked against each EgressNetworkPolicyRule in the pod's namespace's EgressNetworkPolicy, in order. If no rule matches (or no EgressNetworkPolicy is present) then the traffic will be allowed by default.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "description": "EgressNetworkPolicy was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "spec" @@ -23688,7 +23688,7 @@ } }, "com.github.openshift.api.network.v1.HostSubnet": { - "description": "HostSubnet describes the container subnet network on a node. The HostSubnet object must have the same name as the Node object it corresponds to.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "description": "HostSubnet was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "host", @@ -23773,7 +23773,7 @@ } }, "com.github.openshift.api.network.v1.NetNamespace": { - "description": "NetNamespace describes a single isolated network. When using the redhat/openshift-ovs-multitenant plugin, every Namespace will have a corresponding NetNamespace object with the same name. (When using redhat/openshift-ovs-subnet, NetNamespaces are not used.)\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "description": "NetNamespace was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "netname", @@ -27039,7 +27039,7 @@ ], "properties": { "openshiftSDNConfig": { - "description": "openShiftSDNConfig configures the openshift-sdn plugin", + "description": "openShiftSDNConfig was previously used to configure the openshift-sdn plugin. DEPRECATED: OpenShift SDN is no longer supported.", "$ref": "#/definitions/com.github.openshift.api.operator.v1.OpenShiftSDNConfig" }, "ovnKubernetesConfig": { @@ -27446,15 +27446,15 @@ "type": "object", "properties": { "egressFirewall": { - "description": "egressFirewall specifies whether or not the Egress Firewall configuration is migrated automatically when changing the cluster default network provider. If unset, this property defaults to 'true' and Egress Firewall configure is migrated.", + "description": "egressFirewall specified whether or not the Egress Firewall configuration was migrated. DEPRECATED: network type migration is no longer supported.", "type": "boolean" }, "egressIP": { - "description": "egressIP specifies whether or not the Egress IP configuration is migrated automatically when changing the cluster default network provider. If unset, this property defaults to 'true' and Egress IP configure is migrated.", + "description": "egressIP specified whether or not the Egress IP configuration was migrated. DEPRECATED: network type migration is no longer supported.", "type": "boolean" }, "multicast": { - "description": "multicast specifies whether or not the multicast configuration is migrated automatically when changing the cluster default network provider. If unset, this property defaults to 'true' and multicast configure is migrated.", + "description": "multicast specified whether or not the multicast configuration was migrated. DEPRECATED: network type migration is no longer supported.", "type": "boolean" } } @@ -29311,7 +29311,7 @@ ] }, "com.github.openshift.api.operator.v1.MTUMigration": { - "description": "MTUMigration MTU contains infomation about MTU migration.", + "description": "MTUMigration contains infomation about MTU migration.", "type": "object", "properties": { "machine": { @@ -29740,24 +29740,23 @@ } }, "com.github.openshift.api.operator.v1.NetworkMigration": { - "description": "NetworkMigration represents the cluster network configuration.", + "description": "NetworkMigration represents the cluster network migration configuration.", "type": "object", "properties": { "features": { - "description": "features contains the features migration configuration. Set this to migrate feature configuration when changing the cluster default network provider. if unset, the default operation is to migrate all the configuration of supported features.", + "description": "features was previously used to configure which network plugin features would be migrated in a network type migration. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", "$ref": "#/definitions/com.github.openshift.api.operator.v1.FeaturesMigration" }, "mode": { - "description": "mode indicates the mode of network migration. The supported values are \"Live\", \"Offline\" and omitted. A \"Live\" migration operation will not cause service interruption by migrating the CNI of each node one by one. The cluster network will work as normal during the network migration. An \"Offline\" migration operation will cause service interruption. During an \"Offline\" migration, two rounds of node reboots are required. The cluster network will be malfunctioning during the network migration. When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The current default value is \"Offline\".", - "type": "string", - "default": "" + "description": "mode indicates the mode of network type migration. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", + "type": "string" }, "mtu": { "description": "mtu contains the MTU migration configuration. Set this to allow changing the MTU values for the default network. If unset, the operation of changing the MTU for the default network will be rejected.", "$ref": "#/definitions/com.github.openshift.api.operator.v1.MTUMigration" }, "networkType": { - "description": "networkType is the target type of network migration. Set this to the target network type to allow changing the default network. If unset, the operation of changing cluster default network plugin will be rejected. The supported values are OpenShiftSDN, OVNKubernetes", + "description": "networkType was previously used when changing the default network type. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", "type": "string" } } @@ -29789,7 +29788,7 @@ "$ref": "#/definitions/com.github.openshift.api.operator.v1.AdditionalRoutingCapabilities" }, "clusterNetwork": { - "description": "clusterNetwork is the IP address pool to use for pod IPs. Some network providers, e.g. OpenShift SDN, support multiple ClusterNetworks. Others only support one. This is equivalent to the cluster-cidr.", + "description": "clusterNetwork is the IP address pool to use for pod IPs. Some network providers support multiple ClusterNetworks. Others only support one. This is equivalent to the cluster-cidr.", "type": "array", "items": { "default": {}, @@ -29803,7 +29802,7 @@ "$ref": "#/definitions/com.github.openshift.api.operator.v1.DefaultNetworkDefinition" }, "deployKubeProxy": { - "description": "deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin will attempt to select the correct value, which is false when OpenShift SDN and ovn-kubernetes are used and true otherwise.", + "description": "deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin will attempt to select the correct value, which is false when ovn-kubernetes is used and true otherwise.", "type": "boolean" }, "disableMultiNetwork": { @@ -29820,7 +29819,7 @@ "$ref": "#/definitions/com.github.openshift.api.operator.v1.ExportNetworkFlows" }, "kubeProxyConfig": { - "description": "kubeProxyConfig lets us configure desired proxy configuration. If not specified, sensible defaults will be chosen by OpenShift directly. Not consumed by all network providers - currently only openshift-sdn.", + "description": "kubeProxyConfig lets us configure desired proxy configuration, if deployKubeProxy is true. If not specified, sensible defaults will be chosen by OpenShift directly.", "$ref": "#/definitions/com.github.openshift.api.operator.v1.ProxyConfig" }, "logLevel": { @@ -29833,7 +29832,7 @@ "default": "" }, "migration": { - "description": "migration enables and configures the cluster network migration. The migration procedure allows to change the network type and the MTU.", + "description": "migration enables and configures cluster network migration, for network changes that cannot be made instantly.", "$ref": "#/definitions/com.github.openshift.api.operator.v1.NetworkMigration" }, "observedConfig": { @@ -30621,7 +30620,7 @@ } }, "com.github.openshift.api.operator.v1.OpenShiftSDNConfig": { - "description": "OpenShiftSDNConfig configures the three openshift-sdn plugins", + "description": "OpenShiftSDNConfig was used to configure the OpenShift SDN plugin. It is no longer used.", "type": "object", "required": [ "mode" @@ -30642,7 +30641,7 @@ "format": "int64" }, "useExternalOpenvswitch": { - "description": "useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run as a system service, and this flag is ignored. DEPRECATED: non-functional as of 4.6", + "description": "useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run as a system service, and this flag is ignored.", "type": "boolean" }, "vxlanPort": { diff --git a/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-CustomNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-CustomNoUpgrade.crd.yaml index 6c49c5ed3a2..a5041108f65 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-CustomNoUpgrade.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-CustomNoUpgrade.crd.yaml @@ -201,9 +201,8 @@ spec: type: object clusterNetwork: description: clusterNetwork is the IP address pool to use for pod - IPs. Some network providers, e.g. OpenShift SDN, support multiple - ClusterNetworks. Others only support one. This is equivalent to - the cluster-cidr. + IPs. Some network providers support multiple ClusterNetworks. Others + only support one. This is equivalent to the cluster-cidr. items: description: ClusterNetworkEntry is a subnet from which to allocate PodIPs. A network of size HostPrefix (in CIDR notation) will be @@ -225,7 +224,9 @@ spec: will receive properties: openshiftSDNConfig: - description: openShiftSDNConfig configures the openshift-sdn plugin + description: 'openShiftSDNConfig was previously used to configure + the openshift-sdn plugin. DEPRECATED: OpenShift SDN is no longer + supported.' properties: enableUnidling: description: enableUnidling controls whether or not the service @@ -243,11 +244,10 @@ spec: minimum: 0 type: integer useExternalOpenvswitch: - description: 'useExternalOpenvswitch used to control whether + description: useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run - as a system service, and this flag is ignored. DEPRECATED: - non-functional as of 4.6' + as a system service, and this flag is ignored. type: boolean vxlanPort: description: vxlanPort is the port to use for all vxlan packets. @@ -637,8 +637,8 @@ spec: description: deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin - will attempt to select the correct value, which is false when OpenShift - SDN and ovn-kubernetes are used and true otherwise. + will attempt to select the correct value, which is false when ovn-kubernetes + is used and true otherwise. type: boolean disableMultiNetwork: description: disableMultiNetwork specifies whether or not multiple @@ -704,10 +704,9 @@ spec: type: object type: object kubeProxyConfig: - description: kubeProxyConfig lets us configure desired proxy configuration. - If not specified, sensible defaults will be chosen by OpenShift - directly. Not consumed by all network providers - currently only - openshift-sdn. + description: kubeProxyConfig lets us configure desired proxy configuration, + if deployKubeProxy is true. If not specified, sensible defaults + will be chosen by OpenShift directly. properties: bindAddress: description: The address to "bind" on Defaults to 0.0.0.0 @@ -751,50 +750,40 @@ spec: pattern: ^(Managed|Unmanaged|Force|Removed)$ type: string migration: - description: migration enables and configures the cluster network - migration. The migration procedure allows to change the network - type and the MTU. + description: migration enables and configures cluster network migration, + for network changes that cannot be made instantly. properties: features: - description: features contains the features migration configuration. - Set this to migrate feature configuration when changing the - cluster default network provider. if unset, the default operation - is to migrate all the configuration of supported features. + description: 'features was previously used to configure which + network plugin features would be migrated in a network type + migration. DEPRECATED: network type migration is no longer supported, + and setting this to a non-empty value will result in the network + operator rejecting the configuration.' properties: egressFirewall: default: true - description: egressFirewall specifies whether or not the Egress - Firewall configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress Firewall configure is migrated. + description: 'egressFirewall specified whether or not the + Egress Firewall configuration was migrated. DEPRECATED: + network type migration is no longer supported.' type: boolean egressIP: default: true - description: egressIP specifies whether or not the Egress - IP configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress IP configure is migrated. + description: 'egressIP specified whether or not the Egress + IP configuration was migrated. DEPRECATED: network type + migration is no longer supported.' type: boolean multicast: default: true - description: multicast specifies whether or not the multicast - configuration is migrated automatically when changing the - cluster default network provider. If unset, this property - defaults to 'true' and multicast configure is migrated. + description: 'multicast specified whether or not the multicast + configuration was migrated. DEPRECATED: network type migration + is no longer supported.' type: boolean type: object mode: - description: mode indicates the mode of network migration. The - supported values are "Live", "Offline" and omitted. A "Live" - migration operation will not cause service interruption by migrating - the CNI of each node one by one. The cluster network will work - as normal during the network migration. An "Offline" migration - operation will cause service interruption. During an "Offline" - migration, two rounds of node reboots are required. The cluster - network will be malfunctioning during the network migration. - When omitted, this means no opinion and the platform is left - to choose a reasonable default which is subject to change over - time. The current default value is "Offline". + description: 'mode indicates the mode of network type migration. + DEPRECATED: network type migration is no longer supported, and + setting this to a non-empty value will result in the network + operator rejecting the configuration.' enum: - Live - Offline @@ -842,11 +831,10 @@ spec: type: object type: object networkType: - description: networkType is the target type of network migration. - Set this to the target network type to allow changing the default - network. If unset, the operation of changing cluster default - network plugin will be rejected. The supported values are OpenShiftSDN, - OVNKubernetes + description: 'networkType was previously used when changing the + default network type. DEPRECATED: network type migration is + no longer supported, and setting this to a non-empty value will + result in the network operator rejecting the configuration.' type: string type: object x-kubernetes-validations: diff --git a/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-Default.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-Default.crd.yaml index 1c5a57c88d7..8a2935bde93 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-Default.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-Default.crd.yaml @@ -169,9 +169,8 @@ spec: x-kubernetes-list-type: map clusterNetwork: description: clusterNetwork is the IP address pool to use for pod - IPs. Some network providers, e.g. OpenShift SDN, support multiple - ClusterNetworks. Others only support one. This is equivalent to - the cluster-cidr. + IPs. Some network providers support multiple ClusterNetworks. Others + only support one. This is equivalent to the cluster-cidr. items: description: ClusterNetworkEntry is a subnet from which to allocate PodIPs. A network of size HostPrefix (in CIDR notation) will be @@ -193,7 +192,9 @@ spec: will receive properties: openshiftSDNConfig: - description: openShiftSDNConfig configures the openshift-sdn plugin + description: 'openShiftSDNConfig was previously used to configure + the openshift-sdn plugin. DEPRECATED: OpenShift SDN is no longer + supported.' properties: enableUnidling: description: enableUnidling controls whether or not the service @@ -211,11 +212,10 @@ spec: minimum: 0 type: integer useExternalOpenvswitch: - description: 'useExternalOpenvswitch used to control whether + description: useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run - as a system service, and this flag is ignored. DEPRECATED: - non-functional as of 4.6' + as a system service, and this flag is ignored. type: boolean vxlanPort: description: vxlanPort is the port to use for all vxlan packets. @@ -589,8 +589,8 @@ spec: description: deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin - will attempt to select the correct value, which is false when OpenShift - SDN and ovn-kubernetes are used and true otherwise. + will attempt to select the correct value, which is false when ovn-kubernetes + is used and true otherwise. type: boolean disableMultiNetwork: description: disableMultiNetwork specifies whether or not multiple @@ -656,10 +656,9 @@ spec: type: object type: object kubeProxyConfig: - description: kubeProxyConfig lets us configure desired proxy configuration. - If not specified, sensible defaults will be chosen by OpenShift - directly. Not consumed by all network providers - currently only - openshift-sdn. + description: kubeProxyConfig lets us configure desired proxy configuration, + if deployKubeProxy is true. If not specified, sensible defaults + will be chosen by OpenShift directly. properties: bindAddress: description: The address to "bind" on Defaults to 0.0.0.0 @@ -703,50 +702,40 @@ spec: pattern: ^(Managed|Unmanaged|Force|Removed)$ type: string migration: - description: migration enables and configures the cluster network - migration. The migration procedure allows to change the network - type and the MTU. + description: migration enables and configures cluster network migration, + for network changes that cannot be made instantly. properties: features: - description: features contains the features migration configuration. - Set this to migrate feature configuration when changing the - cluster default network provider. if unset, the default operation - is to migrate all the configuration of supported features. + description: 'features was previously used to configure which + network plugin features would be migrated in a network type + migration. DEPRECATED: network type migration is no longer supported, + and setting this to a non-empty value will result in the network + operator rejecting the configuration.' properties: egressFirewall: default: true - description: egressFirewall specifies whether or not the Egress - Firewall configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress Firewall configure is migrated. + description: 'egressFirewall specified whether or not the + Egress Firewall configuration was migrated. DEPRECATED: + network type migration is no longer supported.' type: boolean egressIP: default: true - description: egressIP specifies whether or not the Egress - IP configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress IP configure is migrated. + description: 'egressIP specified whether or not the Egress + IP configuration was migrated. DEPRECATED: network type + migration is no longer supported.' type: boolean multicast: default: true - description: multicast specifies whether or not the multicast - configuration is migrated automatically when changing the - cluster default network provider. If unset, this property - defaults to 'true' and multicast configure is migrated. + description: 'multicast specified whether or not the multicast + configuration was migrated. DEPRECATED: network type migration + is no longer supported.' type: boolean type: object mode: - description: mode indicates the mode of network migration. The - supported values are "Live", "Offline" and omitted. A "Live" - migration operation will not cause service interruption by migrating - the CNI of each node one by one. The cluster network will work - as normal during the network migration. An "Offline" migration - operation will cause service interruption. During an "Offline" - migration, two rounds of node reboots are required. The cluster - network will be malfunctioning during the network migration. - When omitted, this means no opinion and the platform is left - to choose a reasonable default which is subject to change over - time. The current default value is "Offline". + description: 'mode indicates the mode of network type migration. + DEPRECATED: network type migration is no longer supported, and + setting this to a non-empty value will result in the network + operator rejecting the configuration.' enum: - Live - Offline @@ -794,11 +783,10 @@ spec: type: object type: object networkType: - description: networkType is the target type of network migration. - Set this to the target network type to allow changing the default - network. If unset, the operation of changing cluster default - network plugin will be rejected. The supported values are OpenShiftSDN, - OVNKubernetes + description: 'networkType was previously used when changing the + default network type. DEPRECATED: network type migration is + no longer supported, and setting this to a non-empty value will + result in the network operator rejecting the configuration.' type: string type: object x-kubernetes-validations: diff --git a/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-DevPreviewNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-DevPreviewNoUpgrade.crd.yaml index 7fe5b57cc27..f3511c1229a 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-DevPreviewNoUpgrade.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-DevPreviewNoUpgrade.crd.yaml @@ -201,9 +201,8 @@ spec: type: object clusterNetwork: description: clusterNetwork is the IP address pool to use for pod - IPs. Some network providers, e.g. OpenShift SDN, support multiple - ClusterNetworks. Others only support one. This is equivalent to - the cluster-cidr. + IPs. Some network providers support multiple ClusterNetworks. Others + only support one. This is equivalent to the cluster-cidr. items: description: ClusterNetworkEntry is a subnet from which to allocate PodIPs. A network of size HostPrefix (in CIDR notation) will be @@ -225,7 +224,9 @@ spec: will receive properties: openshiftSDNConfig: - description: openShiftSDNConfig configures the openshift-sdn plugin + description: 'openShiftSDNConfig was previously used to configure + the openshift-sdn plugin. DEPRECATED: OpenShift SDN is no longer + supported.' properties: enableUnidling: description: enableUnidling controls whether or not the service @@ -243,11 +244,10 @@ spec: minimum: 0 type: integer useExternalOpenvswitch: - description: 'useExternalOpenvswitch used to control whether + description: useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run - as a system service, and this flag is ignored. DEPRECATED: - non-functional as of 4.6' + as a system service, and this flag is ignored. type: boolean vxlanPort: description: vxlanPort is the port to use for all vxlan packets. @@ -637,8 +637,8 @@ spec: description: deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin - will attempt to select the correct value, which is false when OpenShift - SDN and ovn-kubernetes are used and true otherwise. + will attempt to select the correct value, which is false when ovn-kubernetes + is used and true otherwise. type: boolean disableMultiNetwork: description: disableMultiNetwork specifies whether or not multiple @@ -704,10 +704,9 @@ spec: type: object type: object kubeProxyConfig: - description: kubeProxyConfig lets us configure desired proxy configuration. - If not specified, sensible defaults will be chosen by OpenShift - directly. Not consumed by all network providers - currently only - openshift-sdn. + description: kubeProxyConfig lets us configure desired proxy configuration, + if deployKubeProxy is true. If not specified, sensible defaults + will be chosen by OpenShift directly. properties: bindAddress: description: The address to "bind" on Defaults to 0.0.0.0 @@ -751,50 +750,40 @@ spec: pattern: ^(Managed|Unmanaged|Force|Removed)$ type: string migration: - description: migration enables and configures the cluster network - migration. The migration procedure allows to change the network - type and the MTU. + description: migration enables and configures cluster network migration, + for network changes that cannot be made instantly. properties: features: - description: features contains the features migration configuration. - Set this to migrate feature configuration when changing the - cluster default network provider. if unset, the default operation - is to migrate all the configuration of supported features. + description: 'features was previously used to configure which + network plugin features would be migrated in a network type + migration. DEPRECATED: network type migration is no longer supported, + and setting this to a non-empty value will result in the network + operator rejecting the configuration.' properties: egressFirewall: default: true - description: egressFirewall specifies whether or not the Egress - Firewall configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress Firewall configure is migrated. + description: 'egressFirewall specified whether or not the + Egress Firewall configuration was migrated. DEPRECATED: + network type migration is no longer supported.' type: boolean egressIP: default: true - description: egressIP specifies whether or not the Egress - IP configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress IP configure is migrated. + description: 'egressIP specified whether or not the Egress + IP configuration was migrated. DEPRECATED: network type + migration is no longer supported.' type: boolean multicast: default: true - description: multicast specifies whether or not the multicast - configuration is migrated automatically when changing the - cluster default network provider. If unset, this property - defaults to 'true' and multicast configure is migrated. + description: 'multicast specified whether or not the multicast + configuration was migrated. DEPRECATED: network type migration + is no longer supported.' type: boolean type: object mode: - description: mode indicates the mode of network migration. The - supported values are "Live", "Offline" and omitted. A "Live" - migration operation will not cause service interruption by migrating - the CNI of each node one by one. The cluster network will work - as normal during the network migration. An "Offline" migration - operation will cause service interruption. During an "Offline" - migration, two rounds of node reboots are required. The cluster - network will be malfunctioning during the network migration. - When omitted, this means no opinion and the platform is left - to choose a reasonable default which is subject to change over - time. The current default value is "Offline". + description: 'mode indicates the mode of network type migration. + DEPRECATED: network type migration is no longer supported, and + setting this to a non-empty value will result in the network + operator rejecting the configuration.' enum: - Live - Offline @@ -842,11 +831,10 @@ spec: type: object type: object networkType: - description: networkType is the target type of network migration. - Set this to the target network type to allow changing the default - network. If unset, the operation of changing cluster default - network plugin will be rejected. The supported values are OpenShiftSDN, - OVNKubernetes + description: 'networkType was previously used when changing the + default network type. DEPRECATED: network type migration is + no longer supported, and setting this to a non-empty value will + result in the network operator rejecting the configuration.' type: string type: object x-kubernetes-validations: diff --git a/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-TechPreviewNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-TechPreviewNoUpgrade.crd.yaml index 63508184e70..a2abe7a9b0b 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-TechPreviewNoUpgrade.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks-TechPreviewNoUpgrade.crd.yaml @@ -201,9 +201,8 @@ spec: type: object clusterNetwork: description: clusterNetwork is the IP address pool to use for pod - IPs. Some network providers, e.g. OpenShift SDN, support multiple - ClusterNetworks. Others only support one. This is equivalent to - the cluster-cidr. + IPs. Some network providers support multiple ClusterNetworks. Others + only support one. This is equivalent to the cluster-cidr. items: description: ClusterNetworkEntry is a subnet from which to allocate PodIPs. A network of size HostPrefix (in CIDR notation) will be @@ -225,7 +224,9 @@ spec: will receive properties: openshiftSDNConfig: - description: openShiftSDNConfig configures the openshift-sdn plugin + description: 'openShiftSDNConfig was previously used to configure + the openshift-sdn plugin. DEPRECATED: OpenShift SDN is no longer + supported.' properties: enableUnidling: description: enableUnidling controls whether or not the service @@ -243,11 +244,10 @@ spec: minimum: 0 type: integer useExternalOpenvswitch: - description: 'useExternalOpenvswitch used to control whether + description: useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run - as a system service, and this flag is ignored. DEPRECATED: - non-functional as of 4.6' + as a system service, and this flag is ignored. type: boolean vxlanPort: description: vxlanPort is the port to use for all vxlan packets. @@ -637,8 +637,8 @@ spec: description: deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin - will attempt to select the correct value, which is false when OpenShift - SDN and ovn-kubernetes are used and true otherwise. + will attempt to select the correct value, which is false when ovn-kubernetes + is used and true otherwise. type: boolean disableMultiNetwork: description: disableMultiNetwork specifies whether or not multiple @@ -704,10 +704,9 @@ spec: type: object type: object kubeProxyConfig: - description: kubeProxyConfig lets us configure desired proxy configuration. - If not specified, sensible defaults will be chosen by OpenShift - directly. Not consumed by all network providers - currently only - openshift-sdn. + description: kubeProxyConfig lets us configure desired proxy configuration, + if deployKubeProxy is true. If not specified, sensible defaults + will be chosen by OpenShift directly. properties: bindAddress: description: The address to "bind" on Defaults to 0.0.0.0 @@ -751,50 +750,40 @@ spec: pattern: ^(Managed|Unmanaged|Force|Removed)$ type: string migration: - description: migration enables and configures the cluster network - migration. The migration procedure allows to change the network - type and the MTU. + description: migration enables and configures cluster network migration, + for network changes that cannot be made instantly. properties: features: - description: features contains the features migration configuration. - Set this to migrate feature configuration when changing the - cluster default network provider. if unset, the default operation - is to migrate all the configuration of supported features. + description: 'features was previously used to configure which + network plugin features would be migrated in a network type + migration. DEPRECATED: network type migration is no longer supported, + and setting this to a non-empty value will result in the network + operator rejecting the configuration.' properties: egressFirewall: default: true - description: egressFirewall specifies whether or not the Egress - Firewall configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress Firewall configure is migrated. + description: 'egressFirewall specified whether or not the + Egress Firewall configuration was migrated. DEPRECATED: + network type migration is no longer supported.' type: boolean egressIP: default: true - description: egressIP specifies whether or not the Egress - IP configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress IP configure is migrated. + description: 'egressIP specified whether or not the Egress + IP configuration was migrated. DEPRECATED: network type + migration is no longer supported.' type: boolean multicast: default: true - description: multicast specifies whether or not the multicast - configuration is migrated automatically when changing the - cluster default network provider. If unset, this property - defaults to 'true' and multicast configure is migrated. + description: 'multicast specified whether or not the multicast + configuration was migrated. DEPRECATED: network type migration + is no longer supported.' type: boolean type: object mode: - description: mode indicates the mode of network migration. The - supported values are "Live", "Offline" and omitted. A "Live" - migration operation will not cause service interruption by migrating - the CNI of each node one by one. The cluster network will work - as normal during the network migration. An "Offline" migration - operation will cause service interruption. During an "Offline" - migration, two rounds of node reboots are required. The cluster - network will be malfunctioning during the network migration. - When omitted, this means no opinion and the platform is left - to choose a reasonable default which is subject to change over - time. The current default value is "Offline". + description: 'mode indicates the mode of network type migration. + DEPRECATED: network type migration is no longer supported, and + setting this to a non-empty value will result in the network + operator rejecting the configuration.' enum: - Live - Offline @@ -842,11 +831,10 @@ spec: type: object type: object networkType: - description: networkType is the target type of network migration. - Set this to the target network type to allow changing the default - network. If unset, the operation of changing cluster default - network plugin will be rejected. The supported values are OpenShiftSDN, - OVNKubernetes + description: 'networkType was previously used when changing the + default network type. DEPRECATED: network type migration is + no longer supported, and setting this to a non-empty value will + result in the network operator rejecting the configuration.' type: string type: object x-kubernetes-validations: diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/AAA_ungated.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/AAA_ungated.yaml index fcef20d9666..eae3ae96f03 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/AAA_ungated.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/AAA_ungated.yaml @@ -169,9 +169,8 @@ spec: x-kubernetes-list-type: map clusterNetwork: description: clusterNetwork is the IP address pool to use for pod - IPs. Some network providers, e.g. OpenShift SDN, support multiple - ClusterNetworks. Others only support one. This is equivalent to - the cluster-cidr. + IPs. Some network providers support multiple ClusterNetworks. Others + only support one. This is equivalent to the cluster-cidr. items: description: ClusterNetworkEntry is a subnet from which to allocate PodIPs. A network of size HostPrefix (in CIDR notation) will be @@ -193,7 +192,9 @@ spec: will receive properties: openshiftSDNConfig: - description: openShiftSDNConfig configures the openshift-sdn plugin + description: 'openShiftSDNConfig was previously used to configure + the openshift-sdn plugin. DEPRECATED: OpenShift SDN is no longer + supported.' properties: enableUnidling: description: enableUnidling controls whether or not the service @@ -211,11 +212,10 @@ spec: minimum: 0 type: integer useExternalOpenvswitch: - description: 'useExternalOpenvswitch used to control whether + description: useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run - as a system service, and this flag is ignored. DEPRECATED: - non-functional as of 4.6' + as a system service, and this flag is ignored. type: boolean vxlanPort: description: vxlanPort is the port to use for all vxlan packets. @@ -589,8 +589,8 @@ spec: description: deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin - will attempt to select the correct value, which is false when OpenShift - SDN and ovn-kubernetes are used and true otherwise. + will attempt to select the correct value, which is false when ovn-kubernetes + is used and true otherwise. type: boolean disableMultiNetwork: description: disableMultiNetwork specifies whether or not multiple @@ -656,10 +656,9 @@ spec: type: object type: object kubeProxyConfig: - description: kubeProxyConfig lets us configure desired proxy configuration. - If not specified, sensible defaults will be chosen by OpenShift - directly. Not consumed by all network providers - currently only - openshift-sdn. + description: kubeProxyConfig lets us configure desired proxy configuration, + if deployKubeProxy is true. If not specified, sensible defaults + will be chosen by OpenShift directly. properties: bindAddress: description: The address to "bind" on Defaults to 0.0.0.0 @@ -703,50 +702,40 @@ spec: pattern: ^(Managed|Unmanaged|Force|Removed)$ type: string migration: - description: migration enables and configures the cluster network - migration. The migration procedure allows to change the network - type and the MTU. + description: migration enables and configures cluster network migration, + for network changes that cannot be made instantly. properties: features: - description: features contains the features migration configuration. - Set this to migrate feature configuration when changing the - cluster default network provider. if unset, the default operation - is to migrate all the configuration of supported features. + description: 'features was previously used to configure which + network plugin features would be migrated in a network type + migration. DEPRECATED: network type migration is no longer supported, + and setting this to a non-empty value will result in the network + operator rejecting the configuration.' properties: egressFirewall: default: true - description: egressFirewall specifies whether or not the Egress - Firewall configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress Firewall configure is migrated. + description: 'egressFirewall specified whether or not the + Egress Firewall configuration was migrated. DEPRECATED: + network type migration is no longer supported.' type: boolean egressIP: default: true - description: egressIP specifies whether or not the Egress - IP configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress IP configure is migrated. + description: 'egressIP specified whether or not the Egress + IP configuration was migrated. DEPRECATED: network type + migration is no longer supported.' type: boolean multicast: default: true - description: multicast specifies whether or not the multicast - configuration is migrated automatically when changing the - cluster default network provider. If unset, this property - defaults to 'true' and multicast configure is migrated. + description: 'multicast specified whether or not the multicast + configuration was migrated. DEPRECATED: network type migration + is no longer supported.' type: boolean type: object mode: - description: mode indicates the mode of network migration. The - supported values are "Live", "Offline" and omitted. A "Live" - migration operation will not cause service interruption by migrating - the CNI of each node one by one. The cluster network will work - as normal during the network migration. An "Offline" migration - operation will cause service interruption. During an "Offline" - migration, two rounds of node reboots are required. The cluster - network will be malfunctioning during the network migration. - When omitted, this means no opinion and the platform is left - to choose a reasonable default which is subject to change over - time. The current default value is "Offline". + description: 'mode indicates the mode of network type migration. + DEPRECATED: network type migration is no longer supported, and + setting this to a non-empty value will result in the network + operator rejecting the configuration.' enum: - Live - Offline @@ -794,11 +783,10 @@ spec: type: object type: object networkType: - description: networkType is the target type of network migration. - Set this to the target network type to allow changing the default - network. If unset, the operation of changing cluster default - network plugin will be rejected. The supported values are OpenShiftSDN, - OVNKubernetes + description: 'networkType was previously used when changing the + default network type. DEPRECATED: network type migration is + no longer supported, and setting this to a non-empty value will + result in the network operator rejecting the configuration.' type: string type: object observedConfig: diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/AdditionalRoutingCapabilities.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/AdditionalRoutingCapabilities.yaml index 0ed93454be3..9ae866443dc 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/AdditionalRoutingCapabilities.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/AdditionalRoutingCapabilities.yaml @@ -201,9 +201,8 @@ spec: type: object clusterNetwork: description: clusterNetwork is the IP address pool to use for pod - IPs. Some network providers, e.g. OpenShift SDN, support multiple - ClusterNetworks. Others only support one. This is equivalent to - the cluster-cidr. + IPs. Some network providers support multiple ClusterNetworks. Others + only support one. This is equivalent to the cluster-cidr. items: description: ClusterNetworkEntry is a subnet from which to allocate PodIPs. A network of size HostPrefix (in CIDR notation) will be @@ -225,7 +224,9 @@ spec: will receive properties: openshiftSDNConfig: - description: openShiftSDNConfig configures the openshift-sdn plugin + description: 'openShiftSDNConfig was previously used to configure + the openshift-sdn plugin. DEPRECATED: OpenShift SDN is no longer + supported.' properties: enableUnidling: description: enableUnidling controls whether or not the service @@ -243,11 +244,10 @@ spec: minimum: 0 type: integer useExternalOpenvswitch: - description: 'useExternalOpenvswitch used to control whether + description: useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run - as a system service, and this flag is ignored. DEPRECATED: - non-functional as of 4.6' + as a system service, and this flag is ignored. type: boolean vxlanPort: description: vxlanPort is the port to use for all vxlan packets. @@ -621,8 +621,8 @@ spec: description: deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin - will attempt to select the correct value, which is false when OpenShift - SDN and ovn-kubernetes are used and true otherwise. + will attempt to select the correct value, which is false when ovn-kubernetes + is used and true otherwise. type: boolean disableMultiNetwork: description: disableMultiNetwork specifies whether or not multiple @@ -688,10 +688,9 @@ spec: type: object type: object kubeProxyConfig: - description: kubeProxyConfig lets us configure desired proxy configuration. - If not specified, sensible defaults will be chosen by OpenShift - directly. Not consumed by all network providers - currently only - openshift-sdn. + description: kubeProxyConfig lets us configure desired proxy configuration, + if deployKubeProxy is true. If not specified, sensible defaults + will be chosen by OpenShift directly. properties: bindAddress: description: The address to "bind" on Defaults to 0.0.0.0 @@ -735,50 +734,40 @@ spec: pattern: ^(Managed|Unmanaged|Force|Removed)$ type: string migration: - description: migration enables and configures the cluster network - migration. The migration procedure allows to change the network - type and the MTU. + description: migration enables and configures cluster network migration, + for network changes that cannot be made instantly. properties: features: - description: features contains the features migration configuration. - Set this to migrate feature configuration when changing the - cluster default network provider. if unset, the default operation - is to migrate all the configuration of supported features. + description: 'features was previously used to configure which + network plugin features would be migrated in a network type + migration. DEPRECATED: network type migration is no longer supported, + and setting this to a non-empty value will result in the network + operator rejecting the configuration.' properties: egressFirewall: default: true - description: egressFirewall specifies whether or not the Egress - Firewall configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress Firewall configure is migrated. + description: 'egressFirewall specified whether or not the + Egress Firewall configuration was migrated. DEPRECATED: + network type migration is no longer supported.' type: boolean egressIP: default: true - description: egressIP specifies whether or not the Egress - IP configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress IP configure is migrated. + description: 'egressIP specified whether or not the Egress + IP configuration was migrated. DEPRECATED: network type + migration is no longer supported.' type: boolean multicast: default: true - description: multicast specifies whether or not the multicast - configuration is migrated automatically when changing the - cluster default network provider. If unset, this property - defaults to 'true' and multicast configure is migrated. + description: 'multicast specified whether or not the multicast + configuration was migrated. DEPRECATED: network type migration + is no longer supported.' type: boolean type: object mode: - description: mode indicates the mode of network migration. The - supported values are "Live", "Offline" and omitted. A "Live" - migration operation will not cause service interruption by migrating - the CNI of each node one by one. The cluster network will work - as normal during the network migration. An "Offline" migration - operation will cause service interruption. During an "Offline" - migration, two rounds of node reboots are required. The cluster - network will be malfunctioning during the network migration. - When omitted, this means no opinion and the platform is left - to choose a reasonable default which is subject to change over - time. The current default value is "Offline". + description: 'mode indicates the mode of network type migration. + DEPRECATED: network type migration is no longer supported, and + setting this to a non-empty value will result in the network + operator rejecting the configuration.' enum: - Live - Offline @@ -826,11 +815,10 @@ spec: type: object type: object networkType: - description: networkType is the target type of network migration. - Set this to the target network type to allow changing the default - network. If unset, the operation of changing cluster default - network plugin will be rejected. The supported values are OpenShiftSDN, - OVNKubernetes + description: 'networkType was previously used when changing the + default network type. DEPRECATED: network type migration is + no longer supported, and setting this to a non-empty value will + result in the network operator rejecting the configuration.' type: string type: object observedConfig: diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/NetworkLiveMigration.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/NetworkLiveMigration.yaml index a8bfc323dcd..d678d689179 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/NetworkLiveMigration.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/NetworkLiveMigration.yaml @@ -169,9 +169,8 @@ spec: x-kubernetes-list-type: map clusterNetwork: description: clusterNetwork is the IP address pool to use for pod - IPs. Some network providers, e.g. OpenShift SDN, support multiple - ClusterNetworks. Others only support one. This is equivalent to - the cluster-cidr. + IPs. Some network providers support multiple ClusterNetworks. Others + only support one. This is equivalent to the cluster-cidr. items: description: ClusterNetworkEntry is a subnet from which to allocate PodIPs. A network of size HostPrefix (in CIDR notation) will be @@ -193,7 +192,9 @@ spec: will receive properties: openshiftSDNConfig: - description: openShiftSDNConfig configures the openshift-sdn plugin + description: 'openShiftSDNConfig was previously used to configure + the openshift-sdn plugin. DEPRECATED: OpenShift SDN is no longer + supported.' properties: enableUnidling: description: enableUnidling controls whether or not the service @@ -211,11 +212,10 @@ spec: minimum: 0 type: integer useExternalOpenvswitch: - description: 'useExternalOpenvswitch used to control whether + description: useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run - as a system service, and this flag is ignored. DEPRECATED: - non-functional as of 4.6' + as a system service, and this flag is ignored. type: boolean vxlanPort: description: vxlanPort is the port to use for all vxlan packets. @@ -589,8 +589,8 @@ spec: description: deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin - will attempt to select the correct value, which is false when OpenShift - SDN and ovn-kubernetes are used and true otherwise. + will attempt to select the correct value, which is false when ovn-kubernetes + is used and true otherwise. type: boolean disableMultiNetwork: description: disableMultiNetwork specifies whether or not multiple @@ -656,10 +656,9 @@ spec: type: object type: object kubeProxyConfig: - description: kubeProxyConfig lets us configure desired proxy configuration. - If not specified, sensible defaults will be chosen by OpenShift - directly. Not consumed by all network providers - currently only - openshift-sdn. + description: kubeProxyConfig lets us configure desired proxy configuration, + if deployKubeProxy is true. If not specified, sensible defaults + will be chosen by OpenShift directly. properties: bindAddress: description: The address to "bind" on Defaults to 0.0.0.0 @@ -703,50 +702,40 @@ spec: pattern: ^(Managed|Unmanaged|Force|Removed)$ type: string migration: - description: migration enables and configures the cluster network - migration. The migration procedure allows to change the network - type and the MTU. + description: migration enables and configures cluster network migration, + for network changes that cannot be made instantly. properties: features: - description: features contains the features migration configuration. - Set this to migrate feature configuration when changing the - cluster default network provider. if unset, the default operation - is to migrate all the configuration of supported features. + description: 'features was previously used to configure which + network plugin features would be migrated in a network type + migration. DEPRECATED: network type migration is no longer supported, + and setting this to a non-empty value will result in the network + operator rejecting the configuration.' properties: egressFirewall: default: true - description: egressFirewall specifies whether or not the Egress - Firewall configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress Firewall configure is migrated. + description: 'egressFirewall specified whether or not the + Egress Firewall configuration was migrated. DEPRECATED: + network type migration is no longer supported.' type: boolean egressIP: default: true - description: egressIP specifies whether or not the Egress - IP configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress IP configure is migrated. + description: 'egressIP specified whether or not the Egress + IP configuration was migrated. DEPRECATED: network type + migration is no longer supported.' type: boolean multicast: default: true - description: multicast specifies whether or not the multicast - configuration is migrated automatically when changing the - cluster default network provider. If unset, this property - defaults to 'true' and multicast configure is migrated. + description: 'multicast specified whether or not the multicast + configuration was migrated. DEPRECATED: network type migration + is no longer supported.' type: boolean type: object mode: - description: mode indicates the mode of network migration. The - supported values are "Live", "Offline" and omitted. A "Live" - migration operation will not cause service interruption by migrating - the CNI of each node one by one. The cluster network will work - as normal during the network migration. An "Offline" migration - operation will cause service interruption. During an "Offline" - migration, two rounds of node reboots are required. The cluster - network will be malfunctioning during the network migration. - When omitted, this means no opinion and the platform is left - to choose a reasonable default which is subject to change over - time. The current default value is "Offline". + description: 'mode indicates the mode of network type migration. + DEPRECATED: network type migration is no longer supported, and + setting this to a non-empty value will result in the network + operator rejecting the configuration.' enum: - Live - Offline @@ -794,11 +783,10 @@ spec: type: object type: object networkType: - description: networkType is the target type of network migration. - Set this to the target network type to allow changing the default - network. If unset, the operation of changing cluster default - network plugin will be rejected. The supported values are OpenShiftSDN, - OVNKubernetes + description: 'networkType was previously used when changing the + default network type. DEPRECATED: network type migration is + no longer supported, and setting this to a non-empty value will + result in the network operator rejecting the configuration.' type: string type: object x-kubernetes-validations: diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/RouteAdvertisements.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/RouteAdvertisements.yaml index e41778328cf..0eeb17b7ffb 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/RouteAdvertisements.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/RouteAdvertisements.yaml @@ -169,9 +169,8 @@ spec: x-kubernetes-list-type: map clusterNetwork: description: clusterNetwork is the IP address pool to use for pod - IPs. Some network providers, e.g. OpenShift SDN, support multiple - ClusterNetworks. Others only support one. This is equivalent to - the cluster-cidr. + IPs. Some network providers support multiple ClusterNetworks. Others + only support one. This is equivalent to the cluster-cidr. items: description: ClusterNetworkEntry is a subnet from which to allocate PodIPs. A network of size HostPrefix (in CIDR notation) will be @@ -193,7 +192,9 @@ spec: will receive properties: openshiftSDNConfig: - description: openShiftSDNConfig configures the openshift-sdn plugin + description: 'openShiftSDNConfig was previously used to configure + the openshift-sdn plugin. DEPRECATED: OpenShift SDN is no longer + supported.' properties: enableUnidling: description: enableUnidling controls whether or not the service @@ -211,11 +212,10 @@ spec: minimum: 0 type: integer useExternalOpenvswitch: - description: 'useExternalOpenvswitch used to control whether + description: useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run - as a system service, and this flag is ignored. DEPRECATED: - non-functional as of 4.6' + as a system service, and this flag is ignored. type: boolean vxlanPort: description: vxlanPort is the port to use for all vxlan packets. @@ -605,8 +605,8 @@ spec: description: deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin - will attempt to select the correct value, which is false when OpenShift - SDN and ovn-kubernetes are used and true otherwise. + will attempt to select the correct value, which is false when ovn-kubernetes + is used and true otherwise. type: boolean disableMultiNetwork: description: disableMultiNetwork specifies whether or not multiple @@ -672,10 +672,9 @@ spec: type: object type: object kubeProxyConfig: - description: kubeProxyConfig lets us configure desired proxy configuration. - If not specified, sensible defaults will be chosen by OpenShift - directly. Not consumed by all network providers - currently only - openshift-sdn. + description: kubeProxyConfig lets us configure desired proxy configuration, + if deployKubeProxy is true. If not specified, sensible defaults + will be chosen by OpenShift directly. properties: bindAddress: description: The address to "bind" on Defaults to 0.0.0.0 @@ -719,50 +718,40 @@ spec: pattern: ^(Managed|Unmanaged|Force|Removed)$ type: string migration: - description: migration enables and configures the cluster network - migration. The migration procedure allows to change the network - type and the MTU. + description: migration enables and configures cluster network migration, + for network changes that cannot be made instantly. properties: features: - description: features contains the features migration configuration. - Set this to migrate feature configuration when changing the - cluster default network provider. if unset, the default operation - is to migrate all the configuration of supported features. + description: 'features was previously used to configure which + network plugin features would be migrated in a network type + migration. DEPRECATED: network type migration is no longer supported, + and setting this to a non-empty value will result in the network + operator rejecting the configuration.' properties: egressFirewall: default: true - description: egressFirewall specifies whether or not the Egress - Firewall configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress Firewall configure is migrated. + description: 'egressFirewall specified whether or not the + Egress Firewall configuration was migrated. DEPRECATED: + network type migration is no longer supported.' type: boolean egressIP: default: true - description: egressIP specifies whether or not the Egress - IP configuration is migrated automatically when changing - the cluster default network provider. If unset, this property - defaults to 'true' and Egress IP configure is migrated. + description: 'egressIP specified whether or not the Egress + IP configuration was migrated. DEPRECATED: network type + migration is no longer supported.' type: boolean multicast: default: true - description: multicast specifies whether or not the multicast - configuration is migrated automatically when changing the - cluster default network provider. If unset, this property - defaults to 'true' and multicast configure is migrated. + description: 'multicast specified whether or not the multicast + configuration was migrated. DEPRECATED: network type migration + is no longer supported.' type: boolean type: object mode: - description: mode indicates the mode of network migration. The - supported values are "Live", "Offline" and omitted. A "Live" - migration operation will not cause service interruption by migrating - the CNI of each node one by one. The cluster network will work - as normal during the network migration. An "Offline" migration - operation will cause service interruption. During an "Offline" - migration, two rounds of node reboots are required. The cluster - network will be malfunctioning during the network migration. - When omitted, this means no opinion and the platform is left - to choose a reasonable default which is subject to change over - time. The current default value is "Offline". + description: 'mode indicates the mode of network type migration. + DEPRECATED: network type migration is no longer supported, and + setting this to a non-empty value will result in the network + operator rejecting the configuration.' enum: - Live - Offline @@ -810,11 +799,10 @@ spec: type: object type: object networkType: - description: networkType is the target type of network migration. - Set this to the target network type to allow changing the default - network. If unset, the operation of changing cluster default - network plugin will be rejected. The supported values are OpenShiftSDN, - OVNKubernetes + description: 'networkType was previously used when changing the + default network type. DEPRECATED: network type migration is + no longer supported, and setting this to a non-empty value will + result in the network operator rejecting the configuration.' type: string type: object observedConfig: diff --git a/operator/v1/zz_generated.swagger_doc_generated.go b/operator/v1/zz_generated.swagger_doc_generated.go index c498c9e9e57..584ac52bcc6 100644 --- a/operator/v1/zz_generated.swagger_doc_generated.go +++ b/operator/v1/zz_generated.swagger_doc_generated.go @@ -1559,7 +1559,7 @@ func (ClusterNetworkEntry) SwaggerDoc() map[string]string { var map_DefaultNetworkDefinition = map[string]string{ "": "DefaultNetworkDefinition represents a single network plugin's configuration. type must be specified, along with exactly one \"Config\" that matches the type.", "type": "type is the type of network All NetworkTypes are supported except for NetworkTypeRaw", - "openshiftSDNConfig": "openShiftSDNConfig configures the openshift-sdn plugin", + "openshiftSDNConfig": "openShiftSDNConfig was previously used to configure the openshift-sdn plugin. DEPRECATED: OpenShift SDN is no longer supported.", "ovnKubernetesConfig": "ovnKubernetesConfig configures the ovn-kubernetes plugin.", } @@ -1587,9 +1587,9 @@ func (ExportNetworkFlows) SwaggerDoc() map[string]string { } var map_FeaturesMigration = map[string]string{ - "egressIP": "egressIP specifies whether or not the Egress IP configuration is migrated automatically when changing the cluster default network provider. If unset, this property defaults to 'true' and Egress IP configure is migrated.", - "egressFirewall": "egressFirewall specifies whether or not the Egress Firewall configuration is migrated automatically when changing the cluster default network provider. If unset, this property defaults to 'true' and Egress Firewall configure is migrated.", - "multicast": "multicast specifies whether or not the multicast configuration is migrated automatically when changing the cluster default network provider. If unset, this property defaults to 'true' and multicast configure is migrated.", + "egressIP": "egressIP specified whether or not the Egress IP configuration was migrated. DEPRECATED: network type migration is no longer supported.", + "egressFirewall": "egressFirewall specified whether or not the Egress Firewall configuration was migrated. DEPRECATED: network type migration is no longer supported.", + "multicast": "multicast specified whether or not the multicast configuration was migrated. DEPRECATED: network type migration is no longer supported.", } func (FeaturesMigration) SwaggerDoc() map[string]string { @@ -1680,7 +1680,7 @@ func (IPv6OVNKubernetesConfig) SwaggerDoc() map[string]string { } var map_MTUMigration = map[string]string{ - "": "MTUMigration MTU contains infomation about MTU migration.", + "": "MTUMigration contains infomation about MTU migration.", "network": "network contains information about MTU migration for the default network. Migrations are only allowed to MTU values lower than the machine's uplink MTU by the minimum appropriate offset.", "machine": "machine contains MTU migration configuration for the machine's uplink. Needs to be migrated along with the default network MTU unless the current uplink MTU already accommodates the default network MTU.", } @@ -1726,11 +1726,11 @@ func (NetworkList) SwaggerDoc() map[string]string { } var map_NetworkMigration = map[string]string{ - "": "NetworkMigration represents the cluster network configuration.", - "networkType": "networkType is the target type of network migration. Set this to the target network type to allow changing the default network. If unset, the operation of changing cluster default network plugin will be rejected. The supported values are OpenShiftSDN, OVNKubernetes", + "": "NetworkMigration represents the cluster network migration configuration.", "mtu": "mtu contains the MTU migration configuration. Set this to allow changing the MTU values for the default network. If unset, the operation of changing the MTU for the default network will be rejected.", - "features": "features contains the features migration configuration. Set this to migrate feature configuration when changing the cluster default network provider. if unset, the default operation is to migrate all the configuration of supported features.", - "mode": "mode indicates the mode of network migration. The supported values are \"Live\", \"Offline\" and omitted. A \"Live\" migration operation will not cause service interruption by migrating the CNI of each node one by one. The cluster network will work as normal during the network migration. An \"Offline\" migration operation will cause service interruption. During an \"Offline\" migration, two rounds of node reboots are required. The cluster network will be malfunctioning during the network migration. When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The current default value is \"Offline\".", + "networkType": "networkType was previously used when changing the default network type. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", + "features": "features was previously used to configure which network plugin features would be migrated in a network type migration. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", + "mode": "mode indicates the mode of network type migration. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", } func (NetworkMigration) SwaggerDoc() map[string]string { @@ -1739,17 +1739,17 @@ func (NetworkMigration) SwaggerDoc() map[string]string { var map_NetworkSpec = map[string]string{ "": "NetworkSpec is the top-level network configuration object.", - "clusterNetwork": "clusterNetwork is the IP address pool to use for pod IPs. Some network providers, e.g. OpenShift SDN, support multiple ClusterNetworks. Others only support one. This is equivalent to the cluster-cidr.", + "clusterNetwork": "clusterNetwork is the IP address pool to use for pod IPs. Some network providers support multiple ClusterNetworks. Others only support one. This is equivalent to the cluster-cidr.", "serviceNetwork": "serviceNetwork is the ip address pool to use for Service IPs Currently, all existing network providers only support a single value here, but this is an array to allow for growth.", "defaultNetwork": "defaultNetwork is the \"default\" network that all pods will receive", "additionalNetworks": "additionalNetworks is a list of extra networks to make available to pods when multiple networks are enabled.", "disableMultiNetwork": "disableMultiNetwork specifies whether or not multiple pod network support should be disabled. If unset, this property defaults to 'false' and multiple network support is enabled.", "useMultiNetworkPolicy": "useMultiNetworkPolicy enables a controller which allows for MultiNetworkPolicy objects to be used on additional networks as created by Multus CNI. MultiNetworkPolicy are similar to NetworkPolicy objects, but NetworkPolicy objects only apply to the primary interface. With MultiNetworkPolicy, you can control the traffic that a pod can receive over the secondary interfaces. If unset, this property defaults to 'false' and MultiNetworkPolicy objects are ignored. If 'disableMultiNetwork' is 'true' then the value of this field is ignored.", - "deployKubeProxy": "deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin will attempt to select the correct value, which is false when OpenShift SDN and ovn-kubernetes are used and true otherwise.", + "deployKubeProxy": "deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin will attempt to select the correct value, which is false when ovn-kubernetes is used and true otherwise.", "disableNetworkDiagnostics": "disableNetworkDiagnostics specifies whether or not PodNetworkConnectivityCheck CRs from a test pod to every node, apiserver and LB should be disabled or not. If unset, this property defaults to 'false' and network diagnostics is enabled. Setting this to 'true' would reduce the additional load of the pods performing the checks.", - "kubeProxyConfig": "kubeProxyConfig lets us configure desired proxy configuration. If not specified, sensible defaults will be chosen by OpenShift directly. Not consumed by all network providers - currently only openshift-sdn.", + "kubeProxyConfig": "kubeProxyConfig lets us configure desired proxy configuration, if deployKubeProxy is true. If not specified, sensible defaults will be chosen by OpenShift directly.", "exportNetworkFlows": "exportNetworkFlows enables and configures the export of network flow metadata from the pod network by using protocols NetFlow, SFlow or IPFIX. Currently only supported on OVN-Kubernetes plugin. If unset, flows will not be exported to any collector.", - "migration": "migration enables and configures the cluster network migration. The migration procedure allows to change the network type and the MTU.", + "migration": "migration enables and configures cluster network migration, for network changes that cannot be made instantly.", "additionalRoutingCapabilities": "additionalRoutingCapabilities describes components and relevant configuration providing additional routing capabilities. When set, it enables such components and the usage of the routing capabilities they provide for the machine network. Upstream operators, like MetalLB operator, requiring these capabilities may rely on, or automatically set this attribute. Network plugins may leverage advanced routing capabilities acquired through the enablement of these components but may require specific configuration on their side to do so; refer to their respective documentation and configuration options.", } @@ -1786,11 +1786,11 @@ func (OVNKubernetesConfig) SwaggerDoc() map[string]string { } var map_OpenShiftSDNConfig = map[string]string{ - "": "OpenShiftSDNConfig configures the three openshift-sdn plugins", + "": "OpenShiftSDNConfig was used to configure the OpenShift SDN plugin. It is no longer used.", "mode": "mode is one of \"Multitenant\", \"Subnet\", or \"NetworkPolicy\"", "vxlanPort": "vxlanPort is the port to use for all vxlan packets. The default is 4789.", "mtu": "mtu is the mtu to use for the tunnel interface. Defaults to 1450 if unset. This must be 50 bytes smaller than the machine's uplink.", - "useExternalOpenvswitch": "useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run as a system service, and this flag is ignored. DEPRECATED: non-functional as of 4.6", + "useExternalOpenvswitch": "useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run as a system service, and this flag is ignored.", "enableUnidling": "enableUnidling controls whether or not the service proxy will support idling and unidling of services. By default, unidling is enabled.", } diff --git a/payload-manifests/crds/0000_10_config-operator_01_networks.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_networks.crd.yaml index 16ac576d292..04e14d9f22f 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_networks.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_networks.crd.yaml @@ -248,9 +248,9 @@ spec: type: object networkType: description: 'NetworkType is the plugin that is to be deployed (e.g. - OpenShiftSDN). This should match a value that the cluster-network-operator + OVNKubernetes). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently - supported values are: - OpenShiftSDN This field is immutable after + supported values are: - OVNKubernetes This field is immutable after installation.' type: string serviceNetwork: @@ -303,10 +303,7 @@ spec: type: integer conditions: description: 'conditions represents the observations of a network.config - current state. Known .status.conditions.type are: "NetworkTypeMigrationInProgress", - "NetworkTypeMigrationMTUReady", "NetworkTypeMigrationTargetCNIAvailable", - "NetworkTypeMigrationTargetCNIInUse", "NetworkTypeMigrationOriginalCNIPurged" - and "NetworkDiagnosticsAvailable"' + current state. Known .status.conditions.type are: "NetworkDiagnosticsAvailable"' items: description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct @@ -381,7 +378,7 @@ spec: description: Migration contains the cluster network migration configuration. properties: mtu: - description: MTU contains the MTU migration configuration. + description: MTU is the MTU configuration that is being deployed. properties: machine: description: Machine contains MTU migration configuration @@ -415,15 +412,13 @@ spec: type: object type: object networkType: - description: 'NetworkType is the target plugin that is to be deployed. - Currently supported values are: OpenShiftSDN, OVNKubernetes' - enum: - - OpenShiftSDN - - OVNKubernetes + description: 'NetworkType is the target plugin that is being deployed. + DEPRECATED: network type migration is no longer supported, so + this should always be unset.' type: string type: object networkType: - description: NetworkType is the plugin that is deployed (e.g. OpenShiftSDN). + description: NetworkType is the plugin that is deployed (e.g. OVNKubernetes). type: string serviceNetwork: description: IP address pool for services. Currently, we only support