diff --git a/cmd/libs/go2idl/conversion-gen/main.go b/cmd/libs/go2idl/conversion-gen/main.go index 527763ee0c1..e64e40c8bc3 100644 --- a/cmd/libs/go2idl/conversion-gen/main.go +++ b/cmd/libs/go2idl/conversion-gen/main.go @@ -57,7 +57,7 @@ func main() { "k8s.io/kubernetes/pkg/apis/rbac", "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1", "k8s.io/kubernetes/federation/apis/federation", - "k8s.io/kubernetes/federation/apis/federation/v1alpha1", + "k8s.io/kubernetes/federation/apis/federation/v1beta1", "k8s.io/kubernetes/pkg/conversion", "k8s.io/kubernetes/pkg/runtime", } diff --git a/cmd/libs/go2idl/deepcopy-gen/main.go b/cmd/libs/go2idl/deepcopy-gen/main.go index c757fd0ab7b..c38c5624f37 100644 --- a/cmd/libs/go2idl/deepcopy-gen/main.go +++ b/cmd/libs/go2idl/deepcopy-gen/main.go @@ -75,7 +75,7 @@ func main() { "k8s.io/kubernetes/pkg/apis/rbac", "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1", "k8s.io/kubernetes/federation/apis/federation", - "k8s.io/kubernetes/federation/apis/federation/v1alpha1", + "k8s.io/kubernetes/federation/apis/federation/v1beta1", } if err := arguments.Execute( diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go index c2a75461fa6..9362244dab7 100644 --- a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go +++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go @@ -73,7 +73,7 @@ func New() *Generator { `k8s.io/kubernetes/pkg/apis/batch/v2alpha1`, `k8s.io/kubernetes/pkg/apis/apps/v1alpha1`, `k8s.io/kubernetes/pkg/apis/rbac/v1alpha1`, - `k8s.io/kubernetes/federation/apis/federation/v1alpha1`, + `k8s.io/kubernetes/federation/apis/federation/v1beta1`, `k8s.io/kubernetes/pkg/apis/certificates/v1alpha1`, }, ","), DropEmbeddedFields: "k8s.io/kubernetes/pkg/api/unversioned.TypeMeta", diff --git a/federation/apis/federation/install/install.go b/federation/apis/federation/install/install.go index 4c09c75d9a0..a1dc24cab56 100644 --- a/federation/apis/federation/install/install.go +++ b/federation/apis/federation/install/install.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/federation/apis/federation" - "k8s.io/kubernetes/federation/apis/federation/v1alpha1" + "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/unversioned" @@ -37,7 +37,7 @@ const importPrefix = "k8s.io/kubernetes/federation/apis/federation" var accessor = meta.NewAccessor() // availableVersions lists all known external versions for this group from most preferred to least preferred -var availableVersions = []unversioned.GroupVersion{v1alpha1.SchemeGroupVersion} +var availableVersions = []unversioned.GroupVersion{v1beta1.SchemeGroupVersion} func init() { registered.RegisterVersions(availableVersions) @@ -101,7 +101,7 @@ func newRESTMapper(externalVersions []unversioned.GroupVersion) meta.RESTMapper // string, or an error if the version is not known. func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, error) { switch version { - case v1alpha1.SchemeGroupVersion: + case v1beta1.SchemeGroupVersion: return &meta.VersionInterfaces{ ObjectConvertor: api.Scheme, MetadataAccessor: accessor, @@ -122,8 +122,8 @@ func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) { continue } switch v { - case v1alpha1.SchemeGroupVersion: - v1alpha1.AddToScheme(api.Scheme) + case v1beta1.SchemeGroupVersion: + v1beta1.AddToScheme(api.Scheme) } } } diff --git a/federation/apis/federation/install/install_test.go b/federation/apis/federation/install/install_test.go index 87f1ef65d59..cf38c169a76 100644 --- a/federation/apis/federation/install/install_test.go +++ b/federation/apis/federation/install/install_test.go @@ -21,7 +21,7 @@ import ( "testing" "k8s.io/kubernetes/federation/apis/federation" - "k8s.io/kubernetes/federation/apis/federation/v1alpha1" + "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apimachinery/registered" @@ -77,7 +77,7 @@ func TestInterfacesFor(t *testing.T) { } func TestRESTMapper(t *testing.T) { - gv := v1alpha1.SchemeGroupVersion + gv := v1beta1.SchemeGroupVersion clusterGVK := gv.WithKind("Cluster") if gvk, err := registered.GroupOrDie(federation.GroupName).RESTMapper.KindFor(gv.WithResource("clusters")); err != nil || gvk != clusterGVK { diff --git a/federation/apis/federation/v1alpha1/conversion_generated.go b/federation/apis/federation/v1alpha1/conversion_generated.go deleted file mode 100644 index b308a398879..00000000000 --- a/federation/apis/federation/v1alpha1/conversion_generated.go +++ /dev/null @@ -1,296 +0,0 @@ -// +build !ignore_autogenerated - -/* -Copyright 2016 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. -*/ - -// This file was autogenerated by conversion-gen. Do not edit it manually! - -package v1alpha1 - -import ( - federation "k8s.io/kubernetes/federation/apis/federation" - api "k8s.io/kubernetes/pkg/api" - v1 "k8s.io/kubernetes/pkg/api/v1" - conversion "k8s.io/kubernetes/pkg/conversion" -) - -func init() { - if err := api.Scheme.AddGeneratedConversionFuncs( - Convert_v1alpha1_Cluster_To_federation_Cluster, - Convert_federation_Cluster_To_v1alpha1_Cluster, - Convert_v1alpha1_ClusterCondition_To_federation_ClusterCondition, - Convert_federation_ClusterCondition_To_v1alpha1_ClusterCondition, - Convert_v1alpha1_ClusterList_To_federation_ClusterList, - Convert_federation_ClusterList_To_v1alpha1_ClusterList, - Convert_v1alpha1_ClusterSpec_To_federation_ClusterSpec, - Convert_federation_ClusterSpec_To_v1alpha1_ClusterSpec, - Convert_v1alpha1_ClusterStatus_To_federation_ClusterStatus, - Convert_federation_ClusterStatus_To_v1alpha1_ClusterStatus, - Convert_v1alpha1_ServerAddressByClientCIDR_To_federation_ServerAddressByClientCIDR, - Convert_federation_ServerAddressByClientCIDR_To_v1alpha1_ServerAddressByClientCIDR, - ); err != nil { - // if one of the conversion functions is malformed, detect it immediately. - panic(err) - } -} - -func autoConvert_v1alpha1_Cluster_To_federation_Cluster(in *Cluster, out *federation.Cluster, s conversion.Scope) error { - if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { - return err - } - // TODO: Inefficient conversion - can we improve it? - if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { - return err - } - if err := Convert_v1alpha1_ClusterSpec_To_federation_ClusterSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_v1alpha1_ClusterStatus_To_federation_ClusterStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -func Convert_v1alpha1_Cluster_To_federation_Cluster(in *Cluster, out *federation.Cluster, s conversion.Scope) error { - return autoConvert_v1alpha1_Cluster_To_federation_Cluster(in, out, s) -} - -func autoConvert_federation_Cluster_To_v1alpha1_Cluster(in *federation.Cluster, out *Cluster, s conversion.Scope) error { - if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { - return err - } - // TODO: Inefficient conversion - can we improve it? - if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { - return err - } - if err := Convert_federation_ClusterSpec_To_v1alpha1_ClusterSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_federation_ClusterStatus_To_v1alpha1_ClusterStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -func Convert_federation_Cluster_To_v1alpha1_Cluster(in *federation.Cluster, out *Cluster, s conversion.Scope) error { - return autoConvert_federation_Cluster_To_v1alpha1_Cluster(in, out, s) -} - -func autoConvert_v1alpha1_ClusterCondition_To_federation_ClusterCondition(in *ClusterCondition, out *federation.ClusterCondition, s conversion.Scope) error { - out.Type = federation.ClusterConditionType(in.Type) - out.Status = api.ConditionStatus(in.Status) - if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastProbeTime, &out.LastProbeTime, s); err != nil { - return err - } - if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastTransitionTime, &out.LastTransitionTime, s); err != nil { - return err - } - out.Reason = in.Reason - out.Message = in.Message - return nil -} - -func Convert_v1alpha1_ClusterCondition_To_federation_ClusterCondition(in *ClusterCondition, out *federation.ClusterCondition, s conversion.Scope) error { - return autoConvert_v1alpha1_ClusterCondition_To_federation_ClusterCondition(in, out, s) -} - -func autoConvert_federation_ClusterCondition_To_v1alpha1_ClusterCondition(in *federation.ClusterCondition, out *ClusterCondition, s conversion.Scope) error { - out.Type = ClusterConditionType(in.Type) - out.Status = v1.ConditionStatus(in.Status) - if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastProbeTime, &out.LastProbeTime, s); err != nil { - return err - } - if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastTransitionTime, &out.LastTransitionTime, s); err != nil { - return err - } - out.Reason = in.Reason - out.Message = in.Message - return nil -} - -func Convert_federation_ClusterCondition_To_v1alpha1_ClusterCondition(in *federation.ClusterCondition, out *ClusterCondition, s conversion.Scope) error { - return autoConvert_federation_ClusterCondition_To_v1alpha1_ClusterCondition(in, out, s) -} - -func autoConvert_v1alpha1_ClusterList_To_federation_ClusterList(in *ClusterList, out *federation.ClusterList, s conversion.Scope) error { - if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { - return err - } - if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { - return err - } - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]federation.Cluster, len(*in)) - for i := range *in { - if err := Convert_v1alpha1_Cluster_To_federation_Cluster(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil -} - -func Convert_v1alpha1_ClusterList_To_federation_ClusterList(in *ClusterList, out *federation.ClusterList, s conversion.Scope) error { - return autoConvert_v1alpha1_ClusterList_To_federation_ClusterList(in, out, s) -} - -func autoConvert_federation_ClusterList_To_v1alpha1_ClusterList(in *federation.ClusterList, out *ClusterList, s conversion.Scope) error { - if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { - return err - } - if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { - return err - } - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Cluster, len(*in)) - for i := range *in { - if err := Convert_federation_Cluster_To_v1alpha1_Cluster(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil -} - -func Convert_federation_ClusterList_To_v1alpha1_ClusterList(in *federation.ClusterList, out *ClusterList, s conversion.Scope) error { - return autoConvert_federation_ClusterList_To_v1alpha1_ClusterList(in, out, s) -} - -func autoConvert_v1alpha1_ClusterSpec_To_federation_ClusterSpec(in *ClusterSpec, out *federation.ClusterSpec, s conversion.Scope) error { - if in.ServerAddressByClientCIDRs != nil { - in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs - *out = make([]federation.ServerAddressByClientCIDR, len(*in)) - for i := range *in { - if err := Convert_v1alpha1_ServerAddressByClientCIDR_To_federation_ServerAddressByClientCIDR(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.ServerAddressByClientCIDRs = nil - } - if in.SecretRef != nil { - in, out := &in.SecretRef, &out.SecretRef - *out = new(api.LocalObjectReference) - // TODO: Inefficient conversion - can we improve it? - if err := s.Convert(*in, *out, 0); err != nil { - return err - } - } else { - out.SecretRef = nil - } - return nil -} - -func Convert_v1alpha1_ClusterSpec_To_federation_ClusterSpec(in *ClusterSpec, out *federation.ClusterSpec, s conversion.Scope) error { - return autoConvert_v1alpha1_ClusterSpec_To_federation_ClusterSpec(in, out, s) -} - -func autoConvert_federation_ClusterSpec_To_v1alpha1_ClusterSpec(in *federation.ClusterSpec, out *ClusterSpec, s conversion.Scope) error { - if in.ServerAddressByClientCIDRs != nil { - in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs - *out = make([]ServerAddressByClientCIDR, len(*in)) - for i := range *in { - if err := Convert_federation_ServerAddressByClientCIDR_To_v1alpha1_ServerAddressByClientCIDR(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.ServerAddressByClientCIDRs = nil - } - if in.SecretRef != nil { - in, out := &in.SecretRef, &out.SecretRef - *out = new(v1.LocalObjectReference) - // TODO: Inefficient conversion - can we improve it? - if err := s.Convert(*in, *out, 0); err != nil { - return err - } - } else { - out.SecretRef = nil - } - return nil -} - -func Convert_federation_ClusterSpec_To_v1alpha1_ClusterSpec(in *federation.ClusterSpec, out *ClusterSpec, s conversion.Scope) error { - return autoConvert_federation_ClusterSpec_To_v1alpha1_ClusterSpec(in, out, s) -} - -func autoConvert_v1alpha1_ClusterStatus_To_federation_ClusterStatus(in *ClusterStatus, out *federation.ClusterStatus, s conversion.Scope) error { - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]federation.ClusterCondition, len(*in)) - for i := range *in { - if err := Convert_v1alpha1_ClusterCondition_To_federation_ClusterCondition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - out.Zones = in.Zones - out.Region = in.Region - return nil -} - -func Convert_v1alpha1_ClusterStatus_To_federation_ClusterStatus(in *ClusterStatus, out *federation.ClusterStatus, s conversion.Scope) error { - return autoConvert_v1alpha1_ClusterStatus_To_federation_ClusterStatus(in, out, s) -} - -func autoConvert_federation_ClusterStatus_To_v1alpha1_ClusterStatus(in *federation.ClusterStatus, out *ClusterStatus, s conversion.Scope) error { - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]ClusterCondition, len(*in)) - for i := range *in { - if err := Convert_federation_ClusterCondition_To_v1alpha1_ClusterCondition(&(*in)[i], &(*out)[i], s); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - out.Zones = in.Zones - out.Region = in.Region - return nil -} - -func Convert_federation_ClusterStatus_To_v1alpha1_ClusterStatus(in *federation.ClusterStatus, out *ClusterStatus, s conversion.Scope) error { - return autoConvert_federation_ClusterStatus_To_v1alpha1_ClusterStatus(in, out, s) -} - -func autoConvert_v1alpha1_ServerAddressByClientCIDR_To_federation_ServerAddressByClientCIDR(in *ServerAddressByClientCIDR, out *federation.ServerAddressByClientCIDR, s conversion.Scope) error { - out.ClientCIDR = in.ClientCIDR - out.ServerAddress = in.ServerAddress - return nil -} - -func Convert_v1alpha1_ServerAddressByClientCIDR_To_federation_ServerAddressByClientCIDR(in *ServerAddressByClientCIDR, out *federation.ServerAddressByClientCIDR, s conversion.Scope) error { - return autoConvert_v1alpha1_ServerAddressByClientCIDR_To_federation_ServerAddressByClientCIDR(in, out, s) -} - -func autoConvert_federation_ServerAddressByClientCIDR_To_v1alpha1_ServerAddressByClientCIDR(in *federation.ServerAddressByClientCIDR, out *ServerAddressByClientCIDR, s conversion.Scope) error { - out.ClientCIDR = in.ClientCIDR - out.ServerAddress = in.ServerAddress - return nil -} - -func Convert_federation_ServerAddressByClientCIDR_To_v1alpha1_ServerAddressByClientCIDR(in *federation.ServerAddressByClientCIDR, out *ServerAddressByClientCIDR, s conversion.Scope) error { - return autoConvert_federation_ServerAddressByClientCIDR_To_v1alpha1_ServerAddressByClientCIDR(in, out, s) -} diff --git a/federation/apis/federation/v1alpha1/conversion.go b/federation/apis/federation/v1beta1/conversion.go similarity index 98% rename from federation/apis/federation/v1alpha1/conversion.go rename to federation/apis/federation/v1beta1/conversion.go index c4c8ebbb37f..f8d396e86d4 100644 --- a/federation/apis/federation/v1alpha1/conversion.go +++ b/federation/apis/federation/v1beta1/conversion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( "fmt" diff --git a/federation/apis/federation/v1beta1/conversion_generated.go b/federation/apis/federation/v1beta1/conversion_generated.go new file mode 100644 index 00000000000..5877d00828a --- /dev/null +++ b/federation/apis/federation/v1beta1/conversion_generated.go @@ -0,0 +1,296 @@ +// +build !ignore_autogenerated + +/* +Copyright 2016 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. +*/ + +// This file was autogenerated by conversion-gen. Do not edit it manually! + +package v1beta1 + +import ( + federation "k8s.io/kubernetes/federation/apis/federation" + api "k8s.io/kubernetes/pkg/api" + v1 "k8s.io/kubernetes/pkg/api/v1" + conversion "k8s.io/kubernetes/pkg/conversion" +) + +func init() { + if err := api.Scheme.AddGeneratedConversionFuncs( + Convert_v1beta1_Cluster_To_federation_Cluster, + Convert_federation_Cluster_To_v1beta1_Cluster, + Convert_v1beta1_ClusterCondition_To_federation_ClusterCondition, + Convert_federation_ClusterCondition_To_v1beta1_ClusterCondition, + Convert_v1beta1_ClusterList_To_federation_ClusterList, + Convert_federation_ClusterList_To_v1beta1_ClusterList, + Convert_v1beta1_ClusterSpec_To_federation_ClusterSpec, + Convert_federation_ClusterSpec_To_v1beta1_ClusterSpec, + Convert_v1beta1_ClusterStatus_To_federation_ClusterStatus, + Convert_federation_ClusterStatus_To_v1beta1_ClusterStatus, + Convert_v1beta1_ServerAddressByClientCIDR_To_federation_ServerAddressByClientCIDR, + Convert_federation_ServerAddressByClientCIDR_To_v1beta1_ServerAddressByClientCIDR, + ); err != nil { + // if one of the conversion functions is malformed, detect it immediately. + panic(err) + } +} + +func autoConvert_v1beta1_Cluster_To_federation_Cluster(in *Cluster, out *federation.Cluster, s conversion.Scope) error { + if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { + return err + } + // TODO: Inefficient conversion - can we improve it? + if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { + return err + } + if err := Convert_v1beta1_ClusterSpec_To_federation_ClusterSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := Convert_v1beta1_ClusterStatus_To_federation_ClusterStatus(&in.Status, &out.Status, s); err != nil { + return err + } + return nil +} + +func Convert_v1beta1_Cluster_To_federation_Cluster(in *Cluster, out *federation.Cluster, s conversion.Scope) error { + return autoConvert_v1beta1_Cluster_To_federation_Cluster(in, out, s) +} + +func autoConvert_federation_Cluster_To_v1beta1_Cluster(in *federation.Cluster, out *Cluster, s conversion.Scope) error { + if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { + return err + } + // TODO: Inefficient conversion - can we improve it? + if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { + return err + } + if err := Convert_federation_ClusterSpec_To_v1beta1_ClusterSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := Convert_federation_ClusterStatus_To_v1beta1_ClusterStatus(&in.Status, &out.Status, s); err != nil { + return err + } + return nil +} + +func Convert_federation_Cluster_To_v1beta1_Cluster(in *federation.Cluster, out *Cluster, s conversion.Scope) error { + return autoConvert_federation_Cluster_To_v1beta1_Cluster(in, out, s) +} + +func autoConvert_v1beta1_ClusterCondition_To_federation_ClusterCondition(in *ClusterCondition, out *federation.ClusterCondition, s conversion.Scope) error { + out.Type = federation.ClusterConditionType(in.Type) + out.Status = api.ConditionStatus(in.Status) + if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastProbeTime, &out.LastProbeTime, s); err != nil { + return err + } + if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastTransitionTime, &out.LastTransitionTime, s); err != nil { + return err + } + out.Reason = in.Reason + out.Message = in.Message + return nil +} + +func Convert_v1beta1_ClusterCondition_To_federation_ClusterCondition(in *ClusterCondition, out *federation.ClusterCondition, s conversion.Scope) error { + return autoConvert_v1beta1_ClusterCondition_To_federation_ClusterCondition(in, out, s) +} + +func autoConvert_federation_ClusterCondition_To_v1beta1_ClusterCondition(in *federation.ClusterCondition, out *ClusterCondition, s conversion.Scope) error { + out.Type = ClusterConditionType(in.Type) + out.Status = v1.ConditionStatus(in.Status) + if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastProbeTime, &out.LastProbeTime, s); err != nil { + return err + } + if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastTransitionTime, &out.LastTransitionTime, s); err != nil { + return err + } + out.Reason = in.Reason + out.Message = in.Message + return nil +} + +func Convert_federation_ClusterCondition_To_v1beta1_ClusterCondition(in *federation.ClusterCondition, out *ClusterCondition, s conversion.Scope) error { + return autoConvert_federation_ClusterCondition_To_v1beta1_ClusterCondition(in, out, s) +} + +func autoConvert_v1beta1_ClusterList_To_federation_ClusterList(in *ClusterList, out *federation.ClusterList, s conversion.Scope) error { + if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { + return err + } + if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { + return err + } + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]federation.Cluster, len(*in)) + for i := range *in { + if err := Convert_v1beta1_Cluster_To_federation_Cluster(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func Convert_v1beta1_ClusterList_To_federation_ClusterList(in *ClusterList, out *federation.ClusterList, s conversion.Scope) error { + return autoConvert_v1beta1_ClusterList_To_federation_ClusterList(in, out, s) +} + +func autoConvert_federation_ClusterList_To_v1beta1_ClusterList(in *federation.ClusterList, out *ClusterList, s conversion.Scope) error { + if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { + return err + } + if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { + return err + } + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Cluster, len(*in)) + for i := range *in { + if err := Convert_federation_Cluster_To_v1beta1_Cluster(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func Convert_federation_ClusterList_To_v1beta1_ClusterList(in *federation.ClusterList, out *ClusterList, s conversion.Scope) error { + return autoConvert_federation_ClusterList_To_v1beta1_ClusterList(in, out, s) +} + +func autoConvert_v1beta1_ClusterSpec_To_federation_ClusterSpec(in *ClusterSpec, out *federation.ClusterSpec, s conversion.Scope) error { + if in.ServerAddressByClientCIDRs != nil { + in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs + *out = make([]federation.ServerAddressByClientCIDR, len(*in)) + for i := range *in { + if err := Convert_v1beta1_ServerAddressByClientCIDR_To_federation_ServerAddressByClientCIDR(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.ServerAddressByClientCIDRs = nil + } + if in.SecretRef != nil { + in, out := &in.SecretRef, &out.SecretRef + *out = new(api.LocalObjectReference) + // TODO: Inefficient conversion - can we improve it? + if err := s.Convert(*in, *out, 0); err != nil { + return err + } + } else { + out.SecretRef = nil + } + return nil +} + +func Convert_v1beta1_ClusterSpec_To_federation_ClusterSpec(in *ClusterSpec, out *federation.ClusterSpec, s conversion.Scope) error { + return autoConvert_v1beta1_ClusterSpec_To_federation_ClusterSpec(in, out, s) +} + +func autoConvert_federation_ClusterSpec_To_v1beta1_ClusterSpec(in *federation.ClusterSpec, out *ClusterSpec, s conversion.Scope) error { + if in.ServerAddressByClientCIDRs != nil { + in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs + *out = make([]ServerAddressByClientCIDR, len(*in)) + for i := range *in { + if err := Convert_federation_ServerAddressByClientCIDR_To_v1beta1_ServerAddressByClientCIDR(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.ServerAddressByClientCIDRs = nil + } + if in.SecretRef != nil { + in, out := &in.SecretRef, &out.SecretRef + *out = new(v1.LocalObjectReference) + // TODO: Inefficient conversion - can we improve it? + if err := s.Convert(*in, *out, 0); err != nil { + return err + } + } else { + out.SecretRef = nil + } + return nil +} + +func Convert_federation_ClusterSpec_To_v1beta1_ClusterSpec(in *federation.ClusterSpec, out *ClusterSpec, s conversion.Scope) error { + return autoConvert_federation_ClusterSpec_To_v1beta1_ClusterSpec(in, out, s) +} + +func autoConvert_v1beta1_ClusterStatus_To_federation_ClusterStatus(in *ClusterStatus, out *federation.ClusterStatus, s conversion.Scope) error { + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]federation.ClusterCondition, len(*in)) + for i := range *in { + if err := Convert_v1beta1_ClusterCondition_To_federation_ClusterCondition(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + out.Zones = in.Zones + out.Region = in.Region + return nil +} + +func Convert_v1beta1_ClusterStatus_To_federation_ClusterStatus(in *ClusterStatus, out *federation.ClusterStatus, s conversion.Scope) error { + return autoConvert_v1beta1_ClusterStatus_To_federation_ClusterStatus(in, out, s) +} + +func autoConvert_federation_ClusterStatus_To_v1beta1_ClusterStatus(in *federation.ClusterStatus, out *ClusterStatus, s conversion.Scope) error { + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]ClusterCondition, len(*in)) + for i := range *in { + if err := Convert_federation_ClusterCondition_To_v1beta1_ClusterCondition(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + out.Zones = in.Zones + out.Region = in.Region + return nil +} + +func Convert_federation_ClusterStatus_To_v1beta1_ClusterStatus(in *federation.ClusterStatus, out *ClusterStatus, s conversion.Scope) error { + return autoConvert_federation_ClusterStatus_To_v1beta1_ClusterStatus(in, out, s) +} + +func autoConvert_v1beta1_ServerAddressByClientCIDR_To_federation_ServerAddressByClientCIDR(in *ServerAddressByClientCIDR, out *federation.ServerAddressByClientCIDR, s conversion.Scope) error { + out.ClientCIDR = in.ClientCIDR + out.ServerAddress = in.ServerAddress + return nil +} + +func Convert_v1beta1_ServerAddressByClientCIDR_To_federation_ServerAddressByClientCIDR(in *ServerAddressByClientCIDR, out *federation.ServerAddressByClientCIDR, s conversion.Scope) error { + return autoConvert_v1beta1_ServerAddressByClientCIDR_To_federation_ServerAddressByClientCIDR(in, out, s) +} + +func autoConvert_federation_ServerAddressByClientCIDR_To_v1beta1_ServerAddressByClientCIDR(in *federation.ServerAddressByClientCIDR, out *ServerAddressByClientCIDR, s conversion.Scope) error { + out.ClientCIDR = in.ClientCIDR + out.ServerAddress = in.ServerAddress + return nil +} + +func Convert_federation_ServerAddressByClientCIDR_To_v1beta1_ServerAddressByClientCIDR(in *federation.ServerAddressByClientCIDR, out *ServerAddressByClientCIDR, s conversion.Scope) error { + return autoConvert_federation_ServerAddressByClientCIDR_To_v1beta1_ServerAddressByClientCIDR(in, out, s) +} diff --git a/federation/apis/federation/v1alpha1/deep_copy_generated.go b/federation/apis/federation/v1beta1/deep_copy_generated.go similarity index 70% rename from federation/apis/federation/v1alpha1/deep_copy_generated.go rename to federation/apis/federation/v1beta1/deep_copy_generated.go index 64217a1d1a2..0d53b4a6a9d 100644 --- a/federation/apis/federation/v1alpha1/deep_copy_generated.go +++ b/federation/apis/federation/v1beta1/deep_copy_generated.go @@ -18,7 +18,7 @@ limitations under the License. // This file was autogenerated by deepcopy-gen. Do not edit it manually! -package v1alpha1 +package v1beta1 import ( api "k8s.io/kubernetes/pkg/api" @@ -29,35 +29,35 @@ import ( func init() { if err := api.Scheme.AddGeneratedDeepCopyFuncs( - DeepCopy_v1alpha1_Cluster, - DeepCopy_v1alpha1_ClusterCondition, - DeepCopy_v1alpha1_ClusterList, - DeepCopy_v1alpha1_ClusterSpec, - DeepCopy_v1alpha1_ClusterStatus, - DeepCopy_v1alpha1_ServerAddressByClientCIDR, + DeepCopy_v1beta1_Cluster, + DeepCopy_v1beta1_ClusterCondition, + DeepCopy_v1beta1_ClusterList, + DeepCopy_v1beta1_ClusterSpec, + DeepCopy_v1beta1_ClusterStatus, + DeepCopy_v1beta1_ServerAddressByClientCIDR, ); err != nil { // if one of the deep copy functions is malformed, detect it immediately. panic(err) } } -func DeepCopy_v1alpha1_Cluster(in Cluster, out *Cluster, c *conversion.Cloner) error { +func DeepCopy_v1beta1_Cluster(in Cluster, out *Cluster, c *conversion.Cloner) error { if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := DeepCopy_v1alpha1_ClusterSpec(in.Spec, &out.Spec, c); err != nil { + if err := DeepCopy_v1beta1_ClusterSpec(in.Spec, &out.Spec, c); err != nil { return err } - if err := DeepCopy_v1alpha1_ClusterStatus(in.Status, &out.Status, c); err != nil { + if err := DeepCopy_v1beta1_ClusterStatus(in.Status, &out.Status, c); err != nil { return err } return nil } -func DeepCopy_v1alpha1_ClusterCondition(in ClusterCondition, out *ClusterCondition, c *conversion.Cloner) error { +func DeepCopy_v1beta1_ClusterCondition(in ClusterCondition, out *ClusterCondition, c *conversion.Cloner) error { out.Type = in.Type out.Status = in.Status if err := unversioned.DeepCopy_unversioned_Time(in.LastProbeTime, &out.LastProbeTime, c); err != nil { @@ -71,7 +71,7 @@ func DeepCopy_v1alpha1_ClusterCondition(in ClusterCondition, out *ClusterConditi return nil } -func DeepCopy_v1alpha1_ClusterList(in ClusterList, out *ClusterList, c *conversion.Cloner) error { +func DeepCopy_v1beta1_ClusterList(in ClusterList, out *ClusterList, c *conversion.Cloner) error { if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -82,7 +82,7 @@ func DeepCopy_v1alpha1_ClusterList(in ClusterList, out *ClusterList, c *conversi in, out := in.Items, &out.Items *out = make([]Cluster, len(in)) for i := range in { - if err := DeepCopy_v1alpha1_Cluster(in[i], &(*out)[i], c); err != nil { + if err := DeepCopy_v1beta1_Cluster(in[i], &(*out)[i], c); err != nil { return err } } @@ -92,12 +92,12 @@ func DeepCopy_v1alpha1_ClusterList(in ClusterList, out *ClusterList, c *conversi return nil } -func DeepCopy_v1alpha1_ClusterSpec(in ClusterSpec, out *ClusterSpec, c *conversion.Cloner) error { +func DeepCopy_v1beta1_ClusterSpec(in ClusterSpec, out *ClusterSpec, c *conversion.Cloner) error { if in.ServerAddressByClientCIDRs != nil { in, out := in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs *out = make([]ServerAddressByClientCIDR, len(in)) for i := range in { - if err := DeepCopy_v1alpha1_ServerAddressByClientCIDR(in[i], &(*out)[i], c); err != nil { + if err := DeepCopy_v1beta1_ServerAddressByClientCIDR(in[i], &(*out)[i], c); err != nil { return err } } @@ -116,12 +116,12 @@ func DeepCopy_v1alpha1_ClusterSpec(in ClusterSpec, out *ClusterSpec, c *conversi return nil } -func DeepCopy_v1alpha1_ClusterStatus(in ClusterStatus, out *ClusterStatus, c *conversion.Cloner) error { +func DeepCopy_v1beta1_ClusterStatus(in ClusterStatus, out *ClusterStatus, c *conversion.Cloner) error { if in.Conditions != nil { in, out := in.Conditions, &out.Conditions *out = make([]ClusterCondition, len(in)) for i := range in { - if err := DeepCopy_v1alpha1_ClusterCondition(in[i], &(*out)[i], c); err != nil { + if err := DeepCopy_v1beta1_ClusterCondition(in[i], &(*out)[i], c); err != nil { return err } } @@ -139,7 +139,7 @@ func DeepCopy_v1alpha1_ClusterStatus(in ClusterStatus, out *ClusterStatus, c *co return nil } -func DeepCopy_v1alpha1_ServerAddressByClientCIDR(in ServerAddressByClientCIDR, out *ServerAddressByClientCIDR, c *conversion.Cloner) error { +func DeepCopy_v1beta1_ServerAddressByClientCIDR(in ServerAddressByClientCIDR, out *ServerAddressByClientCIDR, c *conversion.Cloner) error { out.ClientCIDR = in.ClientCIDR out.ServerAddress = in.ServerAddress return nil diff --git a/federation/apis/federation/v1alpha1/defaults.go b/federation/apis/federation/v1beta1/defaults.go similarity index 97% rename from federation/apis/federation/v1alpha1/defaults.go rename to federation/apis/federation/v1beta1/defaults.go index d69bb7f0444..b096ce2fda8 100644 --- a/federation/apis/federation/v1alpha1/defaults.go +++ b/federation/apis/federation/v1beta1/defaults.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( "k8s.io/kubernetes/pkg/runtime" diff --git a/federation/apis/federation/v1alpha1/doc.go b/federation/apis/federation/v1beta1/doc.go similarity index 97% rename from federation/apis/federation/v1alpha1/doc.go rename to federation/apis/federation/v1beta1/doc.go index 65a03a2093d..cfdb87c53d8 100644 --- a/federation/apis/federation/v1alpha1/doc.go +++ b/federation/apis/federation/v1beta1/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // +genconversion=true -package v1alpha1 +package v1beta1 diff --git a/federation/apis/federation/v1alpha1/generated.pb.go b/federation/apis/federation/v1beta1/generated.pb.go similarity index 98% rename from federation/apis/federation/v1alpha1/generated.pb.go rename to federation/apis/federation/v1beta1/generated.pb.go index 2d700bcd0d3..e9193b60897 100644 --- a/federation/apis/federation/v1alpha1/generated.pb.go +++ b/federation/apis/federation/v1beta1/generated.pb.go @@ -15,14 +15,14 @@ limitations under the License. */ // Code generated by protoc-gen-gogo. -// source: k8s.io/kubernetes/federation/apis/federation/v1alpha1/generated.proto +// source: k8s.io/kubernetes/federation/apis/federation/v1beta1/generated.proto // DO NOT EDIT! /* - Package v1alpha1 is a generated protocol buffer package. + Package v1beta1 is a generated protocol buffer package. It is generated from these files: - k8s.io/kubernetes/federation/apis/federation/v1alpha1/generated.proto + k8s.io/kubernetes/federation/apis/federation/v1beta1/generated.proto It has these top-level messages: Cluster @@ -32,7 +32,7 @@ limitations under the License. ClusterStatus ServerAddressByClientCIDR */ -package v1alpha1 +package v1beta1 import proto "github.com/gogo/protobuf/proto" import fmt "fmt" @@ -72,12 +72,12 @@ func (m *ServerAddressByClientCIDR) String() string { return proto.CompactTextSt func (*ServerAddressByClientCIDR) ProtoMessage() {} func init() { - proto.RegisterType((*Cluster)(nil), "k8s.io.kubernetes.federation.apis.federation.v1alpha1.Cluster") - proto.RegisterType((*ClusterCondition)(nil), "k8s.io.kubernetes.federation.apis.federation.v1alpha1.ClusterCondition") - proto.RegisterType((*ClusterList)(nil), "k8s.io.kubernetes.federation.apis.federation.v1alpha1.ClusterList") - proto.RegisterType((*ClusterSpec)(nil), "k8s.io.kubernetes.federation.apis.federation.v1alpha1.ClusterSpec") - proto.RegisterType((*ClusterStatus)(nil), "k8s.io.kubernetes.federation.apis.federation.v1alpha1.ClusterStatus") - proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.kubernetes.federation.apis.federation.v1alpha1.ServerAddressByClientCIDR") + proto.RegisterType((*Cluster)(nil), "k8s.io.kubernetes.federation.apis.federation.v1beta1.Cluster") + proto.RegisterType((*ClusterCondition)(nil), "k8s.io.kubernetes.federation.apis.federation.v1beta1.ClusterCondition") + proto.RegisterType((*ClusterList)(nil), "k8s.io.kubernetes.federation.apis.federation.v1beta1.ClusterList") + proto.RegisterType((*ClusterSpec)(nil), "k8s.io.kubernetes.federation.apis.federation.v1beta1.ClusterSpec") + proto.RegisterType((*ClusterStatus)(nil), "k8s.io.kubernetes.federation.apis.federation.v1beta1.ClusterStatus") + proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.kubernetes.federation.apis.federation.v1beta1.ServerAddressByClientCIDR") } func (m *Cluster) Marshal() (data []byte, err error) { size := m.Size() diff --git a/federation/apis/federation/v1alpha1/generated.proto b/federation/apis/federation/v1beta1/generated.proto similarity index 96% rename from federation/apis/federation/v1alpha1/generated.proto rename to federation/apis/federation/v1beta1/generated.proto index 560a30f052f..811f40f4347 100644 --- a/federation/apis/federation/v1alpha1/generated.proto +++ b/federation/apis/federation/v1beta1/generated.proto @@ -19,14 +19,15 @@ limitations under the License. syntax = 'proto2'; -package k8s.io.kubernetes.federation.apis.federation.v1alpha1; +package k8s.io.kubernetes.federation.apis.federation.v1beta1; +import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". -option go_package = "v1alpha1"; +option go_package = "v1beta1"; // Information about a registered cluster in a federated kubernetes setup. Clusters are not namespaced and have unique names in the federation. message Cluster { diff --git a/federation/apis/federation/v1alpha1/register.go b/federation/apis/federation/v1beta1/register.go similarity index 97% rename from federation/apis/federation/v1alpha1/register.go rename to federation/apis/federation/v1beta1/register.go index 1cb015ec9f8..46dc3f10b7a 100644 --- a/federation/apis/federation/v1alpha1/register.go +++ b/federation/apis/federation/v1beta1/register.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( "k8s.io/kubernetes/pkg/api/unversioned" @@ -27,7 +27,7 @@ import ( const GroupName = "federation" // SchemeGroupVersion is group version used to register these objects -var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1alpha1"} +var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1beta1"} // Adds the list of known types to api.Scheme. func AddToScheme(scheme *runtime.Scheme) { diff --git a/federation/apis/federation/v1alpha1/types.generated.go b/federation/apis/federation/v1beta1/types.generated.go similarity index 99% rename from federation/apis/federation/v1alpha1/types.generated.go rename to federation/apis/federation/v1beta1/types.generated.go index 5034cab9343..e4d7246f244 100644 --- a/federation/apis/federation/v1alpha1/types.generated.go +++ b/federation/apis/federation/v1beta1/types.generated.go @@ -19,7 +19,7 @@ limitations under the License. // THIS FILE IS AUTO-GENERATED BY codecgen. // ************************************************************ -package v1alpha1 +package v1beta1 import ( "errors" diff --git a/federation/apis/federation/v1alpha1/types.go b/federation/apis/federation/v1beta1/types.go similarity index 99% rename from federation/apis/federation/v1alpha1/types.go rename to federation/apis/federation/v1beta1/types.go index d53d6aa939c..f15988e2f88 100644 --- a/federation/apis/federation/v1alpha1/types.go +++ b/federation/apis/federation/v1beta1/types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( "k8s.io/kubernetes/pkg/api/unversioned" diff --git a/federation/client/cache/cluster_cache.go b/federation/client/cache/cluster_cache.go index 4147254173d..593919c4da7 100644 --- a/federation/client/cache/cluster_cache.go +++ b/federation/client/cache/cluster_cache.go @@ -18,7 +18,7 @@ package cache import ( "github.com/golang/glog" - "k8s.io/kubernetes/federation/apis/federation/v1alpha1" + "k8s.io/kubernetes/federation/apis/federation/v1beta1" kubeCache "k8s.io/kubernetes/pkg/client/cache" ) @@ -28,16 +28,16 @@ type StoreToClusterLister struct { kubeCache.Store } -func (s *StoreToClusterLister) List() (clusters v1alpha1.ClusterList, err error) { +func (s *StoreToClusterLister) List() (clusters v1beta1.ClusterList, err error) { for _, m := range s.Store.List() { - clusters.Items = append(clusters.Items, *(m.(*v1alpha1.Cluster))) + clusters.Items = append(clusters.Items, *(m.(*v1beta1.Cluster))) } return clusters, nil } // ClusterConditionPredicate is a function that indicates whether the given cluster's conditions meet // some set of criteria defined by the function. -type ClusterConditionPredicate func(cluster v1alpha1.Cluster) bool +type ClusterConditionPredicate func(cluster v1beta1.Cluster) bool // storeToClusterConditionLister filters and returns nodes matching the given type and status from the store. type storeToClusterConditionLister struct { @@ -51,9 +51,9 @@ func (s *StoreToClusterLister) ClusterCondition(predicate ClusterConditionPredic } // List returns a list of clusters that match the conditions defined by the predicate functions in the storeToClusterConditionLister. -func (s storeToClusterConditionLister) List() (clusters v1alpha1.ClusterList, err error) { +func (s storeToClusterConditionLister) List() (clusters v1beta1.ClusterList, err error) { for _, m := range s.store.List() { - cluster := *m.(*v1alpha1.Cluster) + cluster := *m.(*v1beta1.Cluster) if s.predicate(cluster) { clusters.Items = append(clusters.Items, cluster) } else { diff --git a/federation/client/clientset_generated/federation_release_1_3/clientset.go b/federation/client/clientset_generated/federation_release_1_3/clientset.go index 66116c2f088..6f7087e1a37 100644 --- a/federation/client/clientset_generated/federation_release_1_3/clientset.go +++ b/federation/client/clientset_generated/federation_release_1_3/clientset.go @@ -19,7 +19,7 @@ package federation_release_1_3 import ( "github.com/golang/glog" v1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/core/v1" - v1alpha1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1" + v1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1" restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" "k8s.io/kubernetes/pkg/util/flowcontrol" @@ -27,7 +27,7 @@ import ( type Interface interface { Discovery() discovery.DiscoveryInterface - Federation() v1alpha1federation.FederationInterface + Federation() v1beta1federation.FederationInterface Core() v1core.CoreInterface } @@ -35,12 +35,12 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *v1alpha1federation.FederationClient + *v1beta1federation.FederationClient *v1core.CoreClient } // Federation retrieves the FederationClient -func (c *Clientset) Federation() v1alpha1federation.FederationInterface { +func (c *Clientset) Federation() v1beta1federation.FederationInterface { if c == nil { return nil } @@ -68,7 +68,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { } var clientset Clientset var err error - clientset.FederationClient, err = v1alpha1federation.NewForConfig(&configShallowCopy) + clientset.FederationClient, err = v1beta1federation.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -89,7 +89,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *restclient.Config) *Clientset { var clientset Clientset - clientset.FederationClient = v1alpha1federation.NewForConfigOrDie(c) + clientset.FederationClient = v1beta1federation.NewForConfigOrDie(c) clientset.CoreClient = v1core.NewForConfigOrDie(c) clientset.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) @@ -99,7 +99,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c *restclient.RESTClient) *Clientset { var clientset Clientset - clientset.FederationClient = v1alpha1federation.New(c) + clientset.FederationClient = v1beta1federation.New(c) clientset.CoreClient = v1core.New(c) clientset.DiscoveryClient = discovery.NewDiscoveryClient(c) diff --git a/federation/client/clientset_generated/federation_release_1_3/doc.go b/federation/client/clientset_generated/federation_release_1_3/doc.go index 44d6b8f0972..a8e764c63dd 100644 --- a/federation/client/clientset_generated/federation_release_1_3/doc.go +++ b/federation/client/clientset_generated/federation_release_1_3/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1alpha1,api/v1] +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1beta1,api/v1] // This package has the automatically generated clientset. package federation_release_1_3 diff --git a/federation/client/clientset_generated/federation_release_1_3/fake/clientset_generated.go b/federation/client/clientset_generated/federation_release_1_3/fake/clientset_generated.go index 8af3fd9ef41..edb4f79a880 100644 --- a/federation/client/clientset_generated/federation_release_1_3/fake/clientset_generated.go +++ b/federation/client/clientset_generated/federation_release_1_3/fake/clientset_generated.go @@ -20,8 +20,8 @@ import ( clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3" v1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/core/v1" fakev1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/fake" - v1alpha1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1" - fakev1alpha1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake" + v1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1" + fakev1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/testing/core" @@ -62,8 +62,8 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} // Federation retrieves the FederationClient -func (c *Clientset) Federation() v1alpha1federation.FederationInterface { - return &fakev1alpha1federation.FakeFederation{Fake: &c.Fake} +func (c *Clientset) Federation() v1beta1federation.FederationInterface { + return &fakev1beta1federation.FakeFederation{Fake: &c.Fake} } // Core retrieves the CoreClient diff --git a/federation/client/clientset_generated/federation_release_1_3/fake/doc.go b/federation/client/clientset_generated/federation_release_1_3/fake/doc.go index cd0b07c2068..31950d235fb 100644 --- a/federation/client/clientset_generated/federation_release_1_3/fake/doc.go +++ b/federation/client/clientset_generated/federation_release_1_3/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1alpha1,api/v1] +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1beta1,api/v1] // This package has the automatically generated fake clientset. package fake diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/doc.go b/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/doc.go index e85a01c7c59..d07e71e3a40 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/doc.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1alpha1,api/v1] +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1beta1,api/v1] // This package has the automatically generated typed clients. package v1 diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/fake/doc.go b/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/fake/doc.go index 846226b3be9..0b5fe9d5df5 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/fake/doc.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1alpha1,api/v1] +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1beta1,api/v1] // Package fake has the automatically generated clients. package fake diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/cluster.go b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/cluster.go similarity index 75% rename from federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/cluster.go rename to federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/cluster.go index e09ca93fb59..19012ff8e3c 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/cluster.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/cluster.go @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( - v1alpha1 "k8s.io/kubernetes/federation/apis/federation/v1alpha1" + v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" api "k8s.io/kubernetes/pkg/api" watch "k8s.io/kubernetes/pkg/watch" ) @@ -30,15 +30,15 @@ type ClustersGetter interface { // ClusterInterface has methods to work with Cluster resources. type ClusterInterface interface { - Create(*v1alpha1.Cluster) (*v1alpha1.Cluster, error) - Update(*v1alpha1.Cluster) (*v1alpha1.Cluster, error) - UpdateStatus(*v1alpha1.Cluster) (*v1alpha1.Cluster, error) + Create(*v1beta1.Cluster) (*v1beta1.Cluster, error) + Update(*v1beta1.Cluster) (*v1beta1.Cluster, error) + UpdateStatus(*v1beta1.Cluster) (*v1beta1.Cluster, error) Delete(name string, options *api.DeleteOptions) error DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error - Get(name string) (*v1alpha1.Cluster, error) - List(opts api.ListOptions) (*v1alpha1.ClusterList, error) + Get(name string) (*v1beta1.Cluster, error) + List(opts api.ListOptions) (*v1beta1.ClusterList, error) Watch(opts api.ListOptions) (watch.Interface, error) - Patch(name string, pt api.PatchType, data []byte) (result *v1alpha1.Cluster, err error) + Patch(name string, pt api.PatchType, data []byte) (result *v1beta1.Cluster, err error) ClusterExpansion } @@ -55,8 +55,8 @@ func newClusters(c *FederationClient) *clusters { } // Create takes the representation of a cluster and creates it. Returns the server's representation of the cluster, and an error, if there is any. -func (c *clusters) Create(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster, err error) { - result = &v1alpha1.Cluster{} +func (c *clusters) Create(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) { + result = &v1beta1.Cluster{} err = c.client.Post(). Resource("clusters"). Body(cluster). @@ -66,8 +66,8 @@ func (c *clusters) Create(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster, } // Update takes the representation of a cluster and updates it. Returns the server's representation of the cluster, and an error, if there is any. -func (c *clusters) Update(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster, err error) { - result = &v1alpha1.Cluster{} +func (c *clusters) Update(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) { + result = &v1beta1.Cluster{} err = c.client.Put(). Resource("clusters"). Name(cluster.Name). @@ -77,8 +77,8 @@ func (c *clusters) Update(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster, return } -func (c *clusters) UpdateStatus(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster, err error) { - result = &v1alpha1.Cluster{} +func (c *clusters) UpdateStatus(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) { + result = &v1beta1.Cluster{} err = c.client.Put(). Resource("clusters"). Name(cluster.Name). @@ -110,8 +110,8 @@ func (c *clusters) DeleteCollection(options *api.DeleteOptions, listOptions api. } // Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any. -func (c *clusters) Get(name string) (result *v1alpha1.Cluster, err error) { - result = &v1alpha1.Cluster{} +func (c *clusters) Get(name string) (result *v1beta1.Cluster, err error) { + result = &v1beta1.Cluster{} err = c.client.Get(). Resource("clusters"). Name(name). @@ -121,8 +121,8 @@ func (c *clusters) Get(name string) (result *v1alpha1.Cluster, err error) { } // List takes label and field selectors, and returns the list of Clusters that match those selectors. -func (c *clusters) List(opts api.ListOptions) (result *v1alpha1.ClusterList, err error) { - result = &v1alpha1.ClusterList{} +func (c *clusters) List(opts api.ListOptions) (result *v1beta1.ClusterList, err error) { + result = &v1beta1.ClusterList{} err = c.client.Get(). Resource("clusters"). VersionedParams(&opts, api.ParameterCodec). @@ -141,8 +141,8 @@ func (c *clusters) Watch(opts api.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched cluster. -func (c *clusters) Patch(name string, pt api.PatchType, data []byte) (result *v1alpha1.Cluster, err error) { - result = &v1alpha1.Cluster{} +func (c *clusters) Patch(name string, pt api.PatchType, data []byte) (result *v1beta1.Cluster, err error) { + result = &v1beta1.Cluster{} err = c.client.Patch(pt). Resource("clusters"). Name(name). diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/doc.go b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/doc.go similarity index 96% rename from federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/doc.go rename to federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/doc.go index 79dd05ec7f3..cbca5a3cf86 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/doc.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1alpha1,api/v1] +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1beta1,api/v1] // This package has the automatically generated typed clients. -package v1alpha1 +package v1beta1 diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/doc.go b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/doc.go similarity index 97% rename from federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/doc.go rename to federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/doc.go index 846226b3be9..0b5fe9d5df5 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/doc.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1alpha1,api/v1] +// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1beta1,api/v1] // Package fake has the automatically generated clients. package fake diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/fake_cluster.go b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/fake_cluster.go similarity index 65% rename from federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/fake_cluster.go rename to federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/fake_cluster.go index 4e466aecb43..ab7fa2f3007 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/fake_cluster.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/fake_cluster.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - v1alpha1 "k8s.io/kubernetes/federation/apis/federation/v1alpha1" + v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" api "k8s.io/kubernetes/pkg/api" unversioned "k8s.io/kubernetes/pkg/api/unversioned" core "k8s.io/kubernetes/pkg/client/testing/core" @@ -30,60 +30,60 @@ type FakeClusters struct { Fake *FakeFederation } -var clustersResource = unversioned.GroupVersionResource{Group: "federation", Version: "v1alpha1", Resource: "clusters"} +var clustersResource = unversioned.GroupVersionResource{Group: "federation", Version: "v1beta1", Resource: "clusters"} -func (c *FakeClusters) Create(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster, err error) { +func (c *FakeClusters) Create(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) { obj, err := c.Fake. - Invokes(core.NewRootCreateAction(clustersResource, cluster), &v1alpha1.Cluster{}) + Invokes(core.NewRootCreateAction(clustersResource, cluster), &v1beta1.Cluster{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.Cluster), err + return obj.(*v1beta1.Cluster), err } -func (c *FakeClusters) Update(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster, err error) { +func (c *FakeClusters) Update(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateAction(clustersResource, cluster), &v1alpha1.Cluster{}) + Invokes(core.NewRootUpdateAction(clustersResource, cluster), &v1beta1.Cluster{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.Cluster), err + return obj.(*v1beta1.Cluster), err } -func (c *FakeClusters) UpdateStatus(cluster *v1alpha1.Cluster) (*v1alpha1.Cluster, error) { +func (c *FakeClusters) UpdateStatus(cluster *v1beta1.Cluster) (*v1beta1.Cluster, error) { obj, err := c.Fake. - Invokes(core.NewRootUpdateSubresourceAction(clustersResource, "status", cluster), &v1alpha1.Cluster{}) + Invokes(core.NewRootUpdateSubresourceAction(clustersResource, "status", cluster), &v1beta1.Cluster{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.Cluster), err + return obj.(*v1beta1.Cluster), err } func (c *FakeClusters) Delete(name string, options *api.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewRootDeleteAction(clustersResource, name), &v1alpha1.Cluster{}) + Invokes(core.NewRootDeleteAction(clustersResource, name), &v1beta1.Cluster{}) return err } func (c *FakeClusters) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { action := core.NewRootDeleteCollectionAction(clustersResource, listOptions) - _, err := c.Fake.Invokes(action, &v1alpha1.ClusterList{}) + _, err := c.Fake.Invokes(action, &v1beta1.ClusterList{}) return err } -func (c *FakeClusters) Get(name string) (result *v1alpha1.Cluster, err error) { +func (c *FakeClusters) Get(name string) (result *v1beta1.Cluster, err error) { obj, err := c.Fake. - Invokes(core.NewRootGetAction(clustersResource, name), &v1alpha1.Cluster{}) + Invokes(core.NewRootGetAction(clustersResource, name), &v1beta1.Cluster{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.Cluster), err + return obj.(*v1beta1.Cluster), err } -func (c *FakeClusters) List(opts api.ListOptions) (result *v1alpha1.ClusterList, err error) { +func (c *FakeClusters) List(opts api.ListOptions) (result *v1beta1.ClusterList, err error) { obj, err := c.Fake. - Invokes(core.NewRootListAction(clustersResource, opts), &v1alpha1.ClusterList{}) + Invokes(core.NewRootListAction(clustersResource, opts), &v1beta1.ClusterList{}) if obj == nil { return nil, err } @@ -92,8 +92,8 @@ func (c *FakeClusters) List(opts api.ListOptions) (result *v1alpha1.ClusterList, if label == nil { label = labels.Everything() } - list := &v1alpha1.ClusterList{} - for _, item := range obj.(*v1alpha1.ClusterList).Items { + list := &v1beta1.ClusterList{} + for _, item := range obj.(*v1beta1.ClusterList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -108,11 +108,11 @@ func (c *FakeClusters) Watch(opts api.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched cluster. -func (c *FakeClusters) Patch(name string, pt api.PatchType, data []byte) (result *v1alpha1.Cluster, err error) { +func (c *FakeClusters) Patch(name string, pt api.PatchType, data []byte) (result *v1beta1.Cluster, err error) { obj, err := c.Fake. - Invokes(core.NewRootPatchAction(clustersResource, name, data), &v1alpha1.Cluster{}) + Invokes(core.NewRootPatchAction(clustersResource, name, data), &v1beta1.Cluster{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.Cluster), err + return obj.(*v1beta1.Cluster), err } diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/fake_federation_client.go b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/fake_federation_client.go similarity index 84% rename from federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/fake_federation_client.go rename to federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/fake_federation_client.go index 48390713fd6..829e6a1300c 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/fake_federation_client.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/fake_federation_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - v1alpha1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1" + v1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,7 +26,7 @@ type FakeFederation struct { *core.Fake } -func (c *FakeFederation) Clusters() v1alpha1.ClusterInterface { +func (c *FakeFederation) Clusters() v1beta1.ClusterInterface { return &FakeClusters{c} } diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/federation_client.go b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/federation_client.go similarity index 99% rename from federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/federation_client.go rename to federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/federation_client.go index 1d2e782c011..381aa9f8d99 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/federation_client.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/federation_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( api "k8s.io/kubernetes/pkg/api" diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/generated_expansion.go b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/generated_expansion.go similarity index 97% rename from federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/generated_expansion.go rename to federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/generated_expansion.go index 5a05fca2c2e..ab1d777e17f 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/generated_expansion.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/generated_expansion.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 type ClusterExpansion interface{} diff --git a/federation/cmd/federation-apiserver/app/federation.go b/federation/cmd/federation-apiserver/app/federation.go index f081b55d9fd..a0883f76de0 100644 --- a/federation/cmd/federation-apiserver/app/federation.go +++ b/federation/cmd/federation-apiserver/app/federation.go @@ -40,7 +40,7 @@ func installFederationAPIs(s *genericoptions.ServerRunOptions, g *genericapiserv apiGroupInfo := genericapiserver.APIGroupInfo{ GroupMeta: *federationGroupMeta, VersionedResourcesStorageMap: map[string]map[string]rest.Storage{ - "v1alpha1": federationResources, + "v1beta1": federationResources, }, OptionsExternalVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion, Scheme: api.Scheme, diff --git a/federation/cmd/federation-apiserver/app/server_test.go b/federation/cmd/federation-apiserver/app/server_test.go index fa72048e260..a97e463d64b 100644 --- a/federation/cmd/federation-apiserver/app/server_test.go +++ b/federation/cmd/federation-apiserver/app/server_test.go @@ -28,7 +28,7 @@ import ( "time" "github.com/stretchr/testify/assert" - fed_v1a1 "k8s.io/kubernetes/federation/apis/federation/v1alpha1" + fed_v1a1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/genericapiserver/options" diff --git a/federation/pkg/federation-controller/cluster/cluster_client.go b/federation/pkg/federation-controller/cluster/cluster_client.go index 401d5e784a9..3bf23433d70 100644 --- a/federation/pkg/federation-controller/cluster/cluster_client.go +++ b/federation/pkg/federation-controller/cluster/cluster_client.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/golang/glog" - federation_v1alpha1 "k8s.io/kubernetes/federation/apis/federation/v1alpha1" + federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" @@ -44,7 +44,7 @@ type ClusterClient struct { kubeClient *clientset.Clientset } -func NewClusterClientSet(c *federation_v1alpha1.Cluster) (*ClusterClient, error) { +func NewClusterClientSet(c *federation_v1beta1.Cluster) (*ClusterClient, error) { clusterConfig, err := util.BuildClusterConfig(c) if err != nil { return nil, err @@ -64,35 +64,35 @@ func NewClusterClientSet(c *federation_v1alpha1.Cluster) (*ClusterClient, error) } // GetClusterHealthStatus gets the kubernetes cluster health status by requesting "/healthz" -func (self *ClusterClient) GetClusterHealthStatus() *federation_v1alpha1.ClusterStatus { - clusterStatus := federation_v1alpha1.ClusterStatus{} +func (self *ClusterClient) GetClusterHealthStatus() *federation_v1beta1.ClusterStatus { + clusterStatus := federation_v1beta1.ClusterStatus{} currentTime := unversioned.Now() - newClusterReadyCondition := federation_v1alpha1.ClusterCondition{ - Type: federation_v1alpha1.ClusterReady, + newClusterReadyCondition := federation_v1beta1.ClusterCondition{ + Type: federation_v1beta1.ClusterReady, Status: v1.ConditionTrue, Reason: "ClusterReady", Message: "/healthz responded with ok", LastProbeTime: currentTime, LastTransitionTime: currentTime, } - newClusterNotReadyCondition := federation_v1alpha1.ClusterCondition{ - Type: federation_v1alpha1.ClusterReady, + newClusterNotReadyCondition := federation_v1beta1.ClusterCondition{ + Type: federation_v1beta1.ClusterReady, Status: v1.ConditionFalse, Reason: "ClusterNotReady", Message: "/healthz responded without ok", LastProbeTime: currentTime, LastTransitionTime: currentTime, } - newNodeOfflineCondition := federation_v1alpha1.ClusterCondition{ - Type: federation_v1alpha1.ClusterOffline, + newNodeOfflineCondition := federation_v1beta1.ClusterCondition{ + Type: federation_v1beta1.ClusterOffline, Status: v1.ConditionTrue, Reason: "ClusterNotReachable", Message: "cluster is not reachable", LastProbeTime: currentTime, LastTransitionTime: currentTime, } - newNodeNotOfflineCondition := federation_v1alpha1.ClusterCondition{ - Type: federation_v1alpha1.ClusterOffline, + newNodeNotOfflineCondition := federation_v1beta1.ClusterCondition{ + Type: federation_v1beta1.ClusterOffline, Status: v1.ConditionFalse, Reason: "ClusterReachable", Message: "cluster is reachable", diff --git a/federation/pkg/federation-controller/cluster/clustercontroller.go b/federation/pkg/federation-controller/cluster/clustercontroller.go index e72c166815d..4a0cc802cbf 100644 --- a/federation/pkg/federation-controller/cluster/clustercontroller.go +++ b/federation/pkg/federation-controller/cluster/clustercontroller.go @@ -21,7 +21,7 @@ import ( "time" "github.com/golang/glog" - federation_v1alpha1 "k8s.io/kubernetes/federation/apis/federation/v1alpha1" + federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" cluster_cache "k8s.io/kubernetes/federation/client/cache" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3" "k8s.io/kubernetes/pkg/api" @@ -44,7 +44,7 @@ type ClusterController struct { // clusterMonitorPeriod is the period for updating status of cluster clusterMonitorPeriod time.Duration // clusterClusterStatusMap is a mapping of clusterName and cluster status of last sampling - clusterClusterStatusMap map[string]federation_v1alpha1.ClusterStatus + clusterClusterStatusMap map[string]federation_v1beta1.ClusterStatus // clusterKubeClientMap is a mapping of clusterName and restclient clusterKubeClientMap map[string]ClusterClient @@ -60,7 +60,7 @@ func NewclusterController(federationClient federationclientset.Interface, cluste knownClusterSet: make(sets.String), federationClient: federationClient, clusterMonitorPeriod: clusterMonitorPeriod, - clusterClusterStatusMap: make(map[string]federation_v1alpha1.ClusterStatus), + clusterClusterStatusMap: make(map[string]federation_v1beta1.ClusterStatus), clusterKubeClientMap: make(map[string]ClusterClient), } cc.clusterStore.Store, cc.clusterController = framework.NewInformer( @@ -72,7 +72,7 @@ func NewclusterController(federationClient federationclientset.Interface, cluste return cc.federationClient.Federation().Clusters().Watch(options) }, }, - &federation_v1alpha1.Cluster{}, + &federation_v1beta1.Cluster{}, controller.NoResyncPeriodFunc(), framework.ResourceEventHandlerFuncs{ DeleteFunc: cc.delFromClusterSet, @@ -85,7 +85,7 @@ func NewclusterController(federationClient federationclientset.Interface, cluste // delFromClusterSet delete a cluster from clusterSet and // delete the corresponding restclient from the map clusterKubeClientMap func (cc *ClusterController) delFromClusterSet(obj interface{}) { - cluster := obj.(*federation_v1alpha1.Cluster) + cluster := obj.(*federation_v1beta1.Cluster) cc.knownClusterSet.Delete(cluster.Name) delete(cc.clusterKubeClientMap, cluster.Name) } @@ -93,7 +93,7 @@ func (cc *ClusterController) delFromClusterSet(obj interface{}) { // addToClusterSet insert the new cluster to clusterSet and create a corresponding // restclient to map clusterKubeClientMap func (cc *ClusterController) addToClusterSet(obj interface{}) { - cluster := obj.(*federation_v1alpha1.Cluster) + cluster := obj.(*federation_v1beta1.Cluster) cc.knownClusterSet.Insert(cluster.Name) // create the restclient of cluster restClient, err := NewClusterClientSet(cluster) @@ -116,7 +116,7 @@ func (cc *ClusterController) Run() { }, cc.clusterMonitorPeriod, wait.NeverStop) } -func (cc *ClusterController) GetClusterStatus(cluster *federation_v1alpha1.Cluster) (*federation_v1alpha1.ClusterStatus, error) { +func (cc *ClusterController) GetClusterStatus(cluster *federation_v1beta1.Cluster) (*federation_v1beta1.ClusterStatus, error) { // just get the status of cluster, by requesting the restapi "/healthz" clusterClient, found := cc.clusterKubeClientMap[cluster.Name] if !found { diff --git a/federation/pkg/federation-controller/cluster/clustercontroller_test.go b/federation/pkg/federation-controller/cluster/clustercontroller_test.go index 29d96cd69dd..0d6e11232b4 100644 --- a/federation/pkg/federation-controller/cluster/clustercontroller_test.go +++ b/federation/pkg/federation-controller/cluster/clustercontroller_test.go @@ -23,7 +23,7 @@ import ( "net/http/httptest" "testing" - federation_v1alpha1 "k8s.io/kubernetes/federation/apis/federation/v1alpha1" + federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3" controller_util "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/api/testapi" @@ -35,15 +35,15 @@ import ( "k8s.io/kubernetes/pkg/util" ) -func newCluster(clusterName string, serverUrl string) *federation_v1alpha1.Cluster { - cluster := federation_v1alpha1.Cluster{ +func newCluster(clusterName string, serverUrl string) *federation_v1beta1.Cluster { + cluster := federation_v1beta1.Cluster{ TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Federation.GroupVersion().String()}, ObjectMeta: v1.ObjectMeta{ UID: util.NewUUID(), Name: clusterName, }, - Spec: federation_v1alpha1.ClusterSpec{ - ServerAddressByClientCIDRs: []federation_v1alpha1.ServerAddressByClientCIDR{ + Spec: federation_v1beta1.ClusterSpec{ + ServerAddressByClientCIDRs: []federation_v1beta1.ServerAddressByClientCIDR{ { ClientCIDR: "0.0.0.0/0", ServerAddress: serverUrl, @@ -54,13 +54,13 @@ func newCluster(clusterName string, serverUrl string) *federation_v1alpha1.Clust return &cluster } -func newClusterList(cluster *federation_v1alpha1.Cluster) *federation_v1alpha1.ClusterList { - clusterList := federation_v1alpha1.ClusterList{ +func newClusterList(cluster *federation_v1beta1.Cluster) *federation_v1beta1.ClusterList { + clusterList := federation_v1beta1.ClusterList{ TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Federation.GroupVersion().String()}, ListMeta: unversioned.ListMeta{ SelfLink: "foobar", }, - Items: []federation_v1alpha1.Cluster{}, + Items: []federation_v1beta1.Cluster{}, } clusterList.Items = append(clusterList.Items, *cluster) return &clusterList @@ -68,7 +68,7 @@ func newClusterList(cluster *federation_v1alpha1.Cluster) *federation_v1alpha1.C // init a fake http handler, simulate a federation apiserver, response the "DELETE" "PUT" "GET" "UPDATE" // when "canBeGotten" is false, means that user can not get the cluster cluster from apiserver -func createHttptestFakeHandlerForFederation(clusterList *federation_v1alpha1.ClusterList, canBeGotten bool) *http.HandlerFunc { +func createHttptestFakeHandlerForFederation(clusterList *federation_v1beta1.ClusterList, canBeGotten bool) *http.HandlerFunc { fakeHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { clusterListString, _ := json.Marshal(*clusterList) w.Header().Set("Content-Type", "application/json") @@ -126,7 +126,7 @@ func TestUpdateClusterStatusOK(t *testing.T) { // Override KubeconfigGetterForCluster to avoid having to setup service accounts and mount files with secret tokens. originalGetter := controller_util.KubeconfigGetterForCluster - controller_util.KubeconfigGetterForCluster = func(c *federation_v1alpha1.Cluster) clientcmd.KubeconfigGetter { + controller_util.KubeconfigGetterForCluster = func(c *federation_v1beta1.Cluster) clientcmd.KubeconfigGetter { return func() (*clientcmdapi.Config, error) { return &clientcmdapi.Config{}, nil } @@ -141,7 +141,7 @@ func TestUpdateClusterStatusOK(t *testing.T) { if !found { t.Errorf("Failed to Update Cluster Status") } else { - if (clusterStatus.Conditions[1].Status != v1.ConditionFalse) || (clusterStatus.Conditions[1].Type != federation_v1alpha1.ClusterOffline) { + if (clusterStatus.Conditions[1].Status != v1.ConditionFalse) || (clusterStatus.Conditions[1].Type != federation_v1beta1.ClusterOffline) { t.Errorf("Failed to Update Cluster Status") } } diff --git a/federation/pkg/federation-controller/service/cluster_helper.go b/federation/pkg/federation-controller/service/cluster_helper.go index 08c689f42fc..c24f28495f5 100644 --- a/federation/pkg/federation-controller/service/cluster_helper.go +++ b/federation/pkg/federation-controller/service/cluster_helper.go @@ -19,7 +19,7 @@ package service import ( "sync" - v1alpha1 "k8s.io/kubernetes/federation/apis/federation/v1alpha1" + v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" @@ -38,7 +38,7 @@ import ( type clusterCache struct { clientset *release_1_3.Clientset - cluster *v1alpha1.Cluster + cluster *v1beta1.Cluster // A store of services, populated by the serviceController serviceStore cache.StoreToServiceLister // Watches changes to all services @@ -58,7 +58,7 @@ type clusterClientCache struct { clientMap map[string]*clusterCache } -func (cc *clusterClientCache) startClusterLW(cluster *v1alpha1.Cluster, clusterName string) { +func (cc *clusterClientCache) startClusterLW(cluster *v1beta1.Cluster, clusterName string) { cachedClusterClient, ok := cc.clientMap[clusterName] // only create when no existing cachedClusterClient if ok { @@ -162,7 +162,7 @@ func (cc *clusterClientCache) startClusterLW(cluster *v1alpha1.Cluster, clusterN // delFromClusterSet delete a cluster from clusterSet and // delete the corresponding restclient from the map clusterKubeClientMap func (cc *clusterClientCache) delFromClusterSet(obj interface{}) { - cluster, ok := obj.(*v1alpha1.Cluster) + cluster, ok := obj.(*v1beta1.Cluster) cc.rwlock.Lock() defer cc.rwlock.Unlock() if ok { @@ -181,10 +181,10 @@ func (cc *clusterClientCache) delFromClusterSet(obj interface{}) { // addToClusterSet inserts the new cluster to clusterSet and creates a corresponding // restclient to map clusterKubeClientMap func (cc *clusterClientCache) addToClientMap(obj interface{}) { - cluster := obj.(*v1alpha1.Cluster) + cluster := obj.(*v1beta1.Cluster) cc.rwlock.Lock() defer cc.rwlock.Unlock() - cluster, ok := obj.(*v1alpha1.Cluster) + cluster, ok := obj.(*v1beta1.Cluster) if !ok { return } @@ -196,7 +196,7 @@ func (cc *clusterClientCache) addToClientMap(obj interface{}) { } } -func newClusterClientset(c *v1alpha1.Cluster) (*release_1_3.Clientset, error) { +func newClusterClientset(c *v1beta1.Cluster) (*release_1_3.Clientset, error) { clusterConfig, err := util.BuildClusterConfig(c) if clusterConfig != nil { clientset := release_1_3.NewForConfigOrDie(restclient.AddUserAgent(clusterConfig, UserAgentName)) diff --git a/federation/pkg/federation-controller/service/endpoint_helper_test.go b/federation/pkg/federation-controller/service/endpoint_helper_test.go index c9421d819ba..67c639563a7 100644 --- a/federation/pkg/federation-controller/service/endpoint_helper_test.go +++ b/federation/pkg/federation-controller/service/endpoint_helper_test.go @@ -19,7 +19,7 @@ package service import ( "testing" - "k8s.io/kubernetes/federation/apis/federation/v1alpha1" + "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns" // Only for unit testing purposes. v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/sets" @@ -58,8 +58,8 @@ func TestProcessEndpointUpdate(t *testing.T) { cc := clusterClientCache{ clientMap: map[string]*clusterCache{ clusterName: { - cluster: &v1alpha1.Cluster{ - Status: v1alpha1.ClusterStatus{ + cluster: &v1beta1.Cluster{ + Status: v1beta1.ClusterStatus{ Zones: []string{"foozone"}, Region: "fooregion", }, @@ -111,8 +111,8 @@ func TestProcessEndpointDeletion(t *testing.T) { cc := clusterClientCache{ clientMap: map[string]*clusterCache{ clusterName: { - cluster: &v1alpha1.Cluster{ - Status: v1alpha1.ClusterStatus{ + cluster: &v1beta1.Cluster{ + Status: v1beta1.ClusterStatus{ Zones: []string{"foozone"}, Region: "fooregion", }, diff --git a/federation/pkg/federation-controller/service/servicecontroller.go b/federation/pkg/federation-controller/service/servicecontroller.go index 0857d4d8319..5d285bc0c88 100644 --- a/federation/pkg/federation-controller/service/servicecontroller.go +++ b/federation/pkg/federation-controller/service/servicecontroller.go @@ -24,7 +24,7 @@ import ( "reflect" "github.com/golang/glog" - v1alpha1 "k8s.io/kubernetes/federation/apis/federation/v1alpha1" + v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" federationcache "k8s.io/kubernetes/federation/client/cache" federation_release_1_3 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3" "k8s.io/kubernetes/federation/pkg/dnsprovider" @@ -176,17 +176,17 @@ func New(federationClient federation_release_1_3.Interface, dns dnsprovider.Inte return s.federationClient.Federation().Clusters().Watch(options) }, }, - &v1alpha1.Cluster{}, + &v1beta1.Cluster{}, clusterSyncPeriod, framework.ResourceEventHandlerFuncs{ DeleteFunc: s.clusterCache.delFromClusterSet, AddFunc: s.clusterCache.addToClientMap, UpdateFunc: func(old, cur interface{}) { - oldCluster, ok := old.(*v1alpha1.Cluster) + oldCluster, ok := old.(*v1beta1.Cluster) if !ok { return } - curCluster, ok := cur.(*v1alpha1.Cluster) + curCluster, ok := cur.(*v1beta1.Cluster) if !ok { return } @@ -608,7 +608,7 @@ func portEqualExcludeNodePort(x, y *v1.ServicePort) bool { return true } -func clustersFromList(list *v1alpha1.ClusterList) []string { +func clustersFromList(list *v1beta1.ClusterList) []string { result := []string{} for ix := range list.Items { result = append(result, list.Items[ix].Name) @@ -619,7 +619,7 @@ func clustersFromList(list *v1alpha1.ClusterList) []string { // getClusterConditionPredicate filter all clusters meet condition of // condition.type=Ready and condition.status=true func getClusterConditionPredicate() federationcache.ClusterConditionPredicate { - return func(cluster v1alpha1.Cluster) bool { + return func(cluster v1beta1.Cluster) bool { // If we have no info, don't accept if len(cluster.Status.Conditions) == 0 { return false @@ -627,7 +627,7 @@ func getClusterConditionPredicate() federationcache.ClusterConditionPredicate { for _, cond := range cluster.Status.Conditions { //We consider the cluster for load balancing only when its ClusterReady condition status //is ConditionTrue - if cond.Type == v1alpha1.ClusterReady && cond.Status != v1.ConditionTrue { + if cond.Type == v1beta1.ClusterReady && cond.Status != v1.ConditionTrue { glog.V(4).Infof("Ignoring cluser %v with %v condition status %v", cluster.Name, cond.Type, cond.Status) return false } diff --git a/federation/pkg/federation-controller/service/servicecontroller_test.go b/federation/pkg/federation-controller/service/servicecontroller_test.go index 31f9a0235a3..17eee1abc19 100644 --- a/federation/pkg/federation-controller/service/servicecontroller_test.go +++ b/federation/pkg/federation-controller/service/servicecontroller_test.go @@ -20,7 +20,7 @@ import ( "sync" "testing" - "k8s.io/kubernetes/federation/apis/federation/v1alpha1" + "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns" // Only for unit testing purposes. "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/sets" @@ -39,22 +39,22 @@ func TestGetClusterConditionPredicate(t *testing.T) { } tests := []struct { - cluster v1alpha1.Cluster + cluster v1beta1.Cluster expectAccept bool name string serviceController *ServiceController }{ { - cluster: v1alpha1.Cluster{}, + cluster: v1beta1.Cluster{}, expectAccept: false, name: "empty", serviceController: &serviceController, }, { - cluster: v1alpha1.Cluster{ - Status: v1alpha1.ClusterStatus{ - Conditions: []v1alpha1.ClusterCondition{ - {Type: v1alpha1.ClusterReady, Status: v1.ConditionTrue}, + cluster: v1beta1.Cluster{ + Status: v1beta1.ClusterStatus{ + Conditions: []v1beta1.ClusterCondition{ + {Type: v1beta1.ClusterReady, Status: v1.ConditionTrue}, }, }, }, @@ -63,10 +63,10 @@ func TestGetClusterConditionPredicate(t *testing.T) { serviceController: &serviceController, }, { - cluster: v1alpha1.Cluster{ - Status: v1alpha1.ClusterStatus{ - Conditions: []v1alpha1.ClusterCondition{ - {Type: v1alpha1.ClusterReady, Status: v1.ConditionFalse}, + cluster: v1beta1.Cluster{ + Status: v1beta1.ClusterStatus{ + Conditions: []v1beta1.ClusterCondition{ + {Type: v1beta1.ClusterReady, Status: v1.ConditionFalse}, }, }, }, diff --git a/federation/pkg/federation-controller/util/cluster_util.go b/federation/pkg/federation-controller/util/cluster_util.go index 5105fa5387c..d0bd34e6ef9 100644 --- a/federation/pkg/federation-controller/util/cluster_util.go +++ b/federation/pkg/federation-controller/util/cluster_util.go @@ -23,7 +23,7 @@ import ( "time" "github.com/golang/glog" - federation_v1alpha1 "k8s.io/kubernetes/federation/apis/federation/v1alpha1" + federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/restclient" client "k8s.io/kubernetes/pkg/client/unversioned" @@ -40,7 +40,7 @@ const ( getSecretTimeout = 1 * time.Minute ) -func BuildClusterConfig(c *federation_v1alpha1.Cluster) (*restclient.Config, error) { +func BuildClusterConfig(c *federation_v1beta1.Cluster) (*restclient.Config, error) { var serverAddress string var clusterConfig *restclient.Config hostIP, err := utilnet.ChooseHostInterface() @@ -78,7 +78,7 @@ func BuildClusterConfig(c *federation_v1alpha1.Cluster) (*restclient.Config, err // This is to inject a different kubeconfigGetter in tests. // We dont use the standard one which calls NewInCluster in tests to avoid having to setup service accounts and mount files with secret tokens. -var KubeconfigGetterForCluster = func(c *federation_v1alpha1.Cluster) clientcmd.KubeconfigGetter { +var KubeconfigGetterForCluster = func(c *federation_v1beta1.Cluster) clientcmd.KubeconfigGetter { return func() (*clientcmdapi.Config, error) { secretRefName := "" if c.Spec.SecretRef != nil { diff --git a/hack/test-go.sh b/hack/test-go.sh index fdecf45a43a..617b961c582 100755 --- a/hack/test-go.sh +++ b/hack/test-go.sh @@ -60,7 +60,7 @@ KUBE_GOVERALLS_BIN=${KUBE_GOVERALLS_BIN:-} # "v1,compute/v1alpha1,experimental/v1alpha2;v1,compute/v2,experimental/v1alpha3" # FIXME: due to current implementation of a test client (see: pkg/api/testapi/testapi.go) # ONLY the last version is tested in each group. -KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,autoscaling/v1,batch/v1,batch/v2alpha1,extensions/v1beta1,apps/v1alpha1,federation/v1alpha1,policy/v1alpha1,rbac.authorization.k8s.io/v1alpha1,certificates/v1alpha1"} +KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,autoscaling/v1,batch/v1,batch/v2alpha1,extensions/v1beta1,apps/v1alpha1,federation/v1beta1,policy/v1alpha1,rbac.authorization.k8s.io/v1alpha1,certificates/v1alpha1"} # once we have multiple group supports # Create a junit-style XML test report in this directory if set. KUBE_JUNIT_REPORT_DIR=${KUBE_JUNIT_REPORT_DIR:-} diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 02530a7062a..a884db7ff13 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -46,7 +46,7 @@ ${clientgen} -t "$@" ${clientgen} --clientset-name="release_1_3" --input="api/v1,extensions/v1beta1,autoscaling/v1,batch/v1" # Clientgen for federation clientset. ${clientgen} --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/","api/" --included-types-overrides="api/Service" "$@" -${clientgen} --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/v1alpha1","api/v1" --included-types-overrides="api/v1/Service" "$@" +${clientgen} --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/v1beta1","api/v1" --included-types-overrides="api/v1/Service" "$@" ${conversiongen} "$@" ${deepcopygen} "$@" ${setgen} "$@"