Merge pull request kubernetes#2536 from wojtek-t/strenghten_kep_validation

Enforce KEP number and fixup extraneous markdown documents

Author: k8s-ci-robot

api/proposal.go

@@ -48,7 +48,7 @@ type Proposal struct {
 	Name     string `json:"name,omitempty"`
 
 	Title             string   `json:"title" yaml:"title" validate:"required"`
-	Number            string   `json:"kep-number" yaml:"kep-number"`
+	Number            string   `json:"kep-number" yaml:"kep-number" validate:"required"`
 	Authors           []string `json:"authors" yaml:",flow"`
 	OwningSIG         string   `json:"owningSig" yaml:"owning-sig" validate:"required"`
 	ParticipatingSIGs []string `json:"participatingSigs" yaml:"participating-sigs,flow,omitempty"`

hack/.notableofcontents

@@ -1,9 +1,5 @@
 keps/README.md
-keps/sig-apps/README.md
-keps/sig-autoscaling/README.md
-keps/provider-aws/README.md
-keps/sig-cli/kep-faq.md
-keps/sig-cluster-lifecycle/clusterapi/README.md
-keps/sig-cluster-lifecycle/kubeadm/0023-documentation-for-images.md
-keps/sig-cluster-lifecycle/kubeadm/README.md
-keps/sig-network/README.md
+keps/sig-cli/FAQ.md
+keps/sig-cluster-lifecycle/clusterapi/FAQ.md
+keps/sig-cluster-lifecycle/kubeadm/970-kubeadm-config/documentation-for-images.md
+

keps/provider-aws/README.md

@@ -30,8 +30,9 @@ import (
 
 const (
 	// TODO: Make this configurable and set in a client instead
-	DefaultPRRDir = "prod-readiness"
-	kepMetadata   = "kep.yaml"
+	DefaultPRRDir  = "prod-readiness"
+	kepMetadata    = "kep.yaml"
+	kepsReadmePath = "enhancements/keps/README.md"
 )
 
 var files = []string{}
@@ -145,10 +146,7 @@ var walkFn = func(path string, info os.FileInfo, err error) error {
 		return nil
 	}
 
-	// TODO(#2220): Return an error as soon as all KEPs are migrated to directory-based
-	//   KEP format.
-	files = append(files, path)
-	return nil
+	return fmt.Errorf("incorrect KEP format: %s", path)
 }
 
 // TODO: Consider replacing with a .kepignore file
@@ -159,12 +157,5 @@ func ignore(dir, name string) bool {
 		return true
 	}
 
-	if name == "0023-documentation-for-images.md" ||
-		name == "0004-cloud-provider-template.md" ||
-		name == "README.md" ||
-		name == "kep-faq.md" {
-		return true
-	}
-
-	return false
+	return strings.HasSuffix(filepath.Join(dir, name), kepsReadmePath) ||	name == "FAQ.md"
 }