github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17053 from zhengguoyong/rename_validGroupVersions

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-10 10:11:21 -08:00
commit f25f5a2c85
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/api/registered/registered.go
View File

@ -30,8 +30,7 @@ import (
var RegisteredVersions []string var RegisteredVersions []string
func init() { func init() {
// TODO: caesarxuchao: rename this variable to validGroupVersions validGroupVersions := map[string]bool{
validAPIVersions := map[string]bool{
"v1": true, "v1": true,
"extensions/v1beta1": true, "extensions/v1beta1": true,
"componentconfig/v1alpha1": true, "componentconfig/v1alpha1": true,
@ -49,11 +48,11 @@ func init() {
versions := strings.Split(supportedVersions, ",") versions := strings.Split(supportedVersions, ",")
for _, version := range versions { for _, version := range versions {
// Verify that the version is valid. // Verify that the version is valid.
valid, ok := validAPIVersions[version] valid, ok := validGroupVersions[version]
if !ok || !valid { if !ok || !valid {
// Not a valid API version. // Not a valid API version.
glog.Fatalf("invalid api version: %s in KUBE_API_VERSIONS: %s. List of valid API versions: %v", glog.Fatalf("invalid api version: %s in KUBE_API_VERSIONS: %s. List of valid API versions: %v",
version, os.Getenv("KUBE_API_VERSIONS"), validAPIVersions) version, os.Getenv("KUBE_API_VERSIONS"), validGroupVersions)
} }
RegisteredVersions = append(RegisteredVersions, version) RegisteredVersions = append(RegisteredVersions, version)
} }