github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

experimental/v1alpha1->extensions/v1beta1

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/genconversion/conversion.go
View File

@ -28,7 +28,7 @@ import (
"k8s.io/kubernetes/pkg/api"
_ "k8s.io/kubernetes/pkg/api/v1"
_ "k8s.io/kubernetes/pkg/apis/experimental"
_ "k8s.io/kubernetes/pkg/apis/experimental/v1alpha1"
_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
pkg_runtime "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/sets"

2
cmd/gendeepcopy/deep_copy.go
View File

@ -28,7 +28,7 @@ import (
"k8s.io/kubernetes/pkg/api"
_ "k8s.io/kubernetes/pkg/api/v1"
_ "k8s.io/kubernetes/pkg/apis/experimental"
_ "k8s.io/kubernetes/pkg/apis/experimental/v1alpha1"
_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
pkg_runtime "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/sets"

4
cmd/kube-apiserver/app/server.go
View File

@ -401,9 +401,9 @@ func (s *APIServer) Run(_ []string) error {
disableV1 := disableAllAPIs
disableV1 = !s.getRuntimeConfigValue("api/v1", !disableV1)
// "experimental/v1alpha1={true|false} allows users to enable/disable the experimental API.
// "extensions/v1beta1={true|false} allows users to enable/disable the experimental API.
// This takes preference over api/all, if specified.
enableExp := s.getRuntimeConfigValue("experimental/v1alpha1", false)
enableExp := s.getRuntimeConfigValue("extensions/v1beta1", false)
clientConfig := &client.Config{
Host: net.JoinHostPort(s.InsecureBindAddress.String(), strconv.Itoa(s.InsecurePort)),

10
cmd/kube-apiserver/app/server_test.go
View File

@ -76,18 +76,18 @@ func TestGenerateStorageVersionMap(t *testing.T) {
}{
{
legacyVersion: "v1",
storageVersions: "v1,experimental/v1alpha1",
storageVersions: "v1,extensions/v1beta1",
expectedMap: map[string]string{
"": "v1",
"experimental": "experimental/v1alpha1",
"experimental": "extensions/v1beta1",
},
},
{
legacyVersion: "",
storageVersions: "experimental/v1alpha1,v1",
storageVersions: "extensions/v1beta1,v1",
expectedMap: map[string]string{
"": "v1",
"experimental": "experimental/v1alpha1",
"experimental": "extensions/v1beta1",
},
},
{
@ -105,7 +105,7 @@ func TestGenerateStorageVersionMap(t *testing.T) {
}
func TestUpdateEtcdOverrides(t *testing.T) {
storageVersions := generateStorageVersionMap("", "v1,experimental/v1alpha1")
storageVersions := generateStorageVersionMap("", "v1,extensions/v1beta1")
testCases := []struct {
apigroup string

4
pkg/api/registered/registered.go
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")

2
pkg/api/serialization_test.go
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"
)

4
pkg/api/util/group_version_test.go
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",
},
}

4
pkg/apis/extensions/install/install.go
View File

@ -30,7 +30,7 @@ import (
"k8s.io/kubernetes/pkg/api/registered"
apiutil "k8s.io/kubernetes/pkg/api/util"
_ "k8s.io/kubernetes/pkg/apis/experimental"
"k8s.io/kubernetes/pkg/apis/experimental/v1alpha1"
"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/sets"
)
@ -79,7 +79,7 @@ func init() {
// string, or an error if the version is not known.
func interfacesFor(version string) (*meta.VersionInterfaces, error) {
switch version {
case "experimental/v1alpha1":
case "extensions/v1beta1":
return &meta.VersionInterfaces{
Codec: v1alpha1.Codec,
ObjectConvertor: api.Scheme,

4
pkg/apis/extensions/install/install_test.go
View File

@ -75,11 +75,11 @@ func TestInterfacesFor(t *testing.T) {
}
func TestRESTMapper(t *testing.T) {
if v, k, err := latest.GroupOrDie("experimental").RESTMapper.VersionAndKindForResource("horizontalpodautoscalers"); err != nil || v != "experimental/v1alpha1" || k != "HorizontalPodAutoscaler" {
if v, k, err := latest.GroupOrDie("experimental").RESTMapper.VersionAndKindForResource("horizontalpodautoscalers"); err != nil || v != "extensions/v1beta1" || k != "HorizontalPodAutoscaler" {
t.Errorf("unexpected version mapping: %s %s %v", v, k, err)
}
if m, err := latest.GroupOrDie("experimental").RESTMapper.RESTMapping("DaemonSet", ""); err != nil || m.APIVersion != "experimental/v1alpha1" || m.Resource != "daemonsets" {
if m, err := latest.GroupOrDie("experimental").RESTMapper.RESTMapping("DaemonSet", ""); err != nil || m.APIVersion != "extensions/v1beta1" || m.Resource != "daemonsets" {
t.Errorf("unexpected version mapping: %#v %v", m, err)
}

2
pkg/apis/extensions/types.go
View File

@ -15,7 +15,7 @@ limitations under the License.
*/
/*
This file (together with pkg/apis/experimental/v1alpha1/types.go) contain the experimental
This file (together with pkg/apis/extensions/v1beta1/types.go) contain the experimental
types in kubernetes. These API objects are experimental, meaning that the
APIs may be broken at any time by the kubernetes team.

4
pkg/apis/extensions/v1beta1/register.go
View File

@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/pkg/runtime"
)
var Codec = runtime.CodecFor(api.Scheme, "experimental/v1alpha1")
var Codec = runtime.CodecFor(api.Scheme, "extensions/v1beta1")
func init() {
addKnownTypes()
@ -31,7 +31,7 @@ func init() {
// Adds the list of known types to api.Scheme.
func addKnownTypes() {
api.Scheme.AddKnownTypes("experimental/v1alpha1",
api.Scheme.AddKnownTypes("extensions/v1beta1",
&ClusterAutoscaler{},
&ClusterAutoscalerList{},
&Deployment{},

2
pkg/conversion/unversioned_test.go
View File

@ -67,7 +67,7 @@ func TestExperimentalEncodeDecodeStatus(t *testing.T) {
// TODO: caesarxuchao: use the testapi.Experimental.Codec() once the PR that
// moves experimental from v1 to v1alpha1 got merged.
// expCodec := testapi.Experimental.Codec()
expCodec := runtime.CodecFor(api.Scheme, "experimental/v1alpha1")
expCodec := runtime.CodecFor(api.Scheme, "extensions/v1beta1")
encoded, err := expCodec.Encode(status)
if err != nil {
t.Errorf("unexpected error: %v", err)

4
pkg/registry/horizontalpodautoscaler/etcd/etcd_test.go
View File

@ -22,8 +22,8 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/apis/experimental"
// Ensure that experimental/v1alpha1 package is initialized.
_ "k8s.io/kubernetes/pkg/apis/experimental/v1alpha1"
// Ensure that extensions/v1beta1 package is initialized.
_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/registry/registrytest"

4
pkg/registry/job/etcd/etcd_test.go
View File

@ -21,8 +21,8 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/experimental"
// Ensure that experimental/v1alpha1 package is initialized.
_ "k8s.io/kubernetes/pkg/apis/experimental/v1alpha1"
// Ensure that extensions/v1beta1 package is initialized.
_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/registry/registrytest"

4
pkg/registry/thirdpartyresource/etcd/etcd_test.go
View File

@ -21,8 +21,8 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/experimental"
// Ensure that experimental/v1alpha1 package is initialized.
_ "k8s.io/kubernetes/pkg/apis/experimental/v1alpha1"
// Ensure that extensions/v1beta1 package is initialized.
_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/registry/registrytest"

4
pkg/registry/thirdpartyresourcedata/etcd/etcd_test.go
View File

@ -21,8 +21,8 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/experimental"
// Ensure that experimental/v1alpha1 package is initialized.
_ "k8s.io/kubernetes/pkg/apis/experimental/v1alpha1"
// Ensure that extensions/v1beta1 package is initialized.
_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/registry/registrytest"

4
test/integration/kubectl_test.go
View File

@ -38,8 +38,8 @@ func TestKubectlValidation(t *testing.T) {
// The following test the experimental api.
// TOOD: Replace with something more robust. These may move.
{`{"apiVersion": "experimental/v1alpha1", "kind": "DaemonSet"}`, false},
{`{"apiVersion": "experimental/v1alpha1", "kind": "Job"}`, false},
{`{"apiVersion": "extensions/v1beta1", "kind": "DaemonSet"}`, false},
{`{"apiVersion": "extensions/v1beta1", "kind": "Job"}`, false},
{`{"apiVersion": "vNotAVersion", "kind": "Job"}`, true},
}
components := framework.NewMasterComponents(&framework.Config{})