Skip to content

K
k3s
Commit be13db1b authored by zhengjiajin's avatar zhengjiajin
Browse files
Options

Switch sample apiserver internalversion informer to external

parent a17742b5
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 30 deletions
staging/src/k8s.io/sample-apiserver/BUILD
View file @ be13db1b
...@@ -39,11 +39,8 @@ filegroup( ...@@ -39,11 +39,8 @@ filegroup(
"//staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer:all-srcs", "//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/apis/wardle:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/apiserver: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/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/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/v1alpha1:all-srcs",
"//staging/src/k8s.io/sample-apiserver/pkg/client/listers/wardle/v1beta1: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", "//staging/src/k8s.io/sample-apiserver/pkg/cmd/server:all-srcs",
......
staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/BUILD
View file @ be13db1b
...@@ -18,8 +18,8 @@ go_library( ...@@ -18,8 +18,8 @@ go_library(
"//staging/src/k8s.io/apiserver/pkg/admission:go_default_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/admission/wardleinitializer:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle: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/informers/externalversions: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/listers/wardle/v1alpha1:go_default_library",
], ],
) )
...@@ -34,9 +34,9 @@ go_test( ...@@ -34,9 +34,9 @@ go_test(
"//staging/src/k8s.io/apiserver/pkg/admission:go_default_library", "//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
"//staging/src/k8s.io/client-go/testing: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/admission/wardleinitializer:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle: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/internalversion/fake: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/internalversion:go_default_library", "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library",
], ],
) )
......
staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/admission.go
View file @ be13db1b
...@@ -26,8 +26,8 @@ import ( ...@@ -26,8 +26,8 @@ import (
"k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission"
"k8s.io/sample-apiserver/pkg/admission/wardleinitializer" "k8s.io/sample-apiserver/pkg/admission/wardleinitializer"
"k8s.io/sample-apiserver/pkg/apis/wardle" "k8s.io/sample-apiserver/pkg/apis/wardle"
informers "k8s.io/sample-apiserver/pkg/client/informers/internalversion" informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions"
listers "k8s.io/sample-apiserver/pkg/client/listers/wardle/internalversion" listers "k8s.io/sample-apiserver/pkg/client/listers/wardle/v1alpha1"
) )
// Register registers a plugin // Register registers a plugin
...@@ -85,11 +85,11 @@ func (d *DisallowFlunder) Admit(a admission.Attributes) error { ...@@ -85,11 +85,11 @@ func (d *DisallowFlunder) Admit(a admission.Attributes) error {
// SetInternalWardleInformerFactory gets Lister from SharedInformerFactory. // SetInternalWardleInformerFactory gets Lister from SharedInformerFactory.
// The lister knows how to lists Fischers. // The lister knows how to lists Fischers.
func (d *DisallowFlunder) SetInternalWardleInformerFactory(f informers.SharedInformerFactory) { func (d *DisallowFlunder) SetInternalWardleInformerFactory(f informers.SharedInformerFactory) {
d.lister = f.Wardle().InternalVersion().Fischers().Lister() d.lister = f.Wardle().V1alpha1().Fischers().Lister()
d.SetReadyFunc(f.Wardle().InternalVersion().Fischers().Informer().HasSynced) 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 { func (d *DisallowFlunder) ValidateInitialization() error {
if d.lister == nil { if d.lister == nil {
return fmt.Errorf("missing fischer lister") return fmt.Errorf("missing fischer lister")
......
staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/admission_test.go
View file @ be13db1b
...@@ -27,9 +27,9 @@ import ( ...@@ -27,9 +27,9 @@ import (
clienttesting "k8s.io/client-go/testing" clienttesting "k8s.io/client-go/testing"
"k8s.io/sample-apiserver/pkg/admission/plugin/banflunder" "k8s.io/sample-apiserver/pkg/admission/plugin/banflunder"
"k8s.io/sample-apiserver/pkg/admission/wardleinitializer" "k8s.io/sample-apiserver/pkg/admission/wardleinitializer"
"k8s.io/sample-apiserver/pkg/apis/wardle" wardle "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
"k8s.io/sample-apiserver/pkg/client/clientset/internalversion/fake" "k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake"
informers "k8s.io/sample-apiserver/pkg/client/informers/internalversion" informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions"
) )
// TestBanfluderAdmissionPlugin tests various test cases against // TestBanfluderAdmissionPlugin tests various test cases against
...@@ -56,7 +56,7 @@ func TestBanflunderAdmissionPlugin(t *testing.T) { ...@@ -56,7 +56,7 @@ func TestBanflunderAdmissionPlugin(t *testing.T) {
Namespace: "", Namespace: "",
}, },
}, },
admissionInputKind: wardle.Kind("Flunder").WithVersion("version"), admissionInputKind: wardle.SchemeGroupVersion.WithKind("Flunder").GroupKind().WithVersion("version"),
admissionInputResource: wardle.Resource("flunders").WithVersion("version"), admissionInputResource: wardle.Resource("flunders").WithVersion("version"),
admissionMustFail: true, admissionMustFail: true,
}, },
...@@ -74,7 +74,7 @@ func TestBanflunderAdmissionPlugin(t *testing.T) { ...@@ -74,7 +74,7 @@ func TestBanflunderAdmissionPlugin(t *testing.T) {
Namespace: "", Namespace: "",
}, },
}, },
admissionInputKind: wardle.Kind("Flunder").WithVersion("version"), admissionInputKind: wardle.SchemeGroupVersion.WithKind("Flunder").GroupKind().WithVersion("version"),
admissionInputResource: wardle.Resource("flunders").WithVersion("version"), admissionInputResource: wardle.Resource("flunders").WithVersion("version"),
admissionMustFail: false, admissionMustFail: false,
}, },
...@@ -93,7 +93,7 @@ func TestBanflunderAdmissionPlugin(t *testing.T) { ...@@ -93,7 +93,7 @@ func TestBanflunderAdmissionPlugin(t *testing.T) {
Namespace: "", Namespace: "",
}, },
}, },
admissionInputKind: wardle.Kind("NotFlunder").WithVersion("version"), admissionInputKind: wardle.SchemeGroupVersion.WithKind("NotFlunder").GroupKind().WithVersion("version"),
admissionInputResource: wardle.Resource("notflunders").WithVersion("version"), admissionInputResource: wardle.Resource("notflunders").WithVersion("version"),
admissionMustFail: false, admissionMustFail: false,
}, },
......
staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/BUILD
View file @ be13db1b
...@@ -16,7 +16,7 @@ go_library( ...@@ -16,7 +16,7 @@ go_library(
importpath = "k8s.io/sample-apiserver/pkg/admission/wardleinitializer", importpath = "k8s.io/sample-apiserver/pkg/admission/wardleinitializer",
deps = [ deps = [
"//staging/src/k8s.io/apiserver/pkg/admission:go_default_library", "//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( ...@@ -26,8 +26,8 @@ go_test(
embed = [":go_default_library"], embed = [":go_default_library"],
deps = [ deps = [
"//staging/src/k8s.io/apiserver/pkg/admission:go_default_library", "//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/clientset/versioned/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/informers/externalversions:go_default_library",
], ],
) )
......
staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/interfaces.go
View file @ be13db1b
...@@ -18,7 +18,7 @@ package wardleinitializer ...@@ -18,7 +18,7 @@ package wardleinitializer
import ( import (
"k8s.io/apiserver/pkg/admission" "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 // WantsInternalWardleInformerFactory defines a function which sets InformerFactory for admission plugins that need it
......
staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/wardleinitializer.go
View file @ be13db1b
...@@ -18,7 +18,7 @@ package wardleinitializer ...@@ -18,7 +18,7 @@ package wardleinitializer
import ( import (
"k8s.io/apiserver/pkg/admission" "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 { type pluginInitializer struct {
......
staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/wardleinitializer_test.go
View file @ be13db1b
...@@ -22,8 +22,8 @@ import ( ...@@ -22,8 +22,8 @@ import (
"k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission"
"k8s.io/sample-apiserver/pkg/admission/wardleinitializer" "k8s.io/sample-apiserver/pkg/admission/wardleinitializer"
"k8s.io/sample-apiserver/pkg/client/clientset/internalversion/fake" "k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake"
informers "k8s.io/sample-apiserver/pkg/client/informers/internalversion" informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions"
) )
// TestWantsInternalWardleInformerFactory ensures that the informer factory is injected // TestWantsInternalWardleInformerFactory ensures that the informer factory is injected
......
staging/src/k8s.io/sample-apiserver/pkg/cmd/server/BUILD
View file @ be13db1b
...@@ -19,8 +19,8 @@ go_library( ...@@ -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/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/apis/wardle/v1alpha1:go_default_library",
"//staging/src/k8s.io/sample-apiserver/pkg/apiserver: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/clientset/versioned: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",
"//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library",
], ],
) )
......
staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go
View file @ be13db1b
...@@ -31,8 +31,8 @@ import ( ...@@ -31,8 +31,8 @@ import (
"k8s.io/sample-apiserver/pkg/admission/wardleinitializer" "k8s.io/sample-apiserver/pkg/admission/wardleinitializer"
"k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1" "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
"k8s.io/sample-apiserver/pkg/apiserver" "k8s.io/sample-apiserver/pkg/apiserver"
clientset "k8s.io/sample-apiserver/pkg/client/clientset/internalversion" clientset "k8s.io/sample-apiserver/pkg/client/clientset/versioned"
informers "k8s.io/sample-apiserver/pkg/client/informers/internalversion" informers "k8s.io/sample-apiserver/pkg/client/informers/externalversions"
) )
const defaultEtcdPathPrefix = "/registry/wardle.kubernetes.io" const defaultEtcdPathPrefix = "/registry/wardle.kubernetes.io"
......
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