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: rebase openshift/api for openshift-sdn removal [4.17] #2477

Merged
merged 2 commits into from
Oct 3, 2024
Merged

OCPBUGS-39300: rebase openshift/api for openshift-sdn removal [4.17] #2477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6f00e6
rebase openshift/api for openshift-sdn removal
danwinship Aug 21, 2024
f86242d
run codegen
danwinship Sep 3, 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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ require (
)

require (
github.com/openshift/api v0.0.0-20240807093642-3cab566552bb
github.com/openshift/api v0.0.0-20240830190433-30725dc899fc
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
github.com/openshift/library-go v0.0.0-20240704110337-4002bdd84f05
github.com/openshift/machine-config-operator v0.0.1-0.20231002195040-a2469941c0dc
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@ github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8
github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE=
github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY=
github.com/openshift/api v0.0.0-20240807093642-3cab566552bb h1:sVgZabo2tXtuAQ5YBTzKEIQnfRVLUIcASnWDnIBFTug=
github.com/openshift/api v0.0.0-20240807093642-3cab566552bb/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
github.com/openshift/api v0.0.0-20240830190433-30725dc899fc h1:iOKA2zhnoci+yOtkDSTdvfNsGEno5snqwMllt9o+ktQ=
github.com/openshift/api v0.0.0-20240830190433-30725dc899fc/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660 h1:F0zE2bmdVvaEd18VXuGYQdJJ1FYJu4MIDW9PYZWc9No=
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEconE+1IKmIgCOof/Len5ceG6H1pk43yv5U=
Expand Down
84 changes: 36 additions & 48 deletions manifests/0000_70_network_01_networks-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,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
Expand All @@ -226,7 +225,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
Expand All @@ -244,11 +245,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.
Expand Down Expand Up @@ -638,8 +638,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
Expand Down Expand Up @@ -705,10 +705,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
Expand Down Expand Up @@ -752,50 +751,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
Expand Down Expand Up @@ -843,11 +832,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:
Expand Down
Loading