github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove duplicated import and wrong alias name of api package

Browse Source
This commit is contained in:
supereagle
2017-07-15 13:25:54 +08:00
parent d368afd845
commit adc0eef43e
57 changed files with 166 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
federation/pkg/federation-controller/ingress/ingress_controller.go
View File

@@ -23,7 +23,6 @@ import (
"time"
"k8s.io/api/core/v1"
clientv1 "k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -124,7 +123,7 @@ func NewIngressController(client federationclientset.Interface) *IngressControll
glog.V(4).Infof("->NewIngressController V(4)")
broadcaster := record.NewBroadcaster()
broadcaster.StartRecordingToSink(eventsink.NewFederatedEventSink(client))
recorder := broadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: UserAgentName})
recorder := broadcaster.NewRecorder(api.Scheme, v1.EventSource{Component: UserAgentName})
ic := &IngressController{
federatedApiClient: client,
ingressReviewDelay: time.Second * 10,

3
federation/pkg/federation-controller/service/servicecontroller.go
View File

@@ -25,7 +25,6 @@ import (
"github.com/golang/glog"
"k8s.io/api/core/v1"
clientv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
@@ -102,7 +101,7 @@ type ServiceController struct {
func New(federationClient fedclientset.Interface) *ServiceController {
broadcaster := record.NewBroadcaster()
broadcaster.StartRecordingToSink(eventsink.NewFederatedEventSink(federationClient))
recorder := broadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: UserAgentName})
recorder := broadcaster.NewRecorder(api.Scheme, v1.EventSource{Component: UserAgentName})
s := &ServiceController{
federationClient: federationClient,

4
federation/pkg/federation-controller/sync/controller.go
View File

@@ -20,7 +20,7 @@ import (
"fmt"
"time"
clientv1 "k8s.io/api/core/v1"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgruntime "k8s.io/apimachinery/pkg/runtime"
@@ -109,7 +109,7 @@ func StartFederationSyncController(kind string, adapterFactory federatedtypes.Ad
func newFederationSyncController(client federationclientset.Interface, adapter federatedtypes.FederatedTypeAdapter) *FederationSyncController {
broadcaster := record.NewBroadcaster()
broadcaster.StartRecordingToSink(eventsink.NewFederatedEventSink(client))
recorder := broadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: fmt.Sprintf("federation-%v-controller", adapter.Kind())})
recorder := broadcaster.NewRecorder(api.Scheme, v1.EventSource{Component: fmt.Sprintf("federation-%v-controller", adapter.Kind())})
s := &FederationSyncController{
reviewDelay: time.Second * 10,

25
federation/pkg/federation-controller/util/eventsink/eventsink.go
View File

@@ -19,8 +19,7 @@ package eventsink
import (
"reflect"
clientv1 "k8s.io/api/core/v1"
kubev1 "k8s.io/api/core/v1"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/conversion"
"k8s.io/apimachinery/pkg/runtime"
@@ -51,8 +50,8 @@ var scheme = runtime.NewScheme()
func init() {
// register client-go's and kube's Event type under two different GroupVersions
// TODO: switch to client-go client for events
scheme.AddKnownTypes(clientv1.SchemeGroupVersion, &clientv1.Event{})
scheme.AddKnownTypes(schema.GroupVersion{Group: "fake-kube-" + kubev1.SchemeGroupVersion.Group, Version: kubev1.SchemeGroupVersion.Version}, &kubev1.Event{})
scheme.AddKnownTypes(v1.SchemeGroupVersion, &v1.Event{})
scheme.AddKnownTypes(schema.GroupVersion{Group: "fake-kube-" + v1.SchemeGroupVersion.Group, Version: v1.SchemeGroupVersion.Version}, &v1.Event{})
if err := scheme.AddConversionFuncs(
metav1.Convert_unversioned_Time_To_unversioned_Time,
@@ -72,8 +71,8 @@ func init() {
}
}
func (fes *FederatedEventSink) Create(event *clientv1.Event) (*clientv1.Event, error) {
kubeEvent := &kubev1.Event{}
func (fes *FederatedEventSink) Create(event *v1.Event) (*v1.Event, error) {
kubeEvent := &v1.Event{}
if err := scheme.Convert(event, kubeEvent, nil); err != nil {
return nil, err
}
@@ -83,15 +82,15 @@ func (fes *FederatedEventSink) Create(event *clientv1.Event) (*clientv1.Event, e
return nil, err
}
retEvent := &clientv1.Event{}
retEvent := &v1.Event{}
if err := scheme.Convert(ret, retEvent, nil); err != nil {
return nil, err
}
return retEvent, nil
}
func (fes *FederatedEventSink) Update(event *clientv1.Event) (*clientv1.Event, error) {
kubeEvent := &kubev1.Event{}
func (fes *FederatedEventSink) Update(event *v1.Event) (*v1.Event, error) {
kubeEvent := &v1.Event{}
if err := scheme.Convert(event, kubeEvent, nil); err != nil {
return nil, err
}
@@ -101,15 +100,15 @@ func (fes *FederatedEventSink) Update(event *clientv1.Event) (*clientv1.Event, e
return nil, err
}
retEvent := &clientv1.Event{}
retEvent := &v1.Event{}
if err := scheme.Convert(ret, retEvent, nil); err != nil {
return nil, err
}
return retEvent, nil
}
func (fes *FederatedEventSink) Patch(event *clientv1.Event, data []byte) (*clientv1.Event, error) {
kubeEvent := &kubev1.Event{}
func (fes *FederatedEventSink) Patch(event *v1.Event, data []byte) (*v1.Event, error) {
kubeEvent := &v1.Event{}
if err := scheme.Convert(event, kubeEvent, nil); err != nil {
return nil, err
}
@@ -119,7 +118,7 @@ func (fes *FederatedEventSink) Patch(event *clientv1.Event, data []byte) (*clien
return nil, err
}
retEvent := &clientv1.Event{}
retEvent := &v1.Event{}
if err := scheme.Convert(ret, retEvent, nil); err != nil {
return nil, err
}

9
federation/pkg/federation-controller/util/eventsink/eventsink_test.go
View File

@@ -19,8 +19,7 @@ package eventsink
import (
"testing"
clientv1 "k8s.io/api/core/v1"
kubev1 "k8s.io/api/core/v1"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
core "k8s.io/client-go/testing"
@@ -47,7 +46,7 @@ func TestEventSink(t *testing.T) {
return true, obj, nil
})
event := clientv1.Event{
event := v1.Event{
ObjectMeta: metav1.ObjectMeta{
Name: "bzium",
Namespace: "ns",
@@ -56,7 +55,7 @@ func TestEventSink(t *testing.T) {
sink := NewFederatedEventSink(fakeFederationClient)
eventUpdated, err := sink.Create(&event)
assert.NoError(t, err)
eventV1 := GetObjectFromChan(createdChan).(*kubev1.Event)
eventV1 := GetObjectFromChan(createdChan).(*v1.Event)
assert.NotNil(t, eventV1)
// Just some simple sanity checks.
assert.Equal(t, event.Name, eventV1.Name)
@@ -64,7 +63,7 @@ func TestEventSink(t *testing.T) {
eventUpdated, err = sink.Update(&event)
assert.NoError(t, err)
eventV1 = GetObjectFromChan(updateChan).(*kubev1.Event)
eventV1 = GetObjectFromChan(updateChan).(*v1.Event)
assert.NotNil(t, eventV1)
// Just some simple sanity checks.
assert.Equal(t, event.Name, eventV1.Name)