Skip to content

Bug 1894268: Add v4 and v6 join subnets to ovn-kubernetes config #824

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

Closed
abhat wants to merge 2 commits into from
Closed

Bug 1894268: Add v4 and v6 join subnets to ovn-kubernetes config #824

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
4a970a6
Add v4 and v6 join subnets to ovn-kubernetes config
abhat Dec 10, 2020
49b21e3
Update generated files
abhat Dec 10, 2020
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
10 changes: 10 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 @@ -331,6 +331,16 @@ spec:
type: integer
format: int32
minimum: 0
v4JoinSubnet:
Copy link
Contributor

@markdgray markdgray Dec 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you consider putting them in a sub-struct? e.g. Could there be other configuration needed for this?

i.e.
ovnKubernetesConfig:
joinSubnets:
v4: 100.65.0.0/16

Copy link
Contributor Author

@abhat abhat Dec 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't anticipate any other configuration which can fall under joinSubnets to make this as a sub-struct property.

description: v4JoinSubnet is the v4 join subnet to be used
by ovn-kubernetes in case the default one is being already
used by something else. Default is 100.64.0.0/16
type: string
v6JoinSubnet:
description: v6JoinSubnet is the v6 join subnet to be used
by ovn-kubernetes in case the default one is being already
used by something else. Default is fd98::/48
type: string
type:
description: type is the type of network All NetworkTypes are
supported except for NetworkTypeRaw
Expand Down
10 changes: 10 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 @@ -325,6 +325,16 @@ type OVNKubernetesConfig struct {
// cluster.
// +optional
IPsecConfig *IPsecConfig `json:"ipsecConfig,omitempty"`
// v4JoinSubnet is the v4 join subnet to be used by ovn-kubernetes in case the
Copy link
Contributor

@markdgray markdgray Dec 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know what a "join subnet" is? Maybe it will be obvious to an administrator but you could add more description about that?

Copy link
Contributor Author

@abhat abhat Dec 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I will add more description about what a join subnet is.

// default one is being already used by something else.
// Default is 100.64.0.0/16
// +optional
V4JoinSubnet string `json:"v4JoinSubnet,omitempty"`
// v6JoinSubnet is the v6 join subnet to be used by ovn-kubernetes in case the
// default one is being already used by something else.
// Default is fd98::/48
// +optional
V6JoinSubnet string `json:"v6JoinSubnet,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.