fix(api): loosen Stage validation (#2644)

Signed-off-by: Hidde Beydals <[email protected]>
akuity · Oct 3, 2024 · cdec347 · cdec347
1 parent 609a937
commit cdec347
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/api/v1alpha1/generated.proto b/api/v1alpha1/generated.proto
diff --git a/api/v1alpha1/stage_types.go b/api/v1alpha1/stage_types.go
@@ -168,8 +168,7 @@ func (s *Stage) GetStatus() *StageStatus {
 // StageSpec describes the sources of Freight used by a Stage and how to
 // incorporate Freight into the Stage.
 //
-// +kubebuilder:validation:XValidation:rule="(has(self.promotionTemplate) || has(self.promotionMechanisms))",message="one of promotionTemplate or promotionMechanisms must be specified"
-// +kubebuilder:validation:XValidation:rule="(has(self.promotionTemplate) && !has(self.promotionMechanisms)) || (!has(self.promotionTemplate) && has(self.promotionMechanisms))",message="only one of promotionTemplate or promotionMechanisms can be specified"
+// +kubebuilder:validation:XValidation:rule="(!has(self.promotionTemplate) && !has(self.promotionMechanisms) ) || ( has(self.promotionTemplate) && !has(self.promotionMechanisms) ) || (!has(self.promotionTemplate) && has(self.promotionMechanisms))",message="at most one of promotionTemplate or promotionMechanisms can be specified"
 type StageSpec struct {
 	// Shard is the name of the shard that this Stage belongs to. This is an
 	// optional field. If not specified, the Stage will belong to the default

diff --git a/charts/kargo/resources/crds/kargo.akuity.io_stages.yaml b/charts/kargo/resources/crds/kargo.akuity.io_stages.yaml
@@ -1051,12 +1051,11 @@ spec:
             - requestedFreight
             type: object
             x-kubernetes-validations:
-            - message: one of promotionTemplate or promotionMechanisms must be specified
-              rule: (has(self.promotionTemplate) || has(self.promotionMechanisms))
-            - message: only one of promotionTemplate or promotionMechanisms can be
-                specified
-              rule: (has(self.promotionTemplate) && !has(self.promotionMechanisms))
-                || (!has(self.promotionTemplate) && has(self.promotionMechanisms))
+            - message: at most one of promotionTemplate or promotionMechanisms can
+                be specified
+              rule: (!has(self.promotionTemplate) && !has(self.promotionMechanisms)
+                ) || ( has(self.promotionTemplate) && !has(self.promotionMechanisms)
+                ) || (!has(self.promotionTemplate) && has(self.promotionMechanisms))
           status:
             description: Status describes the Stage's current and recent Freight,
               health, and more.

diff --git a/ui/src/gen/schema/stages.kargo.akuity.io_v1alpha1.json b/ui/src/gen/schema/stages.kargo.akuity.io_v1alpha1.json
@@ -836,12 +836,8 @@
       "type": "object",
       "x-kubernetes-validations": [
         {
-          "message": "one of promotionTemplate or promotionMechanisms must be specified",
-          "rule": "(has(self.promotionTemplate) || has(self.promotionMechanisms))"
-        },
-        {
-          "message": "only one of promotionTemplate or promotionMechanisms can be specified",
-          "rule": "(has(self.promotionTemplate) && !has(self.promotionMechanisms)) || (!has(self.promotionTemplate) && has(self.promotionMechanisms))"
+          "message": "at most one of promotionTemplate or promotionMechanisms can be specified",
+          "rule": "(!has(self.promotionTemplate) && !has(self.promotionMechanisms) ) || ( has(self.promotionTemplate) && !has(self.promotionMechanisms) ) || (!has(self.promotionTemplate) && has(self.promotionMechanisms))"
         }
       ]
     },

diff --git a/ui/src/gen/v1alpha1/generated_pb.ts b/ui/src/gen/v1alpha1/generated_pb.ts
@@ -4458,8 +4458,7 @@ export class StageList extends Message<StageList> {
  * StageSpec describes the sources of Freight used by a Stage and how to
  * incorporate Freight into the Stage.
  *
- * +kubebuilder:validation:XValidation:rule="(has(self.promotionTemplate) || has(self.promotionMechanisms))",message="one of promotionTemplate or promotionMechanisms must be specified"
- * +kubebuilder:validation:XValidation:rule="(has(self.promotionTemplate) && !has(self.promotionMechanisms)) || (!has(self.promotionTemplate) && has(self.promotionMechanisms))",message="only one of promotionTemplate or promotionMechanisms can be specified"
+ * +kubebuilder:validation:XValidation:rule="(!has(self.promotionTemplate) && !has(self.promotionMechanisms) ) || ( has(self.promotionTemplate) && !has(self.promotionMechanisms) ) || (!has(self.promotionTemplate) && has(self.promotionMechanisms))",message="at most one of promotionTemplate or promotionMechanisms can be specified"
  *
  * @generated from message github.com.akuity.kargo.api.v1alpha1.StageSpec
  */