From be13db1b85331d9876dfeab9d8351a5c40d29c7a Mon Sep 17 00:00:00 2001 From: zhengjiajin Date: Fri, 7 Dec 2018 11:46:03 +0800 Subject: [PATCH] Switch sample apiserver internalversion informer to external --- staging/src/k8s.io/sample-apiserver/BUILD | 3 --- .../pkg/admission/plugin/banflunder/BUILD | 10 +++++----- .../pkg/admission/plugin/banflunder/admission.go | 10 +++++----- .../admission/plugin/banflunder/admission_test.go | 12 ++++++------ .../pkg/admission/wardleinitializer/BUILD | 6 +++--- .../pkg/admission/wardleinitializer/interfaces.go | 2 +- .../admission/wardleinitializer/wardleinitializer.go | 2 +- .../wardleinitializer/wardleinitializer_test.go | 4 ++-- .../src/k8s.io/sample-apiserver/pkg/cmd/server/BUILD | 4 ++-- .../k8s.io/sample-apiserver/pkg/cmd/server/start.go | 4 ++-- 10 files changed, 27 insertions(+), 30 deletions(-) diff --git a/staging/src/k8s.io/sample-apiserver/BUILD b/staging/src/k8s.io/sample-apiserver/BUILD index c2dcbc9644..cf5033eb6c 100644 --- a/staging/src/k8s.io/sample-apiserver/BUILD +++ b/staging/src/k8s.io/sample-apiserver/BUILD @@ -39,11 +39,8 @@ filegroup( "//staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer:all-srcs", "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle:all-srcs", "//staging/src/k8s.io/sample-apiserver/pkg/apiserver:all-srcs", - "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion:all-srcs", "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned:all-srcs", "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:all-srcs", - "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/internalversion:all-srcs", - "//staging/src/k8s.io/sample-apiserver/pkg/client/listers/wardle/internalversion:all-srcs", "//staging/src/k8s.io/sample-apiserver/pkg/client/listers/wardle/v1alpha1:all-srcs", "//staging/src/k8s.io/sample-apiserver/pkg/client/listers/wardle/v1beta1:all-srcs", "//staging/src/k8s.io/sample-apiserver/pkg/cmd/server:all-srcs", diff --git a/staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/BUILD b/staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/BUILD index 56a4f47e47..6a4c5dfea8 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/BUILD +++ b/staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/BUILD @@ -18,8 +18,8 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/admission:go_default_library", "//staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer:go_default_library", "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle:go_default_library", - "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/internalversion:go_default_library", - "//staging/src/k8s.io/sample-apiserver/pkg/client/listers/wardle/internalversion:go_default_library", + "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library", + "//staging/src/k8s.io/sample-apiserver/pkg/client/listers/wardle/v1alpha1:go_default_library", ], ) @@ -34,9 +34,9 @@ go_test( "//staging/src/k8s.io/apiserver/pkg/admission:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library", "//staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer:go_default_library", - "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle:go_default_library", - "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/fake:go_default_library", - "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/internalversion:go_default_library", + "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1:go_default_library", + "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake:go_default_library", + "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library", ], ) diff --git a/staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/admission.go b/staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/admission.go index 4acfe6448b..70d618614a 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/admission.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/admission.go @@ -26,8 +26,8 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/sample-apiserver/pkg/admission/wardleinitializer" "k8s.io/sample-apiserver/pkg/apis/wardle" - informers "k8s.io/sample-apiserver/pkg/client/informers/internalversion" - listers "k8s.io/sample-apiserver/pkg/client/listers/wardle/internalversion" + informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions" + listers "k8s.io/sample-apiserver/pkg/client/listers/wardle/v1alpha1" ) // Register registers a plugin @@ -85,11 +85,11 @@ func (d *DisallowFlunder) Admit(a admission.Attributes) error { // SetInternalWardleInformerFactory gets Lister from SharedInformerFactory. // The lister knows how to lists Fischers. func (d *DisallowFlunder) SetInternalWardleInformerFactory(f informers.SharedInformerFactory) { - d.lister = f.Wardle().InternalVersion().Fischers().Lister() - d.SetReadyFunc(f.Wardle().InternalVersion().Fischers().Informer().HasSynced) + d.lister = f.Wardle().V1alpha1().Fischers().Lister() + d.SetReadyFunc(f.Wardle().V1alpha1().Fischers().Informer().HasSynced) } -// ValidaValidateInitializationte checks whether the plugin was correctly initialized. +// ValidateInitialization checks whether the plugin was correctly initialized. func (d *DisallowFlunder) ValidateInitialization() error { if d.lister == nil { return fmt.Errorf("missing fischer lister") diff --git a/staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/admission_test.go b/staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/admission_test.go index 9023d82c28..b60ae0dbae 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/admission_test.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/admission_test.go @@ -27,9 +27,9 @@ import ( clienttesting "k8s.io/client-go/testing" "k8s.io/sample-apiserver/pkg/admission/plugin/banflunder" "k8s.io/sample-apiserver/pkg/admission/wardleinitializer" - "k8s.io/sample-apiserver/pkg/apis/wardle" - "k8s.io/sample-apiserver/pkg/client/clientset/internalversion/fake" - informers "k8s.io/sample-apiserver/pkg/client/informers/internalversion" + wardle "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1" + "k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake" + informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions" ) // TestBanfluderAdmissionPlugin tests various test cases against @@ -56,7 +56,7 @@ func TestBanflunderAdmissionPlugin(t *testing.T) { Namespace: "", }, }, - admissionInputKind: wardle.Kind("Flunder").WithVersion("version"), + admissionInputKind: wardle.SchemeGroupVersion.WithKind("Flunder").GroupKind().WithVersion("version"), admissionInputResource: wardle.Resource("flunders").WithVersion("version"), admissionMustFail: true, }, @@ -74,7 +74,7 @@ func TestBanflunderAdmissionPlugin(t *testing.T) { Namespace: "", }, }, - admissionInputKind: wardle.Kind("Flunder").WithVersion("version"), + admissionInputKind: wardle.SchemeGroupVersion.WithKind("Flunder").GroupKind().WithVersion("version"), admissionInputResource: wardle.Resource("flunders").WithVersion("version"), admissionMustFail: false, }, @@ -93,7 +93,7 @@ func TestBanflunderAdmissionPlugin(t *testing.T) { Namespace: "", }, }, - admissionInputKind: wardle.Kind("NotFlunder").WithVersion("version"), + admissionInputKind: wardle.SchemeGroupVersion.WithKind("NotFlunder").GroupKind().WithVersion("version"), admissionInputResource: wardle.Resource("notflunders").WithVersion("version"), admissionMustFail: false, }, diff --git a/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/BUILD b/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/BUILD index 11bb979dc6..0d9f62e676 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/BUILD +++ b/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/BUILD @@ -16,7 +16,7 @@ go_library( importpath = "k8s.io/sample-apiserver/pkg/admission/wardleinitializer", deps = [ "//staging/src/k8s.io/apiserver/pkg/admission:go_default_library", - "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/internalversion:go_default_library", + "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library", ], ) @@ -26,8 +26,8 @@ go_test( embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/apiserver/pkg/admission:go_default_library", - "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/fake:go_default_library", - "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/internalversion:go_default_library", + "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake:go_default_library", + "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library", ], ) diff --git a/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/interfaces.go b/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/interfaces.go index f5c6e41579..248cd045d8 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/interfaces.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/interfaces.go @@ -18,7 +18,7 @@ package wardleinitializer import ( "k8s.io/apiserver/pkg/admission" - informers "k8s.io/sample-apiserver/pkg/client/informers/internalversion" + informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions" ) // WantsInternalWardleInformerFactory defines a function which sets InformerFactory for admission plugins that need it diff --git a/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/wardleinitializer.go b/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/wardleinitializer.go index b41e3dfba0..455d51c9ea 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/wardleinitializer.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/wardleinitializer.go @@ -18,7 +18,7 @@ package wardleinitializer import ( "k8s.io/apiserver/pkg/admission" - informers "k8s.io/sample-apiserver/pkg/client/informers/internalversion" + informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions" ) type pluginInitializer struct { diff --git a/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/wardleinitializer_test.go b/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/wardleinitializer_test.go index c64ed3ab3e..ff6fee1a92 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/wardleinitializer_test.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/wardleinitializer_test.go @@ -22,8 +22,8 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/sample-apiserver/pkg/admission/wardleinitializer" - "k8s.io/sample-apiserver/pkg/client/clientset/internalversion/fake" - informers "k8s.io/sample-apiserver/pkg/client/informers/internalversion" + "k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake" + informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions" ) // TestWantsInternalWardleInformerFactory ensures that the informer factory is injected diff --git a/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/BUILD b/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/BUILD index e51546ee85..db6621acce 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/BUILD +++ b/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/BUILD @@ -19,8 +19,8 @@ go_library( "//staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer:go_default_library", "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1:go_default_library", "//staging/src/k8s.io/sample-apiserver/pkg/apiserver:go_default_library", - "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion:go_default_library", - "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/internalversion:go_default_library", + "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned:go_default_library", + "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], ) diff --git a/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go b/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go index c9fa45850f..e492925353 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go @@ -31,8 +31,8 @@ import ( "k8s.io/sample-apiserver/pkg/admission/wardleinitializer" "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1" "k8s.io/sample-apiserver/pkg/apiserver" - clientset "k8s.io/sample-apiserver/pkg/client/clientset/internalversion" - informers "k8s.io/sample-apiserver/pkg/client/informers/internalversion" + clientset "k8s.io/sample-apiserver/pkg/client/clientset/versioned" + informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions" ) const defaultEtcdPathPrefix = "/registry/wardle.kubernetes.io"