Skip to content

K
k3s
Commit 7fcf8daf authored by nikhiljindal's avatar nikhiljindal
Browse files
Options

Moving federation/v1alpha1 to federation/v1beta1

parent 88b10b1d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 186 additions and 185 deletions
cmd/libs/go2idl/conversion-gen/main.go
View file @ 7fcf8daf
...@@ -57,7 +57,7 @@ func main() { ...@@ -57,7 +57,7 @@ func main() {
"k8s.io/kubernetes/pkg/apis/rbac", "k8s.io/kubernetes/pkg/apis/rbac",
"k8s.io/kubernetes/pkg/apis/rbac/v1alpha1", "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1",
"k8s.io/kubernetes/federation/apis/federation", "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/conversion",
"k8s.io/kubernetes/pkg/runtime", "k8s.io/kubernetes/pkg/runtime",
} }
......
cmd/libs/go2idl/deepcopy-gen/main.go
View file @ 7fcf8daf
...@@ -75,7 +75,7 @@ func main() { ...@@ -75,7 +75,7 @@ func main() {
"k8s.io/kubernetes/pkg/apis/rbac", "k8s.io/kubernetes/pkg/apis/rbac",
"k8s.io/kubernetes/pkg/apis/rbac/v1alpha1", "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1",
"k8s.io/kubernetes/federation/apis/federation", "k8s.io/kubernetes/federation/apis/federation",
"k8s.io/kubernetes/federation/apis/federation/v1alpha1", "k8s.io/kubernetes/federation/apis/federation/v1beta1",
} }
if err := arguments.Execute( if err := arguments.Execute(
......
cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
View file @ 7fcf8daf
...@@ -73,7 +73,7 @@ func New() *Generator { ...@@ -73,7 +73,7 @@ func New() *Generator {
`k8s.io/kubernetes/pkg/apis/batch/v2alpha1`, `k8s.io/kubernetes/pkg/apis/batch/v2alpha1`,
`k8s.io/kubernetes/pkg/apis/apps/v1alpha1`, `k8s.io/kubernetes/pkg/apis/apps/v1alpha1`,
`k8s.io/kubernetes/pkg/apis/rbac/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`, `k8s.io/kubernetes/pkg/apis/certificates/v1alpha1`,
}, ","), }, ","),
DropEmbeddedFields: "k8s.io/kubernetes/pkg/api/unversioned.TypeMeta", DropEmbeddedFields: "k8s.io/kubernetes/pkg/api/unversioned.TypeMeta",
......
federation/apis/federation/install/install.go
View file @ 7fcf8daf
...@@ -22,7 +22,7 @@ import ( ...@@ -22,7 +22,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/federation/apis/federation" "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"
"k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
...@@ -37,7 +37,7 @@ const importPrefix = "k8s.io/kubernetes/federation/apis/federation" ...@@ -37,7 +37,7 @@ const importPrefix = "k8s.io/kubernetes/federation/apis/federation"
var accessor = meta.NewAccessor() var accessor = meta.NewAccessor()
// availableVersions lists all known external versions for this group from most preferred to least preferred // 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() { func init() {
registered.RegisterVersions(availableVersions) registered.RegisterVersions(availableVersions)
...@@ -101,7 +101,7 @@ func newRESTMapper(externalVersions []unversioned.GroupVersion) meta.RESTMapper ...@@ -101,7 +101,7 @@ func newRESTMapper(externalVersions []unversioned.GroupVersion) meta.RESTMapper
// string, or an error if the version is not known. // string, or an error if the version is not known.
func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, error) { func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, error) {
switch version { switch version {
case v1alpha1.SchemeGroupVersion: case v1beta1.SchemeGroupVersion:
return &meta.VersionInterfaces{ return &meta.VersionInterfaces{
ObjectConvertor: api.Scheme, ObjectConvertor: api.Scheme,
MetadataAccessor: accessor, MetadataAccessor: accessor,
...@@ -122,8 +122,8 @@ func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) { ...@@ -122,8 +122,8 @@ func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) {
continue continue
} }
switch v { switch v {
case v1alpha1.SchemeGroupVersion: case v1beta1.SchemeGroupVersion:
v1alpha1.AddToScheme(api.Scheme) v1beta1.AddToScheme(api.Scheme)
} }
} }
} }
federation/apis/federation/install/install_test.go
View file @ 7fcf8daf
...@@ -21,7 +21,7 @@ import ( ...@@ -21,7 +21,7 @@ import (
"testing" "testing"
"k8s.io/kubernetes/federation/apis/federation" "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"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apimachinery/registered"
...@@ -77,7 +77,7 @@ func TestInterfacesFor(t *testing.T) { ...@@ -77,7 +77,7 @@ func TestInterfacesFor(t *testing.T) {
} }
func TestRESTMapper(t *testing.T) { func TestRESTMapper(t *testing.T) {
gv := v1alpha1.SchemeGroupVersion gv := v1beta1.SchemeGroupVersion
clusterGVK := gv.WithKind("Cluster") clusterGVK := gv.WithKind("Cluster")
if gvk, err := registered.GroupOrDie(federation.GroupName).RESTMapper.KindFor(gv.WithResource("clusters")); err != nil || gvk != clusterGVK { if gvk, err := registered.GroupOrDie(federation.GroupName).RESTMapper.KindFor(gv.WithResource("clusters")); err != nil || gvk != clusterGVK {
......
federation/apis/federation/v1alpha1/conversion.go → federation/apis/federation/v1beta1/conversion.go
View file @ 7fcf8daf
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package v1alpha1 package v1beta1
import ( import (
"fmt" "fmt"
......
federation/apis/federation/v1alpha1/deep_copy_generated.go → federation/apis/federation/v1beta1/deep_copy_generated.go
View file @ 7fcf8daf
...@@ -18,7 +18,7 @@ limitations under the License. ...@@ -18,7 +18,7 @@ limitations under the License.
// This file was autogenerated by deepcopy-gen. Do not edit it manually! // This file was autogenerated by deepcopy-gen. Do not edit it manually!
package v1alpha1 package v1beta1
import ( import (
api "k8s.io/kubernetes/pkg/api" api "k8s.io/kubernetes/pkg/api"
...@@ -29,35 +29,35 @@ import ( ...@@ -29,35 +29,35 @@ import (
func init() { func init() {
if err := api.Scheme.AddGeneratedDeepCopyFuncs( if err := api.Scheme.AddGeneratedDeepCopyFuncs(
DeepCopy_v1alpha1_Cluster, DeepCopy_v1beta1_Cluster,
DeepCopy_v1alpha1_ClusterCondition, DeepCopy_v1beta1_ClusterCondition,
DeepCopy_v1alpha1_ClusterList, DeepCopy_v1beta1_ClusterList,
DeepCopy_v1alpha1_ClusterSpec, DeepCopy_v1beta1_ClusterSpec,
DeepCopy_v1alpha1_ClusterStatus, DeepCopy_v1beta1_ClusterStatus,
DeepCopy_v1alpha1_ServerAddressByClientCIDR, DeepCopy_v1beta1_ServerAddressByClientCIDR,
); err != nil { ); err != nil {
// if one of the deep copy functions is malformed, detect it immediately. // if one of the deep copy functions is malformed, detect it immediately.
panic(err) 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 { if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
return err return err
} }
if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { if err := v1.DeepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
return err 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 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 err
} }
return nil 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.Type = in.Type
out.Status = in.Status out.Status = in.Status
if err := unversioned.DeepCopy_unversioned_Time(in.LastProbeTime, &out.LastProbeTime, c); err != nil { 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 ...@@ -71,7 +71,7 @@ func DeepCopy_v1alpha1_ClusterCondition(in ClusterCondition, out *ClusterConditi
return nil 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 { if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
return err return err
} }
...@@ -82,7 +82,7 @@ func DeepCopy_v1alpha1_ClusterList(in ClusterList, out *ClusterList, c *conversi ...@@ -82,7 +82,7 @@ func DeepCopy_v1alpha1_ClusterList(in ClusterList, out *ClusterList, c *conversi
in, out := in.Items, &out.Items in, out := in.Items, &out.Items
*out = make([]Cluster, len(in)) *out = make([]Cluster, len(in))
for i := range 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 return err
} }
} }
...@@ -92,12 +92,12 @@ func DeepCopy_v1alpha1_ClusterList(in ClusterList, out *ClusterList, c *conversi ...@@ -92,12 +92,12 @@ func DeepCopy_v1alpha1_ClusterList(in ClusterList, out *ClusterList, c *conversi
return nil 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 { if in.ServerAddressByClientCIDRs != nil {
in, out := in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs in, out := in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
*out = make([]ServerAddressByClientCIDR, len(in)) *out = make([]ServerAddressByClientCIDR, len(in))
for i := range 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 return err
} }
} }
...@@ -116,12 +116,12 @@ func DeepCopy_v1alpha1_ClusterSpec(in ClusterSpec, out *ClusterSpec, c *conversi ...@@ -116,12 +116,12 @@ func DeepCopy_v1alpha1_ClusterSpec(in ClusterSpec, out *ClusterSpec, c *conversi
return nil 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 { if in.Conditions != nil {
in, out := in.Conditions, &out.Conditions in, out := in.Conditions, &out.Conditions
*out = make([]ClusterCondition, len(in)) *out = make([]ClusterCondition, len(in))
for i := range 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 return err
} }
} }
...@@ -139,7 +139,7 @@ func DeepCopy_v1alpha1_ClusterStatus(in ClusterStatus, out *ClusterStatus, c *co ...@@ -139,7 +139,7 @@ func DeepCopy_v1alpha1_ClusterStatus(in ClusterStatus, out *ClusterStatus, c *co
return nil 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.ClientCIDR = in.ClientCIDR
out.ServerAddress = in.ServerAddress out.ServerAddress = in.ServerAddress
return nil return nil
......
federation/apis/federation/v1alpha1/defaults.go → federation/apis/federation/v1beta1/defaults.go
View file @ 7fcf8daf
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package v1alpha1 package v1beta1
import ( import (
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
......
federation/apis/federation/v1alpha1/doc.go → federation/apis/federation/v1beta1/doc.go
View file @ 7fcf8daf
...@@ -15,4 +15,4 @@ limitations under the License. ...@@ -15,4 +15,4 @@ limitations under the License.
*/ */
// +genconversion=true // +genconversion=true
package v1alpha1 package v1beta1
federation/apis/federation/v1alpha1/generated.pb.go → federation/apis/federation/v1beta1/generated.pb.go
View file @ 7fcf8daf
...@@ -15,14 +15,14 @@ limitations under the License. ...@@ -15,14 +15,14 @@ limitations under the License.
*/ */
// Code generated by protoc-gen-gogo. // 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! // 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: 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: It has these top-level messages:
Cluster Cluster
...@@ -32,7 +32,7 @@ limitations under the License. ...@@ -32,7 +32,7 @@ limitations under the License.
ClusterStatus ClusterStatus
ServerAddressByClientCIDR ServerAddressByClientCIDR
*/ */
package v1alpha1 package v1beta1
import proto "github.com/gogo/protobuf/proto" import proto "github.com/gogo/protobuf/proto"
import fmt "fmt" import fmt "fmt"
...@@ -72,12 +72,12 @@ func (m *ServerAddressByClientCIDR) String() string { return proto.CompactTextSt ...@@ -72,12 +72,12 @@ func (m *ServerAddressByClientCIDR) String() string { return proto.CompactTextSt
func (*ServerAddressByClientCIDR) ProtoMessage() {} func (*ServerAddressByClientCIDR) ProtoMessage() {}
func init() { func init() {
proto.RegisterType((*Cluster)(nil), "k8s.io.kubernetes.federation.apis.federation.v1alpha1.Cluster") proto.RegisterType((*Cluster)(nil), "k8s.io.kubernetes.federation.apis.federation.v1beta1.Cluster")
proto.RegisterType((*ClusterCondition)(nil), "k8s.io.kubernetes.federation.apis.federation.v1alpha1.ClusterCondition") proto.RegisterType((*ClusterCondition)(nil), "k8s.io.kubernetes.federation.apis.federation.v1beta1.ClusterCondition")
proto.RegisterType((*ClusterList)(nil), "k8s.io.kubernetes.federation.apis.federation.v1alpha1.ClusterList") proto.RegisterType((*ClusterList)(nil), "k8s.io.kubernetes.federation.apis.federation.v1beta1.ClusterList")
proto.RegisterType((*ClusterSpec)(nil), "k8s.io.kubernetes.federation.apis.federation.v1alpha1.ClusterSpec") proto.RegisterType((*ClusterSpec)(nil), "k8s.io.kubernetes.federation.apis.federation.v1beta1.ClusterSpec")
proto.RegisterType((*ClusterStatus)(nil), "k8s.io.kubernetes.federation.apis.federation.v1alpha1.ClusterStatus") proto.RegisterType((*ClusterStatus)(nil), "k8s.io.kubernetes.federation.apis.federation.v1beta1.ClusterStatus")
proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.kubernetes.federation.apis.federation.v1alpha1.ServerAddressByClientCIDR") proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.kubernetes.federation.apis.federation.v1beta1.ServerAddressByClientCIDR")
} }
func (m *Cluster) Marshal() (data []byte, err error) { func (m *Cluster) Marshal() (data []byte, err error) {
size := m.Size() size := m.Size()
......
federation/apis/federation/v1alpha1/generated.proto → federation/apis/federation/v1beta1/generated.proto
View file @ 7fcf8daf
...@@ -19,14 +19,15 @@ limitations under the License. ...@@ -19,14 +19,15 @@ limitations under the License.
syntax = 'proto2'; 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/unversioned/generated.proto";
import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
// Package-wide variables from generator "generated". // 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. // Information about a registered cluster in a federated kubernetes setup. Clusters are not namespaced and have unique names in the federation.
message Cluster { message Cluster {
......
federation/apis/federation/v1alpha1/register.go → federation/apis/federation/v1beta1/register.go
View file @ 7fcf8daf
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package v1alpha1 package v1beta1
import ( import (
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
...@@ -27,7 +27,7 @@ import ( ...@@ -27,7 +27,7 @@ import (
const GroupName = "federation" const GroupName = "federation"
// SchemeGroupVersion is group version used to register these objects // 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. // Adds the list of known types to api.Scheme.
func AddToScheme(scheme *runtime.Scheme) { func AddToScheme(scheme *runtime.Scheme) {
......
federation/apis/federation/v1alpha1/types.generated.go → federation/apis/federation/v1beta1/types.generated.go
View file @ 7fcf8daf
...@@ -19,7 +19,7 @@ limitations under the License. ...@@ -19,7 +19,7 @@ limitations under the License.
// THIS FILE IS AUTO-GENERATED BY codecgen. // THIS FILE IS AUTO-GENERATED BY codecgen.
// ************************************************************ // ************************************************************
package v1alpha1 package v1beta1
import ( import (
"errors" "errors"
......
federation/apis/federation/v1alpha1/types.go → federation/apis/federation/v1beta1/types.go
View file @ 7fcf8daf
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package v1alpha1 package v1beta1
import ( import (
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
......
federation/client/cache/cluster_cache.go
View file @ 7fcf8daf
...@@ -18,7 +18,7 @@ package cache ...@@ -18,7 +18,7 @@ package cache
import ( import (
"github.com/golang/glog" "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" kubeCache "k8s.io/kubernetes/pkg/client/cache"
) )
...@@ -28,16 +28,16 @@ type StoreToClusterLister struct { ...@@ -28,16 +28,16 @@ type StoreToClusterLister struct {
kubeCache.Store 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() { 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 return clusters, nil
} }
// ClusterConditionPredicate is a function that indicates whether the given cluster's conditions meet // ClusterConditionPredicate is a function that indicates whether the given cluster's conditions meet
// some set of criteria defined by the function. // 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. // storeToClusterConditionLister filters and returns nodes matching the given type and status from the store.
type storeToClusterConditionLister struct { type storeToClusterConditionLister struct {
...@@ -51,9 +51,9 @@ func (s *StoreToClusterLister) ClusterCondition(predicate ClusterConditionPredic ...@@ -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. // 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() { for _, m := range s.store.List() {
cluster := *m.(*v1alpha1.Cluster) cluster := *m.(*v1beta1.Cluster)
if s.predicate(cluster) { if s.predicate(cluster) {
clusters.Items = append(clusters.Items, cluster) clusters.Items = append(clusters.Items, cluster)
} else { } else {
......
federation/client/clientset_generated/federation_release_1_3/clientset.go
View file @ 7fcf8daf
...@@ -19,7 +19,7 @@ package federation_release_1_3 ...@@ -19,7 +19,7 @@ package federation_release_1_3
import ( import (
"github.com/golang/glog" "github.com/golang/glog"
v1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/core/v1" 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" restclient "k8s.io/kubernetes/pkg/client/restclient"
discovery "k8s.io/kubernetes/pkg/client/typed/discovery" discovery "k8s.io/kubernetes/pkg/client/typed/discovery"
"k8s.io/kubernetes/pkg/util/flowcontrol" "k8s.io/kubernetes/pkg/util/flowcontrol"
...@@ -27,7 +27,7 @@ import ( ...@@ -27,7 +27,7 @@ import (
type Interface interface { type Interface interface {
Discovery() discovery.DiscoveryInterface Discovery() discovery.DiscoveryInterface
Federation() v1alpha1federation.FederationInterface Federation() v1beta1federation.FederationInterface
Core() v1core.CoreInterface Core() v1core.CoreInterface
} }
...@@ -35,12 +35,12 @@ type Interface interface { ...@@ -35,12 +35,12 @@ type Interface interface {
// version included in a Clientset. // version included in a Clientset.
type Clientset struct { type Clientset struct {
*discovery.DiscoveryClient *discovery.DiscoveryClient
*v1alpha1federation.FederationClient *v1beta1federation.FederationClient
*v1core.CoreClient *v1core.CoreClient
} }
// Federation retrieves the FederationClient // Federation retrieves the FederationClient
func (c *Clientset) Federation() v1alpha1federation.FederationInterface { func (c *Clientset) Federation() v1beta1federation.FederationInterface {
if c == nil { if c == nil {
return nil return nil
} }
...@@ -68,7 +68,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { ...@@ -68,7 +68,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) {
} }
var clientset Clientset var clientset Clientset
var err error var err error
clientset.FederationClient, err = v1alpha1federation.NewForConfig(&configShallowCopy) clientset.FederationClient, err = v1beta1federation.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -89,7 +89,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { ...@@ -89,7 +89,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) {
// panics if there is an error in the config. // panics if there is an error in the config.
func NewForConfigOrDie(c *restclient.Config) *Clientset { func NewForConfigOrDie(c *restclient.Config) *Clientset {
var clientset Clientset var clientset Clientset
clientset.FederationClient = v1alpha1federation.NewForConfigOrDie(c) clientset.FederationClient = v1beta1federation.NewForConfigOrDie(c)
clientset.CoreClient = v1core.NewForConfigOrDie(c) clientset.CoreClient = v1core.NewForConfigOrDie(c)
clientset.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) clientset.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c)
...@@ -99,7 +99,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { ...@@ -99,7 +99,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset {
// New creates a new Clientset for the given RESTClient. // New creates a new Clientset for the given RESTClient.
func New(c *restclient.RESTClient) *Clientset { func New(c *restclient.RESTClient) *Clientset {
var clientset Clientset var clientset Clientset
clientset.FederationClient = v1alpha1federation.New(c) clientset.FederationClient = v1beta1federation.New(c)
clientset.CoreClient = v1core.New(c) clientset.CoreClient = v1core.New(c)
clientset.DiscoveryClient = discovery.NewDiscoveryClient(c) clientset.DiscoveryClient = discovery.NewDiscoveryClient(c)
......
federation/client/clientset_generated/federation_release_1_3/doc.go
View file @ 7fcf8daf
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. 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. // This package has the automatically generated clientset.
package federation_release_1_3 package federation_release_1_3
federation/client/clientset_generated/federation_release_1_3/fake/clientset_generated.go
View file @ 7fcf8daf
...@@ -20,8 +20,8 @@ import ( ...@@ -20,8 +20,8 @@ import (
clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3" 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" 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" 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" v1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1"
fakev1alpha1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake" 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/api"
"k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apimachinery/registered"
"k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/client/testing/core"
...@@ -62,8 +62,8 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { ...@@ -62,8 +62,8 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface {
var _ clientset.Interface = &Clientset{} var _ clientset.Interface = &Clientset{}
// Federation retrieves the FederationClient // Federation retrieves the FederationClient
func (c *Clientset) Federation() v1alpha1federation.FederationInterface { func (c *Clientset) Federation() v1beta1federation.FederationInterface {
return &fakev1alpha1federation.FakeFederation{Fake: &c.Fake} return &fakev1beta1federation.FakeFederation{Fake: &c.Fake}
} }
// Core retrieves the CoreClient // Core retrieves the CoreClient
......
federation/client/clientset_generated/federation_release_1_3/fake/doc.go
View file @ 7fcf8daf
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. 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. // This package has the automatically generated fake clientset.
package fake package fake
federation/client/clientset_generated/federation_release_1_3/typed/core/v1/doc.go
View file @ 7fcf8daf
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. 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. // This package has the automatically generated typed clients.
package v1 package v1
federation/client/clientset_generated/federation_release_1_3/typed/core/v1/fake/doc.go
View file @ 7fcf8daf
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. 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 has the automatically generated clients.
package fake package fake
federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/cluster.go → federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/cluster.go
View file @ 7fcf8daf
...@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and ...@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package v1alpha1 package v1beta1
import ( import (
v1alpha1 "k8s.io/kubernetes/federation/apis/federation/v1alpha1" v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
api "k8s.io/kubernetes/pkg/api" api "k8s.io/kubernetes/pkg/api"
watch "k8s.io/kubernetes/pkg/watch" watch "k8s.io/kubernetes/pkg/watch"
) )
...@@ -30,15 +30,15 @@ type ClustersGetter interface { ...@@ -30,15 +30,15 @@ type ClustersGetter interface {
// ClusterInterface has methods to work with Cluster resources. // ClusterInterface has methods to work with Cluster resources.
type ClusterInterface interface { type ClusterInterface interface {
Create(*v1alpha1.Cluster) (*v1alpha1.Cluster, error) Create(*v1beta1.Cluster) (*v1beta1.Cluster, error)
Update(*v1alpha1.Cluster) (*v1alpha1.Cluster, error) Update(*v1beta1.Cluster) (*v1beta1.Cluster, error)
UpdateStatus(*v1alpha1.Cluster) (*v1alpha1.Cluster, error) UpdateStatus(*v1beta1.Cluster) (*v1beta1.Cluster, error)
Delete(name string, options *api.DeleteOptions) error Delete(name string, options *api.DeleteOptions) error
DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
Get(name string) (*v1alpha1.Cluster, error) Get(name string) (*v1beta1.Cluster, error)
List(opts api.ListOptions) (*v1alpha1.ClusterList, error) List(opts api.ListOptions) (*v1beta1.ClusterList, error)
Watch(opts api.ListOptions) (watch.Interface, 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 ClusterExpansion
} }
...@@ -55,8 +55,8 @@ func newClusters(c *FederationClient) *clusters { ...@@ -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. // 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) { func (c *clusters) Create(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) {
result = &v1alpha1.Cluster{} result = &v1beta1.Cluster{}
err = c.client.Post(). err = c.client.Post().
Resource("clusters"). Resource("clusters").
Body(cluster). Body(cluster).
...@@ -66,8 +66,8 @@ func (c *clusters) Create(cluster *v1alpha1.Cluster) (result *v1alpha1.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. // 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) { func (c *clusters) Update(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) {
result = &v1alpha1.Cluster{} result = &v1beta1.Cluster{}
err = c.client.Put(). err = c.client.Put().
Resource("clusters"). Resource("clusters").
Name(cluster.Name). Name(cluster.Name).
...@@ -77,8 +77,8 @@ func (c *clusters) Update(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster, ...@@ -77,8 +77,8 @@ func (c *clusters) Update(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster,
return return
} }
func (c *clusters) UpdateStatus(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster, err error) { func (c *clusters) UpdateStatus(cluster *v1beta1.Cluster) (result *v1beta1.Cluster, err error) {
result = &v1alpha1.Cluster{} result = &v1beta1.Cluster{}
err = c.client.Put(). err = c.client.Put().
Resource("clusters"). Resource("clusters").
Name(cluster.Name). Name(cluster.Name).
...@@ -110,8 +110,8 @@ func (c *clusters) DeleteCollection(options *api.DeleteOptions, listOptions api. ...@@ -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. // 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) { func (c *clusters) Get(name string) (result *v1beta1.Cluster, err error) {
result = &v1alpha1.Cluster{} result = &v1beta1.Cluster{}
err = c.client.Get(). err = c.client.Get().
Resource("clusters"). Resource("clusters").
Name(name). Name(name).
...@@ -121,8 +121,8 @@ func (c *clusters) Get(name string) (result *v1alpha1.Cluster, err error) { ...@@ -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. // 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) { func (c *clusters) List(opts api.ListOptions) (result *v1beta1.ClusterList, err error) {
result = &v1alpha1.ClusterList{} result = &v1beta1.ClusterList{}
err = c.client.Get(). err = c.client.Get().
Resource("clusters"). Resource("clusters").
VersionedParams(&opts, api.ParameterCodec). VersionedParams(&opts, api.ParameterCodec).
...@@ -141,8 +141,8 @@ func (c *clusters) Watch(opts api.ListOptions) (watch.Interface, error) { ...@@ -141,8 +141,8 @@ func (c *clusters) Watch(opts api.ListOptions) (watch.Interface, error) {
} }
// Patch applies the patch and returns the patched cluster. // 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) { func (c *clusters) Patch(name string, pt api.PatchType, data []byte) (result *v1beta1.Cluster, err error) {
result = &v1alpha1.Cluster{} result = &v1beta1.Cluster{}
err = c.client.Patch(pt). err = c.client.Patch(pt).
Resource("clusters"). Resource("clusters").
Name(name). Name(name).
......
federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/doc.go → federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/doc.go
View file @ 7fcf8daf
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. 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. // This package has the automatically generated typed clients.
package v1alpha1 package v1beta1
federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/doc.go → federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/doc.go
View file @ 7fcf8daf
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. 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 has the automatically generated clients.
package fake package fake
federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/fake_cluster.go → federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/fake_cluster.go
View file @ 7fcf8daf
...@@ -17,7 +17,7 @@ limitations under the License. ...@@ -17,7 +17,7 @@ limitations under the License.
package fake package fake
import ( import (
v1alpha1 "k8s.io/kubernetes/federation/apis/federation/v1alpha1" v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
api "k8s.io/kubernetes/pkg/api" api "k8s.io/kubernetes/pkg/api"
unversioned "k8s.io/kubernetes/pkg/api/unversioned" unversioned "k8s.io/kubernetes/pkg/api/unversioned"
core "k8s.io/kubernetes/pkg/client/testing/core" core "k8s.io/kubernetes/pkg/client/testing/core"
...@@ -30,60 +30,60 @@ type FakeClusters struct { ...@@ -30,60 +30,60 @@ type FakeClusters struct {
Fake *FakeFederation 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. obj, err := c.Fake.
Invokes(core.NewRootCreateAction(clustersResource, cluster), &v1alpha1.Cluster{}) Invokes(core.NewRootCreateAction(clustersResource, cluster), &v1beta1.Cluster{})
if obj == nil { if obj == nil {
return nil, err 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. obj, err := c.Fake.
Invokes(core.NewRootUpdateAction(clustersResource, cluster), &v1alpha1.Cluster{}) Invokes(core.NewRootUpdateAction(clustersResource, cluster), &v1beta1.Cluster{})
if obj == nil { if obj == nil {
return nil, err 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. obj, err := c.Fake.
Invokes(core.NewRootUpdateSubresourceAction(clustersResource, "status", cluster), &v1alpha1.Cluster{}) Invokes(core.NewRootUpdateSubresourceAction(clustersResource, "status", cluster), &v1beta1.Cluster{})
if obj == nil { if obj == nil {
return nil, err return nil, err
} }
return obj.(*v1alpha1.Cluster), err return obj.(*v1beta1.Cluster), err
} }
func (c *FakeClusters) Delete(name string, options *api.DeleteOptions) error { func (c *FakeClusters) Delete(name string, options *api.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(core.NewRootDeleteAction(clustersResource, name), &v1alpha1.Cluster{}) Invokes(core.NewRootDeleteAction(clustersResource, name), &v1beta1.Cluster{})
return err return err
} }
func (c *FakeClusters) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { func (c *FakeClusters) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
action := core.NewRootDeleteCollectionAction(clustersResource, listOptions) action := core.NewRootDeleteCollectionAction(clustersResource, listOptions)
_, err := c.Fake.Invokes(action, &v1alpha1.ClusterList{}) _, err := c.Fake.Invokes(action, &v1beta1.ClusterList{})
return err 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. obj, err := c.Fake.
Invokes(core.NewRootGetAction(clustersResource, name), &v1alpha1.Cluster{}) Invokes(core.NewRootGetAction(clustersResource, name), &v1beta1.Cluster{})
if obj == nil { if obj == nil {
return nil, err 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. obj, err := c.Fake.
Invokes(core.NewRootListAction(clustersResource, opts), &v1alpha1.ClusterList{}) Invokes(core.NewRootListAction(clustersResource, opts), &v1beta1.ClusterList{})
if obj == nil { if obj == nil {
return nil, err return nil, err
} }
...@@ -92,8 +92,8 @@ func (c *FakeClusters) List(opts api.ListOptions) (result *v1alpha1.ClusterList, ...@@ -92,8 +92,8 @@ func (c *FakeClusters) List(opts api.ListOptions) (result *v1alpha1.ClusterList,
if label == nil { if label == nil {
label = labels.Everything() label = labels.Everything()
} }
list := &v1alpha1.ClusterList{} list := &v1beta1.ClusterList{}
for _, item := range obj.(*v1alpha1.ClusterList).Items { for _, item := range obj.(*v1beta1.ClusterList).Items {
if label.Matches(labels.Set(item.Labels)) { if label.Matches(labels.Set(item.Labels)) {
list.Items = append(list.Items, item) list.Items = append(list.Items, item)
} }
...@@ -108,11 +108,11 @@ func (c *FakeClusters) Watch(opts api.ListOptions) (watch.Interface, error) { ...@@ -108,11 +108,11 @@ func (c *FakeClusters) Watch(opts api.ListOptions) (watch.Interface, error) {
} }
// Patch applies the patch and returns the patched cluster. // 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. obj, err := c.Fake.
Invokes(core.NewRootPatchAction(clustersResource, name, data), &v1alpha1.Cluster{}) Invokes(core.NewRootPatchAction(clustersResource, name, data), &v1beta1.Cluster{})
if obj == nil { if obj == nil {
return nil, err return nil, err
} }
return obj.(*v1alpha1.Cluster), err return obj.(*v1beta1.Cluster), err
} }
federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/fake/fake_federation_client.go → federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/fake_federation_client.go
View file @ 7fcf8daf
...@@ -17,7 +17,7 @@ limitations under the License. ...@@ -17,7 +17,7 @@ limitations under the License.
package fake package fake
import ( 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" restclient "k8s.io/kubernetes/pkg/client/restclient"
core "k8s.io/kubernetes/pkg/client/testing/core" core "k8s.io/kubernetes/pkg/client/testing/core"
) )
...@@ -26,7 +26,7 @@ type FakeFederation struct { ...@@ -26,7 +26,7 @@ type FakeFederation struct {
*core.Fake *core.Fake
} }
func (c *FakeFederation) Clusters() v1alpha1.ClusterInterface { func (c *FakeFederation) Clusters() v1beta1.ClusterInterface {
return &FakeClusters{c} return &FakeClusters{c}
} }
......
federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/federation_client.go → federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/federation_client.go
View file @ 7fcf8daf
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package v1alpha1 package v1beta1
import ( import (
api "k8s.io/kubernetes/pkg/api" api "k8s.io/kubernetes/pkg/api"
......
federation/client/clientset_generated/federation_release_1_3/typed/federation/v1alpha1/generated_expansion.go → federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/generated_expansion.go
View file @ 7fcf8daf
...@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and ...@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package v1alpha1 package v1beta1
type ClusterExpansion interface{} type ClusterExpansion interface{}
federation/cmd/federation-apiserver/app/federation.go
View file @ 7fcf8daf
...@@ -40,7 +40,7 @@ func installFederationAPIs(s *genericoptions.ServerRunOptions, g *genericapiserv ...@@ -40,7 +40,7 @@ func installFederationAPIs(s *genericoptions.ServerRunOptions, g *genericapiserv
apiGroupInfo := genericapiserver.APIGroupInfo{ apiGroupInfo := genericapiserver.APIGroupInfo{
GroupMeta: *federationGroupMeta, GroupMeta: *federationGroupMeta,
VersionedResourcesStorageMap: map[string]map[string]rest.Storage{ VersionedResourcesStorageMap: map[string]map[string]rest.Storage{
"v1alpha1": federationResources, "v1beta1": federationResources,
}, },
OptionsExternalVersion: &registered.GroupOrDie(api.GroupName).GroupVersion, OptionsExternalVersion: &registered.GroupOrDie(api.GroupName).GroupVersion,
Scheme: api.Scheme, Scheme: api.Scheme,
......
federation/cmd/federation-apiserver/app/server_test.go
View file @ 7fcf8daf
...@@ -28,7 +28,7 @@ import ( ...@@ -28,7 +28,7 @@ import (
"time" "time"
"github.com/stretchr/testify/assert" "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/unversioned"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/genericapiserver/options" "k8s.io/kubernetes/pkg/genericapiserver/options"
......
federation/pkg/federation-controller/cluster/cluster_client.go
View file @ 7fcf8daf
...@@ -21,7 +21,7 @@ import ( ...@@ -21,7 +21,7 @@ import (
"strings" "strings"
"github.com/golang/glog" "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/federation/pkg/federation-controller/util"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
...@@ -44,7 +44,7 @@ type ClusterClient struct { ...@@ -44,7 +44,7 @@ type ClusterClient struct {
kubeClient *clientset.Clientset kubeClient *clientset.Clientset
} }
func NewClusterClientSet(c *federation_v1alpha1.Cluster) (*ClusterClient, error) { func NewClusterClientSet(c *federation_v1beta1.Cluster) (*ClusterClient, error) {
clusterConfig, err := util.BuildClusterConfig(c) clusterConfig, err := util.BuildClusterConfig(c)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -64,35 +64,35 @@ func NewClusterClientSet(c *federation_v1alpha1.Cluster) (*ClusterClient, error) ...@@ -64,35 +64,35 @@ func NewClusterClientSet(c *federation_v1alpha1.Cluster) (*ClusterClient, error)
} }
// GetClusterHealthStatus gets the kubernetes cluster health status by requesting "/healthz" // GetClusterHealthStatus gets the kubernetes cluster health status by requesting "/healthz"
func (self *ClusterClient) GetClusterHealthStatus() *federation_v1alpha1.ClusterStatus { func (self *ClusterClient) GetClusterHealthStatus() *federation_v1beta1.ClusterStatus {
clusterStatus := federation_v1alpha1.ClusterStatus{} clusterStatus := federation_v1beta1.ClusterStatus{}
currentTime := unversioned.Now() currentTime := unversioned.Now()
newClusterReadyCondition := federation_v1alpha1.ClusterCondition{ newClusterReadyCondition := federation_v1beta1.ClusterCondition{
Type: federation_v1alpha1.ClusterReady, Type: federation_v1beta1.ClusterReady,
Status: v1.ConditionTrue, Status: v1.ConditionTrue,
Reason: "ClusterReady", Reason: "ClusterReady",
Message: "/healthz responded with ok", Message: "/healthz responded with ok",
LastProbeTime: currentTime, LastProbeTime: currentTime,
LastTransitionTime: currentTime, LastTransitionTime: currentTime,
} }
newClusterNotReadyCondition := federation_v1alpha1.ClusterCondition{ newClusterNotReadyCondition := federation_v1beta1.ClusterCondition{
Type: federation_v1alpha1.ClusterReady, Type: federation_v1beta1.ClusterReady,
Status: v1.ConditionFalse, Status: v1.ConditionFalse,
Reason: "ClusterNotReady", Reason: "ClusterNotReady",
Message: "/healthz responded without ok", Message: "/healthz responded without ok",
LastProbeTime: currentTime, LastProbeTime: currentTime,
LastTransitionTime: currentTime, LastTransitionTime: currentTime,
} }
newNodeOfflineCondition := federation_v1alpha1.ClusterCondition{ newNodeOfflineCondition := federation_v1beta1.ClusterCondition{
Type: federation_v1alpha1.ClusterOffline, Type: federation_v1beta1.ClusterOffline,
Status: v1.ConditionTrue, Status: v1.ConditionTrue,
Reason: "ClusterNotReachable", Reason: "ClusterNotReachable",
Message: "cluster is not reachable", Message: "cluster is not reachable",
LastProbeTime: currentTime, LastProbeTime: currentTime,
LastTransitionTime: currentTime, LastTransitionTime: currentTime,
} }
newNodeNotOfflineCondition := federation_v1alpha1.ClusterCondition{ newNodeNotOfflineCondition := federation_v1beta1.ClusterCondition{
Type: federation_v1alpha1.ClusterOffline, Type: federation_v1beta1.ClusterOffline,
Status: v1.ConditionFalse, Status: v1.ConditionFalse,
Reason: "ClusterReachable", Reason: "ClusterReachable",
Message: "cluster is reachable", Message: "cluster is reachable",
......
federation/pkg/federation-controller/cluster/clustercontroller.go
View file @ 7fcf8daf
...@@ -21,7 +21,7 @@ import ( ...@@ -21,7 +21,7 @@ import (
"time" "time"
"github.com/golang/glog" "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" cluster_cache "k8s.io/kubernetes/federation/client/cache"
federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
...@@ -44,7 +44,7 @@ type ClusterController struct { ...@@ -44,7 +44,7 @@ type ClusterController struct {
// clusterMonitorPeriod is the period for updating status of cluster // clusterMonitorPeriod is the period for updating status of cluster
clusterMonitorPeriod time.Duration clusterMonitorPeriod time.Duration
// clusterClusterStatusMap is a mapping of clusterName and cluster status of last sampling // 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 is a mapping of clusterName and restclient
clusterKubeClientMap map[string]ClusterClient clusterKubeClientMap map[string]ClusterClient
...@@ -60,7 +60,7 @@ func NewclusterController(federationClient federationclientset.Interface, cluste ...@@ -60,7 +60,7 @@ func NewclusterController(federationClient federationclientset.Interface, cluste
knownClusterSet: make(sets.String), knownClusterSet: make(sets.String),
federationClient: federationClient, federationClient: federationClient,
clusterMonitorPeriod: clusterMonitorPeriod, clusterMonitorPeriod: clusterMonitorPeriod,
clusterClusterStatusMap: make(map[string]federation_v1alpha1.ClusterStatus), clusterClusterStatusMap: make(map[string]federation_v1beta1.ClusterStatus),
clusterKubeClientMap: make(map[string]ClusterClient), clusterKubeClientMap: make(map[string]ClusterClient),
} }
cc.clusterStore.Store, cc.clusterController = framework.NewInformer( cc.clusterStore.Store, cc.clusterController = framework.NewInformer(
...@@ -72,7 +72,7 @@ func NewclusterController(federationClient federationclientset.Interface, cluste ...@@ -72,7 +72,7 @@ func NewclusterController(federationClient federationclientset.Interface, cluste
return cc.federationClient.Federation().Clusters().Watch(options) return cc.federationClient.Federation().Clusters().Watch(options)
}, },
}, },
&federation_v1alpha1.Cluster{}, &federation_v1beta1.Cluster{},
controller.NoResyncPeriodFunc(), controller.NoResyncPeriodFunc(),
framework.ResourceEventHandlerFuncs{ framework.ResourceEventHandlerFuncs{
DeleteFunc: cc.delFromClusterSet, DeleteFunc: cc.delFromClusterSet,
...@@ -85,7 +85,7 @@ func NewclusterController(federationClient federationclientset.Interface, cluste ...@@ -85,7 +85,7 @@ func NewclusterController(federationClient federationclientset.Interface, cluste
// delFromClusterSet delete a cluster from clusterSet and // delFromClusterSet delete a cluster from clusterSet and
// delete the corresponding restclient from the map clusterKubeClientMap // delete the corresponding restclient from the map clusterKubeClientMap
func (cc *ClusterController) delFromClusterSet(obj interface{}) { func (cc *ClusterController) delFromClusterSet(obj interface{}) {
cluster := obj.(*federation_v1alpha1.Cluster) cluster := obj.(*federation_v1beta1.Cluster)
cc.knownClusterSet.Delete(cluster.Name) cc.knownClusterSet.Delete(cluster.Name)
delete(cc.clusterKubeClientMap, cluster.Name) delete(cc.clusterKubeClientMap, cluster.Name)
} }
...@@ -93,7 +93,7 @@ func (cc *ClusterController) delFromClusterSet(obj interface{}) { ...@@ -93,7 +93,7 @@ func (cc *ClusterController) delFromClusterSet(obj interface{}) {
// addToClusterSet insert the new cluster to clusterSet and create a corresponding // addToClusterSet insert the new cluster to clusterSet and create a corresponding
// restclient to map clusterKubeClientMap // restclient to map clusterKubeClientMap
func (cc *ClusterController) addToClusterSet(obj interface{}) { func (cc *ClusterController) addToClusterSet(obj interface{}) {
cluster := obj.(*federation_v1alpha1.Cluster) cluster := obj.(*federation_v1beta1.Cluster)
cc.knownClusterSet.Insert(cluster.Name) cc.knownClusterSet.Insert(cluster.Name)
// create the restclient of cluster // create the restclient of cluster
restClient, err := NewClusterClientSet(cluster) restClient, err := NewClusterClientSet(cluster)
...@@ -116,7 +116,7 @@ func (cc *ClusterController) Run() { ...@@ -116,7 +116,7 @@ func (cc *ClusterController) Run() {
}, cc.clusterMonitorPeriod, wait.NeverStop) }, 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" // just get the status of cluster, by requesting the restapi "/healthz"
clusterClient, found := cc.clusterKubeClientMap[cluster.Name] clusterClient, found := cc.clusterKubeClientMap[cluster.Name]
if !found { if !found {
......
federation/pkg/federation-controller/cluster/clustercontroller_test.go
View file @ 7fcf8daf
...@@ -23,7 +23,7 @@ import ( ...@@ -23,7 +23,7 @@ import (
"net/http/httptest" "net/http/httptest"
"testing" "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" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3"
controller_util "k8s.io/kubernetes/federation/pkg/federation-controller/util" controller_util "k8s.io/kubernetes/federation/pkg/federation-controller/util"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
...@@ -35,15 +35,15 @@ import ( ...@@ -35,15 +35,15 @@ import (
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
) )
func newCluster(clusterName string, serverUrl string) *federation_v1alpha1.Cluster { func newCluster(clusterName string, serverUrl string) *federation_v1beta1.Cluster {
cluster := federation_v1alpha1.Cluster{ cluster := federation_v1beta1.Cluster{
TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Federation.GroupVersion().String()}, TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Federation.GroupVersion().String()},
ObjectMeta: v1.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
UID: util.NewUUID(), UID: util.NewUUID(),
Name: clusterName, Name: clusterName,
}, },
Spec: federation_v1alpha1.ClusterSpec{ Spec: federation_v1beta1.ClusterSpec{
ServerAddressByClientCIDRs: []federation_v1alpha1.ServerAddressByClientCIDR{ ServerAddressByClientCIDRs: []federation_v1beta1.ServerAddressByClientCIDR{
{ {
ClientCIDR: "0.0.0.0/0", ClientCIDR: "0.0.0.0/0",
ServerAddress: serverUrl, ServerAddress: serverUrl,
...@@ -54,13 +54,13 @@ func newCluster(clusterName string, serverUrl string) *federation_v1alpha1.Clust ...@@ -54,13 +54,13 @@ func newCluster(clusterName string, serverUrl string) *federation_v1alpha1.Clust
return &cluster return &cluster
} }
func newClusterList(cluster *federation_v1alpha1.Cluster) *federation_v1alpha1.ClusterList { func newClusterList(cluster *federation_v1beta1.Cluster) *federation_v1beta1.ClusterList {
clusterList := federation_v1alpha1.ClusterList{ clusterList := federation_v1beta1.ClusterList{
TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Federation.GroupVersion().String()}, TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Federation.GroupVersion().String()},
ListMeta: unversioned.ListMeta{ ListMeta: unversioned.ListMeta{
SelfLink: "foobar", SelfLink: "foobar",
}, },
Items: []federation_v1alpha1.Cluster{}, Items: []federation_v1beta1.Cluster{},
} }
clusterList.Items = append(clusterList.Items, *cluster) clusterList.Items = append(clusterList.Items, *cluster)
return &clusterList return &clusterList
...@@ -68,7 +68,7 @@ func newClusterList(cluster *federation_v1alpha1.Cluster) *federation_v1alpha1.C ...@@ -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" // 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 // 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) { fakeHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
clusterListString, _ := json.Marshal(*clusterList) clusterListString, _ := json.Marshal(*clusterList)
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
...@@ -126,7 +126,7 @@ func TestUpdateClusterStatusOK(t *testing.T) { ...@@ -126,7 +126,7 @@ func TestUpdateClusterStatusOK(t *testing.T) {
// Override KubeconfigGetterForCluster to avoid having to setup service accounts and mount files with secret tokens. // Override KubeconfigGetterForCluster to avoid having to setup service accounts and mount files with secret tokens.
originalGetter := controller_util.KubeconfigGetterForCluster 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 func() (*clientcmdapi.Config, error) {
return &clientcmdapi.Config{}, nil return &clientcmdapi.Config{}, nil
} }
...@@ -141,7 +141,7 @@ func TestUpdateClusterStatusOK(t *testing.T) { ...@@ -141,7 +141,7 @@ func TestUpdateClusterStatusOK(t *testing.T) {
if !found { if !found {
t.Errorf("Failed to Update Cluster Status") t.Errorf("Failed to Update Cluster Status")
} else { } 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") t.Errorf("Failed to Update Cluster Status")
} }
} }
......
federation/pkg/federation-controller/service/cluster_helper.go
View file @ 7fcf8daf
...@@ -19,7 +19,7 @@ package service ...@@ -19,7 +19,7 @@ package service
import ( import (
"sync" "sync"
v1alpha1 "k8s.io/kubernetes/federation/apis/federation/v1alpha1" v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
v1 "k8s.io/kubernetes/pkg/api/v1" v1 "k8s.io/kubernetes/pkg/api/v1"
cache "k8s.io/kubernetes/pkg/client/cache" cache "k8s.io/kubernetes/pkg/client/cache"
...@@ -38,7 +38,7 @@ import ( ...@@ -38,7 +38,7 @@ import (
type clusterCache struct { type clusterCache struct {
clientset *release_1_3.Clientset clientset *release_1_3.Clientset
cluster *v1alpha1.Cluster cluster *v1beta1.Cluster
// A store of services, populated by the serviceController // A store of services, populated by the serviceController
serviceStore cache.StoreToServiceLister serviceStore cache.StoreToServiceLister
// Watches changes to all services // Watches changes to all services
...@@ -58,7 +58,7 @@ type clusterClientCache struct { ...@@ -58,7 +58,7 @@ type clusterClientCache struct {
clientMap map[string]*clusterCache 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] cachedClusterClient, ok := cc.clientMap[clusterName]
// only create when no existing cachedClusterClient // only create when no existing cachedClusterClient
if ok { if ok {
...@@ -162,7 +162,7 @@ func (cc *clusterClientCache) startClusterLW(cluster *v1alpha1.Cluster, clusterN ...@@ -162,7 +162,7 @@ func (cc *clusterClientCache) startClusterLW(cluster *v1alpha1.Cluster, clusterN
// delFromClusterSet delete a cluster from clusterSet and // delFromClusterSet delete a cluster from clusterSet and
// delete the corresponding restclient from the map clusterKubeClientMap // delete the corresponding restclient from the map clusterKubeClientMap
func (cc *clusterClientCache) delFromClusterSet(obj interface{}) { func (cc *clusterClientCache) delFromClusterSet(obj interface{}) {
cluster, ok := obj.(*v1alpha1.Cluster) cluster, ok := obj.(*v1beta1.Cluster)
cc.rwlock.Lock() cc.rwlock.Lock()
defer cc.rwlock.Unlock() defer cc.rwlock.Unlock()
if ok { if ok {
...@@ -181,10 +181,10 @@ func (cc *clusterClientCache) delFromClusterSet(obj interface{}) { ...@@ -181,10 +181,10 @@ func (cc *clusterClientCache) delFromClusterSet(obj interface{}) {
// addToClusterSet inserts the new cluster to clusterSet and creates a corresponding // addToClusterSet inserts the new cluster to clusterSet and creates a corresponding
// restclient to map clusterKubeClientMap // restclient to map clusterKubeClientMap
func (cc *clusterClientCache) addToClientMap(obj interface{}) { func (cc *clusterClientCache) addToClientMap(obj interface{}) {
cluster := obj.(*v1alpha1.Cluster) cluster := obj.(*v1beta1.Cluster)
cc.rwlock.Lock() cc.rwlock.Lock()
defer cc.rwlock.Unlock() defer cc.rwlock.Unlock()
cluster, ok := obj.(*v1alpha1.Cluster) cluster, ok := obj.(*v1beta1.Cluster)
if !ok { if !ok {
return return
} }
...@@ -196,7 +196,7 @@ func (cc *clusterClientCache) addToClientMap(obj interface{}) { ...@@ -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) clusterConfig, err := util.BuildClusterConfig(c)
if clusterConfig != nil { if clusterConfig != nil {
clientset := release_1_3.NewForConfigOrDie(restclient.AddUserAgent(clusterConfig, UserAgentName)) clientset := release_1_3.NewForConfigOrDie(restclient.AddUserAgent(clusterConfig, UserAgentName))
......
federation/pkg/federation-controller/service/endpoint_helper_test.go
View file @ 7fcf8daf
...@@ -19,7 +19,7 @@ package service ...@@ -19,7 +19,7 @@ package service
import ( import (
"testing" "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/federation/pkg/dnsprovider/providers/google/clouddns" // Only for unit testing purposes.
v1 "k8s.io/kubernetes/pkg/api/v1" v1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
...@@ -58,8 +58,8 @@ func TestProcessEndpointUpdate(t *testing.T) { ...@@ -58,8 +58,8 @@ func TestProcessEndpointUpdate(t *testing.T) {
cc := clusterClientCache{ cc := clusterClientCache{
clientMap: map[string]*clusterCache{ clientMap: map[string]*clusterCache{
clusterName: { clusterName: {
cluster: &v1alpha1.Cluster{ cluster: &v1beta1.Cluster{
Status: v1alpha1.ClusterStatus{ Status: v1beta1.ClusterStatus{
Zones: []string{"foozone"}, Zones: []string{"foozone"},
Region: "fooregion", Region: "fooregion",
}, },
...@@ -111,8 +111,8 @@ func TestProcessEndpointDeletion(t *testing.T) { ...@@ -111,8 +111,8 @@ func TestProcessEndpointDeletion(t *testing.T) {
cc := clusterClientCache{ cc := clusterClientCache{
clientMap: map[string]*clusterCache{ clientMap: map[string]*clusterCache{
clusterName: { clusterName: {
cluster: &v1alpha1.Cluster{ cluster: &v1beta1.Cluster{
Status: v1alpha1.ClusterStatus{ Status: v1beta1.ClusterStatus{
Zones: []string{"foozone"}, Zones: []string{"foozone"},
Region: "fooregion", Region: "fooregion",
}, },
......
federation/pkg/federation-controller/service/servicecontroller.go
View file @ 7fcf8daf
...@@ -24,7 +24,7 @@ import ( ...@@ -24,7 +24,7 @@ import (
"reflect" "reflect"
"github.com/golang/glog" "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" federationcache "k8s.io/kubernetes/federation/client/cache"
federation_release_1_3 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3" federation_release_1_3 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3"
"k8s.io/kubernetes/federation/pkg/dnsprovider" "k8s.io/kubernetes/federation/pkg/dnsprovider"
...@@ -176,17 +176,17 @@ func New(federationClient federation_release_1_3.Interface, dns dnsprovider.Inte ...@@ -176,17 +176,17 @@ func New(federationClient federation_release_1_3.Interface, dns dnsprovider.Inte
return s.federationClient.Federation().Clusters().Watch(options) return s.federationClient.Federation().Clusters().Watch(options)
}, },
}, },
&v1alpha1.Cluster{}, &v1beta1.Cluster{},
clusterSyncPeriod, clusterSyncPeriod,
framework.ResourceEventHandlerFuncs{ framework.ResourceEventHandlerFuncs{
DeleteFunc: s.clusterCache.delFromClusterSet, DeleteFunc: s.clusterCache.delFromClusterSet,
AddFunc: s.clusterCache.addToClientMap, AddFunc: s.clusterCache.addToClientMap,
UpdateFunc: func(old, cur interface{}) { UpdateFunc: func(old, cur interface{}) {
oldCluster, ok := old.(*v1alpha1.Cluster) oldCluster, ok := old.(*v1beta1.Cluster)
if !ok { if !ok {
return return
} }
curCluster, ok := cur.(*v1alpha1.Cluster) curCluster, ok := cur.(*v1beta1.Cluster)
if !ok { if !ok {
return return
} }
...@@ -608,7 +608,7 @@ func portEqualExcludeNodePort(x, y *v1.ServicePort) bool { ...@@ -608,7 +608,7 @@ func portEqualExcludeNodePort(x, y *v1.ServicePort) bool {
return true return true
} }
func clustersFromList(list *v1alpha1.ClusterList) []string { func clustersFromList(list *v1beta1.ClusterList) []string {
result := []string{} result := []string{}
for ix := range list.Items { for ix := range list.Items {
result = append(result, list.Items[ix].Name) result = append(result, list.Items[ix].Name)
...@@ -619,7 +619,7 @@ func clustersFromList(list *v1alpha1.ClusterList) []string { ...@@ -619,7 +619,7 @@ func clustersFromList(list *v1alpha1.ClusterList) []string {
// getClusterConditionPredicate filter all clusters meet condition of // getClusterConditionPredicate filter all clusters meet condition of
// condition.type=Ready and condition.status=true // condition.type=Ready and condition.status=true
func getClusterConditionPredicate() federationcache.ClusterConditionPredicate { 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 we have no info, don't accept
if len(cluster.Status.Conditions) == 0 { if len(cluster.Status.Conditions) == 0 {
return false return false
...@@ -627,7 +627,7 @@ func getClusterConditionPredicate() federationcache.ClusterConditionPredicate { ...@@ -627,7 +627,7 @@ func getClusterConditionPredicate() federationcache.ClusterConditionPredicate {
for _, cond := range cluster.Status.Conditions { for _, cond := range cluster.Status.Conditions {
//We consider the cluster for load balancing only when its ClusterReady condition status //We consider the cluster for load balancing only when its ClusterReady condition status
//is ConditionTrue //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) glog.V(4).Infof("Ignoring cluser %v with %v condition status %v", cluster.Name, cond.Type, cond.Status)
return false return false
} }
......
federation/pkg/federation-controller/service/servicecontroller_test.go
View file @ 7fcf8daf
...@@ -20,7 +20,7 @@ import ( ...@@ -20,7 +20,7 @@ import (
"sync" "sync"
"testing" "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/federation/pkg/dnsprovider/providers/google/clouddns" // Only for unit testing purposes.
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
...@@ -39,22 +39,22 @@ func TestGetClusterConditionPredicate(t *testing.T) { ...@@ -39,22 +39,22 @@ func TestGetClusterConditionPredicate(t *testing.T) {
} }
tests := []struct { tests := []struct {
cluster v1alpha1.Cluster cluster v1beta1.Cluster
expectAccept bool expectAccept bool
name string name string
serviceController *ServiceController serviceController *ServiceController
}{ }{
{ {
cluster: v1alpha1.Cluster{}, cluster: v1beta1.Cluster{},
expectAccept: false, expectAccept: false,
name: "empty", name: "empty",
serviceController: &serviceController, serviceController: &serviceController,
}, },
{ {
cluster: v1alpha1.Cluster{ cluster: v1beta1.Cluster{
Status: v1alpha1.ClusterStatus{ Status: v1beta1.ClusterStatus{
Conditions: []v1alpha1.ClusterCondition{ Conditions: []v1beta1.ClusterCondition{
{Type: v1alpha1.ClusterReady, Status: v1.ConditionTrue}, {Type: v1beta1.ClusterReady, Status: v1.ConditionTrue},
}, },
}, },
}, },
...@@ -63,10 +63,10 @@ func TestGetClusterConditionPredicate(t *testing.T) { ...@@ -63,10 +63,10 @@ func TestGetClusterConditionPredicate(t *testing.T) {
serviceController: &serviceController, serviceController: &serviceController,
}, },
{ {
cluster: v1alpha1.Cluster{ cluster: v1beta1.Cluster{
Status: v1alpha1.ClusterStatus{ Status: v1beta1.ClusterStatus{
Conditions: []v1alpha1.ClusterCondition{ Conditions: []v1beta1.ClusterCondition{
{Type: v1alpha1.ClusterReady, Status: v1.ConditionFalse}, {Type: v1beta1.ClusterReady, Status: v1.ConditionFalse},
}, },
}, },
}, },
......
federation/pkg/federation-controller/util/cluster_util.go
View file @ 7fcf8daf
...@@ -23,7 +23,7 @@ import ( ...@@ -23,7 +23,7 @@ import (
"time" "time"
"github.com/golang/glog" "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/api"
"k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
...@@ -40,7 +40,7 @@ const ( ...@@ -40,7 +40,7 @@ const (
getSecretTimeout = 1 * time.Minute 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 serverAddress string
var clusterConfig *restclient.Config var clusterConfig *restclient.Config
hostIP, err := utilnet.ChooseHostInterface() hostIP, err := utilnet.ChooseHostInterface()
...@@ -78,7 +78,7 @@ func BuildClusterConfig(c *federation_v1alpha1.Cluster) (*restclient.Config, err ...@@ -78,7 +78,7 @@ func BuildClusterConfig(c *federation_v1alpha1.Cluster) (*restclient.Config, err
// This is to inject a different kubeconfigGetter in tests. // 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. // 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) { return func() (*clientcmdapi.Config, error) {
secretRefName := "" secretRefName := ""
if c.Spec.SecretRef != nil { if c.Spec.SecretRef != nil {
......
hack/test-go.sh
View file @ 7fcf8daf
...@@ -60,7 +60,7 @@ KUBE_GOVERALLS_BIN=${KUBE_GOVERALLS_BIN:-} ...@@ -60,7 +60,7 @@ KUBE_GOVERALLS_BIN=${KUBE_GOVERALLS_BIN:-}
# "v1,compute/v1alpha1,experimental/v1alpha2;v1,compute/v2,experimental/v1alpha3" # "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) # FIXME: due to current implementation of a test client (see: pkg/api/testapi/testapi.go)
# ONLY the last version is tested in each group. # 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 # once we have multiple group supports
# Create a junit-style XML test report in this directory if set. # Create a junit-style XML test report in this directory if set.
KUBE_JUNIT_REPORT_DIR=${KUBE_JUNIT_REPORT_DIR:-} KUBE_JUNIT_REPORT_DIR=${KUBE_JUNIT_REPORT_DIR:-}
......
hack/update-codegen.sh
View file @ 7fcf8daf
...@@ -46,7 +46,7 @@ ${clientgen} -t "$@" ...@@ -46,7 +46,7 @@ ${clientgen} -t "$@"
${clientgen} --clientset-name="release_1_3" --input="api/v1,extensions/v1beta1,autoscaling/v1,batch/v1" ${clientgen} --clientset-name="release_1_3" --input="api/v1,extensions/v1beta1,autoscaling/v1,batch/v1"
# Clientgen for federation clientset. # 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_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} "$@" ${conversiongen} "$@"
${deepcopygen} "$@" ${deepcopygen} "$@"
${setgen} "$@" ${setgen} "$@"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment