Merge pull request #2770 from everettraven/tooling/x-validation-ssa-merging

Improve feature-gated CEL validation merge semantics

Author: openshift-merge-bot[bot]

machine/v1beta1/manual-override-crd-manifests/machines.machine.openshift.io/MachineAPIMigration.yaml

@@ -21,3 +21,5 @@ spec:
                 && self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
                 || (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
                 != ''Migrating'')'
+            - message: authoritativeAPI may not be removed once set
+              rule: has(self.authoritativeAPI) || !has(oldSelf.authoritativeAPI)

machine/v1beta1/manual-override-crd-manifests/machinesets.machine.openshift.io/MachineAPIMigration.yaml

@@ -21,3 +21,5 @@ spec:
                 && self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
                 || (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
                 != ''Migrating'')'
+            - message: authoritativeAPI may not be removed once set
+              rule: has(self.authoritativeAPI) || !has(oldSelf.authoritativeAPI)

tools/codegen/pkg/manifestmerge/crd-schema.json

@@ -727,12 +727,7 @@
               "default": {}
             },
             "type": "array",
-            "x-kubernetes-list-map-keys": [
-              "rule"
-            ],
-            "x-kubernetes-list-type": "map",
-            "x-kubernetes-patch-merge-key": "rule",
-            "x-kubernetes-patch-strategy": "merge"
+            "x-kubernetes-list-type": "atomic"
           }
         },
         "type": "object"