[apisix-ingress-controller] branch master updated: fix: ingress.tls secret not found (#1394)

[zhangjintao]

This is an automated email from the ASF dual-hosted git repository.

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
     new 8cf79c2e fix: ingress.tls secret not found (#1394)
8cf79c2e is described below

commit 8cf79c2e8f7278b52bf83f6cab6e85ab73d7266f
Author: 林靖 <56471...@qq.com>
AuthorDate: Mon Dec 12 14:15:12 2022 +0800

    fix: ingress.tls secret not found (#1394)
---
 pkg/providers/ingress/ingress.go  | 16 ++++++++++++++--
 pkg/providers/ingress/provider.go | 12 ++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/pkg/providers/ingress/ingress.go b/pkg/providers/ingress/ingress.go
index 8091c2cb..5dedaef0 100644
--- a/pkg/providers/ingress/ingress.go
+++ b/pkg/providers/ingress/ingress.go
@@ -53,6 +53,10 @@ type ingressController struct {
        ingressLister   kube.IngressLister
        ingressInformer cache.SharedIndexInformer
 
+       secretInformer   cache.SharedIndexInformer
+       endpointInformer cache.SharedIndexInformer
+       serviceInformer  cache.SharedIndexInformer
+
        // secretSSLMap stores reference from K8s secret to Ingress
        // type: Map<SecretKey, Map<IngressVersionKey, SSL in APISIX>>
        // SecretKey -> IngressVersionKey -> []string
@@ -61,7 +65,7 @@ type ingressController struct {
        secretSSLMap *sync.Map
 }
 
-func newIngressController(common *ingressCommon, ingressLister 
kube.IngressLister, ingressInformer cache.SharedIndexInformer) 
*ingressController {
+func newIngressController(common *ingressCommon, ingressLister 
kube.IngressLister, ingressInformer, secretInformer, endpointInformer, 
serviceInformer cache.SharedIndexInformer) *ingressController {
        c := &ingressController{
                ingressCommon: common,
 
@@ -71,6 +75,10 @@ func newIngressController(common *ingressCommon, 
ingressLister kube.IngressListe
                ingressLister:   ingressLister,
                ingressInformer: ingressInformer,
 
+               secretInformer:   secretInformer,
+               endpointInformer: endpointInformer,
+               serviceInformer:  serviceInformer,
+
                secretSSLMap: new(sync.Map),
        }
 
@@ -87,7 +95,11 @@ func (c *ingressController) run(ctx context.Context) {
        defer log.Infof("ingress controller exited")
        defer c.workqueue.ShutDown()
 
-       if !cache.WaitForCacheSync(ctx.Done(), c.ingressInformer.HasSynced) {
+       if !cache.WaitForCacheSync(ctx.Done(),
+               c.ingressInformer.HasSynced,
+               c.secretInformer.HasSynced,
+               c.serviceInformer.HasSynced,
+               c.endpointInformer.HasSynced) {
                log.Errorf("cache sync failed")
                return
        }
diff --git a/pkg/providers/ingress/provider.go 
b/pkg/providers/ingress/provider.go
index 0fefd727..c5e75b56 100644
--- a/pkg/providers/ingress/provider.go
+++ b/pkg/providers/ingress/provider.go
@@ -59,7 +59,10 @@ type ingressProvider struct {
 
        ingressController *ingressController
 
-       ingressInformer cache.SharedIndexInformer
+       ingressInformer  cache.SharedIndexInformer
+       serviceInformer  cache.SharedIndexInformer
+       endpointInformer cache.SharedIndexInformer
+       secretInformer   cache.SharedIndexInformer
 }
 
 func NewProvider(common *providertypes.Common, namespaceProvider 
namespace.WatchingNamespaceProvider,
@@ -77,6 +80,11 @@ func NewProvider(common *providertypes.Common, 
namespaceProvider namespace.Watch
        default:
                p.ingressInformer = 
kubeFactory.Extensions().V1beta1().Ingresses().Informer()
        }
+
+       p.endpointInformer = common.EpInformer
+       p.serviceInformer = common.SvcInformer
+       p.secretInformer = common.SecretInformer
+
        ingressLister := kube.NewIngressLister(
                kubeFactory.Networking().V1().Ingresses().Lister(),
                kubeFactory.Networking().V1beta1().Ingresses().Lister(),
@@ -93,7 +101,7 @@ func NewProvider(common *providertypes.Common, 
namespaceProvider namespace.Watch
                }, translator, apisixTranslator),
        }
 
-       p.ingressController = newIngressController(c, ingressLister, 
p.ingressInformer)
+       p.ingressController = newIngressController(c, ingressLister, 
p.ingressInformer, p.secretInformer, p.endpointInformer, p.serviceInformer)
 
        return p, nil
 }