Skip to content

Bug 1894268: Allow users to specify ovnkube join subnet #1207

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

Merged
openshift-ci merged 1 commit into from
Jul 12, 2022
Merged

Bug 1894268: Allow users to specify ovnkube join subnet #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions operator/v1/0000_70_cluster-network-operator_01.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,24 @@ spec:
messages, e.g. "kern". Default is "local0"
type: string
type: object
v4InternalSubnet:
description: v4InternalSubnet is a v4 subnet used internally
by ovn-kubernetes in case the default one is being already
used by something else. It must not overlap with any other
subnet being used by OpenShift or by the node network. The
size of the subnet must be larger than the number of nodes.
The value cannot be changed after installation. Default
is 100.64.0.0/16
type: string
v6InternalSubnet:
description: v6InternalSubnet is a v6 subnet used internally
by ovn-kubernetes in case the default one is being already
used by something else. It must not overlap with any other
subnet being used by OpenShift or by the node network. The
size of the subnet must be larger than the number of nodes.
The value cannot be changed after installation. Default
is fd98::/48
type: string
type: object
type:
description: type is the type of network All NetworkTypes are
Expand Down
16 changes: 16 additions & 0 deletions operator/v1/types_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,22 @@ type OVNKubernetesConfig struct {
// gatewayConfig holds the configuration for node gateway options.
// +optional
GatewayConfig *GatewayConfig `json:"gatewayConfig,omitempty"`
// v4InternalSubnet is a v4 subnet used internally by ovn-kubernetes in case the
// default one is being already used by something else. It must not overlap with
// any other subnet being used by OpenShift or by the node network. The size of the
// subnet must be larger than the number of nodes. The value cannot be changed
// after installation.
// Default is 100.64.0.0/16
// +optional
V4InternalSubnet string `json:"v4InternalSubnet,omitempty"`
// v6InternalSubnet is a v6 subnet used internally by ovn-kubernetes in case the
// default one is being already used by something else. It must not overlap with
// any other subnet being used by OpenShift or by the node network. The size of the
// subnet must be larger than the number of nodes. The value cannot be changed
// after installation.
// Default is fd98::/48
// +optional
V6InternalSubnet string `json:"v6InternalSubnet,omitempty"`
}

type HybridOverlayConfig struct {
Expand Down
2 changes: 2 additions & 0 deletions operator/v1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.