added a testcase for ensuring correct different enum type precedence

Author: MishimaPorte

pkg/crd/markers/validation.go

@@ -470,6 +470,11 @@ func (m MaxProperties) ApplyToSchema(schema *apiext.JSONSchemaProps) error {
 }
 
 func (m Enum) ApplyToSchema(schema *apiext.JSONSchemaProps) error {
+	// apply this enum only if there were no other enum values specified
+	// (e.g. via a "+enum" marker)
+	if len(schema.Enum) != 0 {
+		return nil
+	}
 	// TODO(directxman12): this is a bit hacky -- we should
 	// probably support AnyType better + using the schema structure
 	vals := make([]apiext.JSON, len(m))

pkg/crd/markers/zz_generated.markerhelp.go

@@ -51,6 +51,20 @@ const (
 	EnumType_Three EnumType = "three"
 )
 
+// This enum type tests for whether when both "+enum" and
+// "+kubebuilder:validation:Enum" are defined the former takes precedence.
+// It should.
+//
+// +enum
+// +kubebuilder:validation:Enum=Allow;Forbid;Replace
+type AnotherEnumType string
+
+const (
+	AnotherEnumType_One   AnotherEnumType = "another_one"
+	AnotherEnumType_Two   AnotherEnumType = "another_two"
+	AnotherEnumType_Three AnotherEnumType = "another_three"
+)
+
 // CronJobSpec defines the desired state of CronJob
 // +kubebuilder:validation:XValidation:rule="has(oldSelf.forbiddenInt) || !has(self.forbiddenInt)",message="forbiddenInt is not allowed",fieldPath=".forbiddenInt",reason="FieldValueForbidden"
 type CronJobSpec struct {
@@ -341,7 +355,8 @@ type CronJobSpec struct {
 	// +kubebuilder:validation:items:Enum=0;1;3
 	EnumSlice []int `json:"enumSlice,omitempty"`
 
-	EnumValue EnumType `json:"enumValue,omitempty"`
+	EnumValue        EnumType        `json:"enumValue,omitempty"`
+	AnotherEnumValue AnotherEnumType `json:"anotherEnumValue,omitempty"`
 
 	HostsAlias Hosts `json:"hostsAlias,omitempty"`
 

pkg/crd/testdata/cronjob_types.go

@@ -51,6 +51,16 @@ spec:
                 - PreferDualStack
                 - RequireDualStack
                 type: string
+              anotherEnumValue:
+                description: |-
+                  This enum type tests for whether when both "+enum" and
+                  "+kubebuilder:validation:Enum" are defined the former takes precedence.
+                  It should.
+                enum:
+                - another_one
+                - another_two
+                - another_three
+                type: string
               array:
                 description: Checks that fixed-length arrays work
                 items: