Skip to content

Commit 500af51

Browse files
committed
Allow users to specify ovnkube join subnet
Some users need to be able to specify the v4 and v6 join subnets to use for ovn-k. In particular, they may be already using the ones that ovn-k uses as default, and they need a way to be able to specify a different set of subnets as join subnets. This commit creates the config option for the same. Eventually this will be consumed by the CNO using rendered bootstrap data and passed to the ovn-k daemonsets. Signed-off-by: Peng Liu <pliu@redhat.com>
1 parent 689617d commit 500af51

File tree

3 files changed

+36
-0
lines changed

3 files changed

+36
-0
lines changed

operator/v1/0000_70_cluster-network-operator_01.crd.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,24 @@ spec:
396396
messages, e.g. "kern". Default is "local0"
397397
type: string
398398
type: object
399+
v4InternalSubnet:
400+
description: v4InternalSubnet is a v4 subnet used internally
401+
by ovn-kubernetes in case the default one is being already
402+
used by something else. It must not overlap with any other
403+
subnet being used by OpenShift or by the node network. The
404+
size of the subnet must be larger than the number of nodes.
405+
The value cannot be changed after installation. Default
406+
is 100.64.0.0/16
407+
type: string
408+
v6InternalSubnet:
409+
description: v6InternalSubnet is a v6 subnet used internally
410+
by ovn-kubernetes in case the default one is being already
411+
used by something else. It must not overlap with any other
412+
subnet being used by OpenShift or by the node network. The
413+
size of the subnet must be larger than the number of nodes.
414+
The value cannot be changed after installation. Default
415+
is fd98::/48
416+
type: string
399417
type: object
400418
type:
401419
description: type is the type of network All NetworkTypes are

operator/v1/types_network.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,22 @@ type OVNKubernetesConfig struct {
411411
// gatewayConfig holds the configuration for node gateway options.
412412
// +optional
413413
GatewayConfig *GatewayConfig `json:"gatewayConfig,omitempty"`
414+
// v4InternalSubnet is a v4 subnet used internally by ovn-kubernetes in case the
415+
// default one is being already used by something else. It must not overlap with
416+
// any other subnet being used by OpenShift or by the node network. The size of the
417+
// subnet must be larger than the number of nodes. The value cannot be changed
418+
// after installation.
419+
// Default is 100.64.0.0/16
420+
// +optional
421+
V4InternalSubnet string `json:"v4InternalSubnet,omitempty"`
422+
// v6InternalSubnet is a v6 subnet used internally by ovn-kubernetes in case the
423+
// default one is being already used by something else. It must not overlap with
424+
// any other subnet being used by OpenShift or by the node network. The size of the
425+
// subnet must be larger than the number of nodes. The value cannot be changed
426+
// after installation.
427+
// Default is fd98::/48
428+
// +optional
429+
V6InternalSubnet string `json:"v6InternalSubnet,omitempty"`
414430
}
415431

416432
type HybridOverlayConfig struct {

operator/v1/zz_generated.swagger_doc_generated.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)