Merge pull request #1296 from mcbenjemaa/fix-xvalidation-duplication

🐛  Prevent XValidation duplication by verifying if the rule already exists

Author: k8s-ci-robot

pkg/crd/schema.go

@@ -231,7 +231,7 @@ func typeToSchema(ctx *schemaContext, rawType ast.Expr) *apiext.JSONSchemaProps
 	case *ast.MapType:
 		props = mapToSchema(ctx, expr)
 	case *ast.StarExpr:
-		props = typeToSchema(ctx, expr.X)
+		props = typeToSchema(ctx.ForInfo(&markers.TypeInfo{}), expr.X)
 	case *ast.StructType:
 		props = structToSchema(ctx, expr)
 	default:

pkg/crd/testdata/oneof/types.go

@@ -36,6 +36,11 @@ type OneofSpec struct {
 	TypeWithMultipleAtLeastOneofs *TypeWithMultipleAtLeastOneofs `json:"typeWithMultipleAtLeastOneOf,omitempty"`
 
 	TypeWithAllOneOf *TypeWithAllOneofs `json:"typeWithAllOneOf,omitempty"`
+
+	FirstCustomTypeAlias CustomTypeAlias `json:"firstCustomTypeAlias,omitempty"`
+
+	// This verifies if the custom type alias XValidation is not duplicated.
+	SecondCustomTypeAlias CustomTypeAlias `json:"secondCustomTypeAlias,omitempty"`
 }
 
 // +kubebuilder:validation:XValidation:message="only one of foo|bar may be set",rule="!(has(self.foo) && has(self.bar))"
@@ -95,6 +100,10 @@ type TypeWithAllOneofs struct {
 	F *string `json:"f,omitempty"`
 }
 
+// CustomTypeAlias is a custom alias
+// +kubebuilder:validation:XValidation:rule="self >= 100 && self <= 1000",message="invalid CustomTypeAlias value"
+type CustomTypeAlias *int32
+
 // Oneof is the Schema for the Oneof API
 type Oneof struct {
 	/*

pkg/crd/testdata/testdata.kubebuilder.io_oneofs.yaml

@@ -36,6 +36,13 @@ spec:
           spec:
             description: OneofSpec is the spec for the oneofs API.
             properties:
+              firstCustomTypeAlias:
+                description: CustomTypeAlias is a custom alias
+                format: int32
+                type: integer
+                x-kubernetes-validations:
+                - message: invalid CustomTypeAlias value
+                  rule: self >= 100 && self <= 1000
               firstTypeWithExactOneof:
                 properties:
                   bar:
@@ -60,6 +67,14 @@ spec:
                 - message: at most one of the fields in [foo bar] may be set
                   rule: '[has(self.foo),has(self.bar)].filter(x,x==true).size() <=
                     1'
+              secondCustomTypeAlias:
+                description: This verifies if the custom type alias XValidation is
+                  not duplicated.
+                format: int32
+                type: integer
+                x-kubernetes-validations:
+                - message: invalid CustomTypeAlias value
+                  rule: self >= 100 && self <= 1000
               secondTypeWithExactOneof:
                 properties:
                   a: