Merge pull request kubernetes#2184 from wojtek-t/new_kep_validation_1

Extend kepval to validate milestones

Author: k8s-ci-robot

keps/sig-network/1453-ingress-api/kep.yaml

@@ -30,7 +30,6 @@ latest-milestone: "v1.19"
 
 # The milestone at which this feature was, or is targeted to be, at each stage.
 milestone:
-  alpha: "pre-1.0"
   beta: "v1.1"
   stable: "v1.19"
 

keps/sig-node/1898-hardened-exec/kep.yaml

@@ -31,8 +31,6 @@ latest-milestone: "v1.20"
 # The milestone at which this feature was, or is targeted to be, at each stage.
 milestone:
   alpha: "v1.20"
-  beta: TBD
-  stable: TBD
 
 # The following PRR answers are required at alpha release
 # List the feature gate name and the components for which it must be enabled

keps/sig-node/2000-graceful-node-shutdown/kep.yaml

@@ -18,8 +18,6 @@ latest-milestone: "v1.20"
 # The milestone at which this feature was, or is targeted to be, at each stage.
 milestone:
   alpha: "v1.20"
-  beta: "x.y"
-  stable: "x.y"
 
 # The following PRR answers are required at alpha release
 # List the feature gate name and the components for which it must be enabled

keps/sig-node/2040-kubelet-cri/kep.yaml

@@ -27,7 +27,6 @@ latest-milestone: "v1.20"
 milestone:
   alpha: "v1.5"
   beta: "v1.20"
-  stable: TBD
 
 # The following PRR answers are required at beta release
 metrics:

keps/sig-storage/1698-generic-ephemeral-volumes/kep.yaml

@@ -15,8 +15,6 @@ stage: alpha
 latest-milestone: "v1.19"
 milestone:
   alpha: "v1.19"
-  beta: ""
-  stable: ""
 feature-gates:
   - name: GenericEphemeralVolumes
     components:

pkg/kepval/keps/proposals.go

@@ -75,7 +75,6 @@ type Proposal struct {
 	DisableSupported bool          `json:"disableSupported" yaml:"disable-supported"`
 	Metrics          []string      `json:"metrics" yaml:"metrics"`
 
-	Filename string `json:"-" yaml:"-"`
 	Error    error  `json:"-" yaml:"-"`
 	Contents string `json:"markdown" yaml:"-"`
 }

pkg/kepval/keps/validations/yaml.go

@@ -30,6 +30,7 @@ var (
 	reStatus      = regexp.MustCompile(strings.Join(statuses, "|"))
 	stages        = []string{"alpha", "beta", "stable"}
 	reStages      = regexp.MustCompile(strings.Join(stages, "|"))
+	reMilestone   = regexp.MustCompile("v1\\.[1-9][0-9]*")
 )
 
 func ValidateStructure(parsed map[interface{}]interface{}) error {
@@ -151,6 +152,47 @@ func ValidateStructure(parsed map[interface{}]interface{}) error {
 			case interface{}:
 				return util.NewValueMustBeListOfStrings(k, values)
 			}
+		case "latest-milestone":
+			switch v := value.(type) {
+			case []interface{}:
+				return util.NewValueMustBeString(k, v)
+			}
+			v, _ := value.(string)
+			if !reMilestone.Match([]byte(v)) {
+				return util.NewValueMustBeMilestone(k, v)
+			}
+		case "milestone":
+			switch v := value.(type) {
+			case map[interface{}]interface{}:
+				if err := validateMilestone(v); err != nil {
+					return err
+				}
+			case interface{}:
+				return util.NewValueMustBeStruct(k, v)
+			}
+		}
+	}
+	return nil
+}
+
+func validateMilestone(parsed map[interface{}]interface{}) error {
+	for key, value := range parsed {
+		// First off the key has to be a string. fact.
+		k, ok := key.(string)
+		if !ok {
+			return util.NewKeyMustBeString(k)
+		}
+
+		switch strings.ToLower(k) {
+		case "alpha", "beta", "stable":
+			switch v := value.(type) {
+			case []interface{}:
+				return util.NewValueMustBeString(k, v)
+			}
+			v, _ := value.(string)
+			if !reMilestone.Match([]byte(v)) {
+				return util.NewValueMustBeMilestone(k, v)
+			}
 		}
 	}
 	return nil

pkg/kepval/util/errors.go

@@ -81,6 +81,38 @@ func NewValueMustBeString(key string, value interface{}) error {
 	}
 }
 
+type ValueMustBeStruct struct {
+	key   string
+	value interface{}
+}
+
+func (v *ValueMustBeStruct) Error() string {
+	return fmt.Sprintf("%q must be a struct but it is a %T: %v", v.key, v.value, v.value)
+}
+
+func NewValueMustBeStruct(key string, value interface{}) error {
+	return &ValueMustBeStruct{
+		key:   key,
+		value: value,
+	}
+}
+
+type ValueMustBeMilestone struct {
+	key   string
+	value interface{}
+}
+
+func (v *ValueMustBeMilestone) Error() string {
+	return fmt.Sprintf("%q must be a milestone but it is a %T: %v", v.key, v.value, v.value)
+}
+
+func NewValueMustBeMilestone(key string, value interface{}) error {
+	return &ValueMustBeMilestone{
+		key:   key,
+		value: value,
+	}
+}
+
 type ValueMustBeOneOf struct {
 	key    string
 	value  string