github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Simplify supported manifest versions

Browse Source
This commit is contained in:
Tim Hockin 2014-07-02 14:57:24 -07:00
parent 0ee696c9c4
commit 3cd56e85d6
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/validation.go
View File

@ -23,13 +23,9 @@ import (
"github.com/golang/glog"
)
func isSupportedManifestVersion(value string) bool {
switch value {
case "v1beta1", "v1beta2":
return true
}
return false
}
var (
supportedManifestVersions util.StringSet = util.NewStringSet("v1beta1", "v1beta2")
)
func errInvalid(field string, value interface{}) error {
return fmt.Errorf("%s is invalid: '%v'", field, value)
@ -109,7 +105,7 @@ func ValidateManifest(manifest *ContainerManifest) error {
if len(manifest.Version) == 0 {
return errInvalid("ContainerManifest.Version", manifest.Version)
}
if !isSupportedManifestVersion(manifest.Version) {
if !supportedManifestVersions.Has(manifest.Version) {
return errNotSupported("ContainerManifest.Version", manifest.Version)
}
if len(manifest.ID) > 255 || !util.IsDNSSubdomain(manifest.ID) {