From d71e8ab7c9d0c6b8a9a8fb538b32da9fc4fc4795 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 25 Feb 2020 15:14:04 +0100 Subject: [PATCH] Fix secret informer load --- pkg/provider/kubernetes/crd/client.go | 10 +--------- pkg/provider/kubernetes/ingress/client.go | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/pkg/provider/kubernetes/crd/client.go b/pkg/provider/kubernetes/crd/client.go index 384b8e7d7..606930578 100644 --- a/pkg/provider/kubernetes/crd/client.go +++ b/pkg/provider/kubernetes/crd/client.go @@ -168,6 +168,7 @@ func (c *clientWrapper) WatchAll(namespaces []string, stopCh <-chan struct{}) (< factoryKube.Extensions().V1beta1().Ingresses().Informer().AddEventHandler(eventHandler) factoryKube.Core().V1().Services().Informer().AddEventHandler(eventHandler) factoryKube.Core().V1().Endpoints().Informer().AddEventHandler(eventHandler) + factoryKube.Core().V1().Secrets().Informer().AddEventHandler(eventHandler) c.factoriesCrd[ns] = factoryCrd c.factoriesKube[ns] = factoryKube @@ -192,15 +193,6 @@ func (c *clientWrapper) WatchAll(namespaces []string, stopCh <-chan struct{}) (< } } - // Do not wait for the Secrets store to get synced since we cannot rely on - // users having granted RBAC permissions for this object. - // https://github.com/containous/traefik/issues/1784 should improve the - // situation here in the future. - for _, ns := range namespaces { - c.factoriesKube[ns].Core().V1().Secrets().Informer().AddEventHandler(eventHandler) - c.factoriesKube[ns].Start(stopCh) - } - return eventCh, nil } diff --git a/pkg/provider/kubernetes/ingress/client.go b/pkg/provider/kubernetes/ingress/client.go index 18725c964..630d33e78 100644 --- a/pkg/provider/kubernetes/ingress/client.go +++ b/pkg/provider/kubernetes/ingress/client.go @@ -137,6 +137,7 @@ func (c *clientWrapper) WatchAll(namespaces []string, stopCh <-chan struct{}) (< factory.Extensions().V1beta1().Ingresses().Informer().AddEventHandler(eventHandler) factory.Core().V1().Services().Informer().AddEventHandler(eventHandler) factory.Core().V1().Endpoints().Informer().AddEventHandler(eventHandler) + factory.Core().V1().Secrets().Informer().AddEventHandler(eventHandler) c.factories[ns] = factory } @@ -152,15 +153,6 @@ func (c *clientWrapper) WatchAll(namespaces []string, stopCh <-chan struct{}) (< } } - // Do not wait for the Secrets store to get synced since we cannot rely on - // users having granted RBAC permissions for this object. - // https://github.com/containous/traefik/issues/1784 should improve the - // situation here in the future. - for _, ns := range namespaces { - c.factories[ns].Core().V1().Secrets().Informer().AddEventHandler(eventHandler) - c.factories[ns].Start(stopCh) - } - return eventCh, nil }