github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Switch sample apiserver internalversion informer to external

pull/564/head
zhengjiajin 2018-12-07 11:46:03 +08:00
parent a17742b53a
commit be13db1b85
10 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/sample-apiserver/BUILD
View File

@ -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",

10
staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/BUILD
View File

@ -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",
],
)

10
staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/admission.go
View File

@ -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")

12
staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/admission_test.go
View File

@ -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,
},

6
staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/BUILD
View File

@ -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",
],
)

2
staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/interfaces.go
View File

@ -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

2
staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/wardleinitializer.go
View File

@ -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 {

4
staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/wardleinitializer_test.go
View File

@ -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

4
staging/src/k8s.io/sample-apiserver/pkg/cmd/server/BUILD
View File

@ -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",
],
)

4
staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go
View File

@ -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"