From f2e12b765b8258a7dde96e6ca9215d14823c8dbc Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Sat, 12 Sep 2015 15:26:23 -0700 Subject: [PATCH] move things around because we move expapi to apis/experimental now --- .../experimental}/install/install.go | 6 +- .../experimental}/install/install_test.go | 12 +-- pkg/apis/experimental/latest/latest.go | 75 ------------------- 3 files changed, 9 insertions(+), 84 deletions(-) rename pkg/{expapi => apis/experimental}/install/install.go (94%) rename pkg/{expapi => apis/experimental}/install/install_test.go (89%) delete mode 100644 pkg/apis/experimental/latest/latest.go diff --git a/pkg/expapi/install/install.go b/pkg/apis/experimental/install/install.go similarity index 94% rename from pkg/expapi/install/install.go rename to pkg/apis/experimental/install/install.go index 8b81f441a47..192d8e94ac2 100644 --- a/pkg/expapi/install/install.go +++ b/pkg/apis/experimental/install/install.go @@ -29,13 +29,13 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/registered" apiutil "k8s.io/kubernetes/pkg/api/util" - _ "k8s.io/kubernetes/pkg/expapi" - "k8s.io/kubernetes/pkg/expapi/v1" + _ "k8s.io/kubernetes/pkg/apis/experimental" + "k8s.io/kubernetes/pkg/apis/experimental/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/sets" ) -const importPrefix = "k8s.io/kubernetes/pkg/expapi" +const importPrefix = "k8s.io/kubernetes/pkg/apis/experimental" var accessor = meta.NewAccessor() diff --git a/pkg/expapi/install/install_test.go b/pkg/apis/experimental/install/install_test.go similarity index 89% rename from pkg/expapi/install/install_test.go rename to pkg/apis/experimental/install/install_test.go index 6024f60cff3..37e156b82cb 100644 --- a/pkg/expapi/install/install_test.go +++ b/pkg/apis/experimental/install/install_test.go @@ -22,11 +22,11 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/expapi" + "k8s.io/kubernetes/pkg/apis/experimental" ) func TestResourceVersioner(t *testing.T) { - daemonSet := expapi.DaemonSet{ObjectMeta: api.ObjectMeta{ResourceVersion: "10"}} + daemonSet := experimental.DaemonSet{ObjectMeta: api.ObjectMeta{ResourceVersion: "10"}} version, err := accessor.ResourceVersion(&daemonSet) if err != nil { t.Fatalf("unexpected error: %v", err) @@ -35,7 +35,7 @@ func TestResourceVersioner(t *testing.T) { t.Errorf("unexpected version %v", version) } - daemonSetList := expapi.DaemonSetList{ListMeta: api.ListMeta{ResourceVersion: "10"}} + daemonSetList := experimental.DaemonSetList{ListMeta: api.ListMeta{ResourceVersion: "10"}} version, err = accessor.ResourceVersion(&daemonSetList) if err != nil { t.Fatalf("unexpected error: %v", err) @@ -46,12 +46,12 @@ func TestResourceVersioner(t *testing.T) { } func TestCodec(t *testing.T) { - daemonSet := expapi.DaemonSet{} + daemonSet := experimental.DaemonSet{} data, err := latest.GroupOrDie("experimental").Codec.Encode(&daemonSet) if err != nil { t.Fatalf("unexpected error: %v", err) } - other := expapi.DaemonSet{} + other := experimental.DaemonSet{} if err := json.Unmarshal(data, &other); err != nil { t.Fatalf("unexpected error: %v", err) } @@ -98,7 +98,7 @@ func TestRESTMapper(t *testing.T) { t.Errorf("unexpected codec: %#v, expected: %#v", mapping, interfaces) } - rc := &expapi.HorizontalPodAutoscaler{ObjectMeta: api.ObjectMeta{Name: "foo"}} + rc := &experimental.HorizontalPodAutoscaler{ObjectMeta: api.ObjectMeta{Name: "foo"}} name, err := mapping.MetadataAccessor.Name(rc) if err != nil { t.Errorf("unexpected error: %v", err) diff --git a/pkg/apis/experimental/latest/latest.go b/pkg/apis/experimental/latest/latest.go deleted file mode 100644 index 5a231b0b9d4..00000000000 --- a/pkg/apis/experimental/latest/latest.go +++ /dev/null @@ -1,75 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package latest - -import ( - "fmt" - "strings" - - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/registered" - _ "k8s.io/kubernetes/pkg/apis/experimental" - "k8s.io/kubernetes/pkg/apis/experimental/v1" - "k8s.io/kubernetes/pkg/runtime" - "k8s.io/kubernetes/pkg/util/sets" -) - -var ( - Version string - Versions []string - - accessor = meta.NewAccessor() - Codec runtime.Codec - SelfLinker = runtime.SelfLinker(accessor) - RESTMapper meta.RESTMapper -) - -const importPrefix = "k8s.io/kubernetes/pkg/apis/experimental" - -func init() { - Version = registered.RegisteredVersions[0] - Codec = runtime.CodecFor(api.Scheme, Version) - // Put the registered versions in Versions in reverse order. - for i := len(registered.RegisteredVersions) - 1; i >= 0; i-- { - Versions = append(Versions, registered.RegisteredVersions[i]) - } - - // the list of kinds that are scoped at the root of the api hierarchy - // if a kind is not enumerated here, it is assumed to have a namespace scope - rootScoped := sets.NewString() - - ignoredKinds := sets.NewString() - - RESTMapper = api.NewDefaultRESTMapper("experimental", Versions, InterfacesFor, importPrefix, ignoredKinds, rootScoped) - api.RegisterRESTMapper(RESTMapper) -} - -// InterfacesFor returns the default Codec and ResourceVersioner for a given version -// string, or an error if the version is not known. -func InterfacesFor(version string) (*meta.VersionInterfaces, error) { - switch version { - case "v1": - return &meta.VersionInterfaces{ - Codec: v1.Codec, - ObjectConvertor: api.Scheme, - MetadataAccessor: accessor, - }, nil - default: - return nil, fmt.Errorf("unsupported storage version: %s (valid: %s)", version, strings.Join(Versions, ", ")) - } -}