Refactoring of kubernetes informers and local caches
This commit is contained in:
parent
8975800740
commit
e9a00ff916
23 changed files with 1704 additions and 817 deletions
|
|
@ -25,10 +25,8 @@ import (
|
|||
extensions "k8s.io/api/extensions/v1beta1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
testclient "k8s.io/client-go/kubernetes/fake"
|
||||
"k8s.io/client-go/tools/cache"
|
||||
|
||||
"k8s.io/ingress-nginx/internal/ingress/annotations/class"
|
||||
"k8s.io/ingress-nginx/internal/ingress/store"
|
||||
"k8s.io/ingress-nginx/internal/k8s"
|
||||
"k8s.io/ingress-nginx/internal/task"
|
||||
)
|
||||
|
|
@ -212,14 +210,18 @@ func buildExtensionsIngresses() []extensions.Ingress {
|
|||
}
|
||||
}
|
||||
|
||||
func buildIngressListener() store.IngressLister {
|
||||
s := cache.NewStore(cache.MetaNamespaceKeyFunc)
|
||||
s.Add(&extensions.Ingress{
|
||||
type testIngressLister struct {
|
||||
}
|
||||
|
||||
func (til *testIngressLister) ListIngresses() []*extensions.Ingress {
|
||||
var ingresses []*extensions.Ingress
|
||||
ingresses = append(ingresses, &extensions.Ingress{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: "foo_ingress_non_01",
|
||||
Namespace: apiv1.NamespaceDefault,
|
||||
}})
|
||||
s.Add(&extensions.Ingress{
|
||||
|
||||
ingresses = append(ingresses, &extensions.Ingress{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: "foo_ingress_1",
|
||||
Namespace: apiv1.NamespaceDefault,
|
||||
|
|
@ -231,7 +233,11 @@ func buildIngressListener() store.IngressLister {
|
|||
},
|
||||
})
|
||||
|
||||
return store.IngressLister{Store: s}
|
||||
return ingresses
|
||||
}
|
||||
|
||||
func buildIngressLister() ingressLister {
|
||||
return &testIngressLister{}
|
||||
}
|
||||
|
||||
func buildStatusSync() statusSync {
|
||||
|
|
@ -247,7 +253,7 @@ func buildStatusSync() statusSync {
|
|||
Config: Config{
|
||||
Client: buildSimpleClientSet(),
|
||||
PublishService: apiv1.NamespaceDefault + "/" + "foo",
|
||||
IngressLister: buildIngressListener(),
|
||||
IngressLister: buildIngressLister(),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
|
@ -259,7 +265,7 @@ func TestStatusActions(t *testing.T) {
|
|||
c := Config{
|
||||
Client: buildSimpleClientSet(),
|
||||
PublishService: "",
|
||||
IngressLister: buildIngressListener(),
|
||||
IngressLister: buildIngressLister(),
|
||||
DefaultIngressClass: "nginx",
|
||||
IngressClass: "",
|
||||
UpdateStatusOnShutdown: true,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue