Skip to content

Commit 6b57654

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 6b57654

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,16 @@ spec:
396396
messages, e.g. "kern". Default is "local0"
397397
type: string
398398
type: object
399+
v4InternalSubnet:
400+
description: v4InternalSubnet is the v4 join subnet to be
401+
used by ovn-kubernetes in case the default one is being
402+
already used by something else. Default is 100.64.0.0/16
403+
type: string
404+
v6InternalSubnet:
405+
description: v6InternalSubnet is the v6 join subnet to be
406+
used by ovn-kubernetes in case the default one is being
407+
already used by something else. Default is fd98::/48
408+
type: string
399409
type: object
400410
type:
401411
description: type is the type of network All NetworkTypes are

operator/v1/types_network.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,16 @@ type OVNKubernetesConfig struct {
411411
// gatewayConfig holds the configuration for node gateway options.
412412
// +optional
413413
GatewayConfig *GatewayConfig `json:"gatewayConfig,omitempty"`
414+
// v4InternalSubnet is the v4 join subnet to be used by ovn-kubernetes in case the
415+
// default one is being already used by something else.
416+
// Default is 100.64.0.0/16
417+
// +optional
418+
V4InternalSubnet string `json:"v4InternalSubnet,omitempty"`
419+
// v6InternalSubnet is the v6 join subnet to be used by ovn-kubernetes in case the
420+
// default one is being already used by something else.
421+
// Default is fd98::/48
422+
// +optional
423+
V6InternalSubnet string `json:"v6InternalSubnet,omitempty"`
414424
}
415425

416426
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)