Merge pull request #1691 from andreaskaris/ipforwarding

OCPBUGS-23788: Only allow valid values for gatewayConfig.ipForwarding
openshift · Feb 15, 2024 · 750a3e2 · 750a3e2
2 parents e741d64 + 7b7e068
commit 750a3e2
Show file tree

Hide file tree

Showing 5 changed files with 258 additions and 30 deletions.
diff --git a/operator/v1/0000_70_cluster-network-operator_01-CustomNoUpgrade.crd.yaml b/operator/v1/0000_70_cluster-network-operator_01-CustomNoUpgrade.crd.yaml
@@ -817,6 +817,17 @@ spec:
                   is ignored.
                 type: boolean
             type: object
+            x-kubernetes-validations:
+            - message: invalid value for IPForwarding, valid values are 'Restricted'
+                or 'Global'
+              rule: '!has(self.defaultNetwork) || !has(self.defaultNetwork.ovnKubernetesConfig)
+                || !has(self.defaultNetwork.ovnKubernetesConfig.gatewayConfig) ||
+                !has(self.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding)
+                || self.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding
+                == oldSelf.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding
+                || self.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding
+                == ''Restricted'' || self.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding
+                == ''Global'''
           status:
             description: NetworkStatus is detailed operator status, which is distilled
               up to the Network clusteroperator object.

diff --git a/operator/v1/0000_70_cluster-network-operator_01-Default.crd.yaml b/operator/v1/0000_70_cluster-network-operator_01-Default.crd.yaml
@@ -812,6 +812,17 @@ spec:
                   is ignored.
                 type: boolean
             type: object
+            x-kubernetes-validations:
+            - message: invalid value for IPForwarding, valid values are 'Restricted'
+                or 'Global'
+              rule: '!has(self.defaultNetwork) || !has(self.defaultNetwork.ovnKubernetesConfig)
+                || !has(self.defaultNetwork.ovnKubernetesConfig.gatewayConfig) ||
+                !has(self.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding)
+                || self.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding
+                == oldSelf.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding
+                || self.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding
+                == ''Restricted'' || self.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding
+                == ''Global'''
           status:
             description: NetworkStatus is detailed operator status, which is distilled
               up to the Network clusteroperator object.

diff --git a/operator/v1/0000_70_cluster-network-operator_01-TechPreviewNoUpgrade.crd.yaml b/operator/v1/0000_70_cluster-network-operator_01-TechPreviewNoUpgrade.crd.yaml
@@ -817,6 +817,17 @@ spec:
                   is ignored.
                 type: boolean
             type: object
+            x-kubernetes-validations:
+            - message: invalid value for IPForwarding, valid values are 'Restricted'
+                or 'Global'
+              rule: '!has(self.defaultNetwork) || !has(self.defaultNetwork.ovnKubernetesConfig)
+                || !has(self.defaultNetwork.ovnKubernetesConfig.gatewayConfig) ||
+                !has(self.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding)
+                || self.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding
+                == oldSelf.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding
+                || self.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding
+                == ''Restricted'' || self.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipForwarding
+                == ''Global'''
           status:
             description: NetworkStatus is detailed operator status, which is distilled
               up to the Network clusteroperator object.