Merge pull request #1207 from pliurh/join-subnet-api

openshift-ci[bot] · web-flow · commit 753344d4e283 · 2022-07-12T15:39:40.000Z
Bug 1894268: Allow users to specify ovnkube join subnet
diff --git a/operator/v1/0000_70_cluster-network-operator_01.crd.yaml b/operator/v1/0000_70_cluster-network-operator_01.crd.yaml
@@ -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
diff --git a/operator/v1/types_network.go b/operator/v1/types_network.go
@@ -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 {
diff --git a/operator/v1/zz_generated.swagger_doc_generated.go b/operator/v1/zz_generated.swagger_doc_generated.go
