experimental/v1alpha1->extensions/v1beta1

This commit is contained in:
Chao Xu
2015-10-09 15:01:33 -07:00
parent 983f056514
commit 0b7e3c7dd1
17 changed files with 32 additions and 32 deletions

View File

@@ -33,11 +33,11 @@ func init() {
// TODO: caesarxuchao: rename this variable to validGroupVersions
validAPIVersions := map[string]bool{
"v1": true,
"experimental/v1alpha1": true,
"extensions/v1beta1": true,
}
// The default list of supported api versions, in order of most preferred to the least.
defaultSupportedVersions := "v1,experimental/v1alpha1"
defaultSupportedVersions := "v1,extensions/v1beta1"
// Env var KUBE_API_VERSIONS is a comma separated list of API versions that should be registered in the scheme.
// The versions should be in the order of most preferred to the least.
supportedVersions := os.Getenv("KUBE_API_VERSIONS")

View File

@@ -33,7 +33,7 @@ import (
"k8s.io/kubernetes/pkg/util/sets"
_ "k8s.io/kubernetes/pkg/apis/experimental"
_ "k8s.io/kubernetes/pkg/apis/experimental/v1alpha1"
_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
flag "github.com/spf13/pflag"
)

View File

@@ -28,7 +28,7 @@ func TestGetVersion(t *testing.T) {
"v1",
},
{
"experimental/v1alpha1",
"extensions/v1beta1",
"v1alpha1",
},
}
@@ -50,7 +50,7 @@ func TestGetGroup(t *testing.T) {
"",
},
{
"experimental/v1alpha1",
"extensions/v1beta1",
"experimental",
},
}