Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCPBUGS-39300: clean up openshift-sdn references in the API [4.17] #2008

Merged
merged 3 commits into from
Aug 30, 2024
Merged

OCPBUGS-39300: clean up openshift-sdn references in the API [4.17] #2008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b2c90f
Deprecate network type migration.
danwinship Aug 5, 2024
a8126f0
Deprecate openshift-sdn
danwinship Jul 31, 2024
9843e2e
update generated files
danwinship Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions config/v1/types_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down Expand Up @@ -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.
Expand All @@ -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"`
}
Expand Down Expand Up @@ -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"`
}
Expand Down
21 changes: 8 additions & 13 deletions config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion config/v1/zz_generated.featuregated-crd-manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,6 @@ networks.config.openshift.io:
Category: ""
FeatureGates:
- NetworkDiagnosticsConfig
- NetworkLiveMigration
FilenameOperatorName: config-operator
FilenameOperatorOrdering: "01"
FilenameRunLevel: "0000_10"
Expand Down
16 changes: 7 additions & 9 deletions .../v1/zz_generated.featuregated-crd-manifests/networks.config.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
89 changes: 80 additions & 9 deletions ...ted.featuregated-crd-manifests/networks.config.openshift.io/NetworkDiagnosticsConfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading