Add transit switch config to 4.15

"Backport" of #1626 The CEL validations used here are not available in 4.15 so we have to use regex to validate the fields Signed-off-by: Benjamin Pickard <bpickard@redhat.com>
openshift · Apr 24, 2024 · 0c14a26 · 0c14a26
1 parent 4511c79
commit 0c14a26
Show file tree

Hide file tree

Showing 9 changed files with 1,000 additions and 2 deletions.
diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go
diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -26568,6 +26568,19 @@
         }
       }
     },
+    "com.github.openshift.api.operator.v1.IPv4OVNKubernetesConfig": {
+      "type": "object",
+      "properties": {
+        "internalJoinSubnet": {
+          "description": "internalJoinSubnet 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. The current default value is 100.64.0.0/16 The subnet must be large enough to accomadate one IP per node in your cluster The value must be in proper IPV4 CIDR format",
+          "type": "string"
+        },
+        "internalTransitSwitchSubnet": {
+          "description": "internalTransitSwitchSubnet is a v4 subnet in IPV4 CIDR format used internally by OVN-Kubernetes for the distributed transit switch in the OVN Interconnect architecture that connects the cluster routers on each node together to enable east west traffic. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. The value cannot be changed after installation. When ommitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The current default subnet is 100.88.0.0/16 The subnet must be large enough to accomadate one IP per node in your cluster The value must be in proper IPV4 CIDR format",
+          "type": "string"
+        }
+      }
+    },
     "com.github.openshift.api.operator.v1.IPv6GatewayConfig": {
       "description": "IPV6GatewayConfig holds the configuration paramaters for IPV6 connections in the GatewayConfig for OVN-Kubernetes",
       "type": "object",
@@ -26578,6 +26591,19 @@
         }
       }
     },
+    "com.github.openshift.api.operator.v1.IPv6OVNKubernetesConfig": {
+      "type": "object",
+      "properties": {
+        "internalJoinSubnet": {
+          "description": "internalJoinSubnet 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. The subnet must be large enough to accomadate one IP per node in your cluster The current default value is fd98::/48 The value must be in proper IPV6 CIDR format Note that IPV6 dual addresses are not permitted",
+          "type": "string"
+        },
+        "internalTransitSwitchSubnet": {
+          "description": "internalTransitSwitchSubnet is a v4 subnet in IPV4 CIDR format used internally by OVN-Kubernetes for the distributed transit switch in the OVN Interconnect architecture that connects the cluster routers on each node together to enable east west traffic. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. The value cannot be changed after installation. When ommitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The subnet must be large enough to accomadate one IP per node in your cluster The current default subnet is fd97::/64 The value must be in proper IPV6 CIDR format Note that IPV6 dual addresses are not permitted",
+          "type": "string"
+        }
+      }
+    },
     "com.github.openshift.api.operator.v1.IngressController": {
       "description": "IngressController describes a managed ingress controller for the cluster. The controller can service OpenShift Route and Kubernetes Ingress resources.\n\nWhen an IngressController is created, a new ingress controller deployment is created to allow external traffic to reach the services that expose Ingress or Route resources. Updating this resource may lead to disruption for public facing network connections as a new ingress controller revision may be rolled out.\n\nhttps://kubernetes.io/docs/concepts/services-networking/ingress-controllers\n\nWhenever possible, sensible defaults for the platform are used. See each field for more details.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).",
       "type": "object",
@@ -28605,6 +28631,14 @@
           },
           "$ref": "#/definitions/com.github.openshift.api.operator.v1.IPsecConfig"
         },
+        "ipv4": {
+          "description": "ipv4 allows users to configure IP settings for IPv4 connections. When ommitted, this means no opinions and the default configuration is used. Check individual fields within ipv4 for details of default values.",
+          "$ref": "#/definitions/com.github.openshift.api.operator.v1.IPv4OVNKubernetesConfig"
+        },
+        "ipv6": {
+          "description": "ipv6 allows users to configure IP settings for IPv6 connections. When ommitted, this means no opinions and the default configuration is used. Check individual fields within ipv4 for details of default values.",
+          "$ref": "#/definitions/com.github.openshift.api.operator.v1.IPv6OVNKubernetesConfig"
+        },
         "mtu": {
           "description": "mtu is the MTU to use for the tunnel interface. This must be 100 bytes smaller than the uplink mtu. Default is 1400",
           "type": "integer",