From 08bcd941590c464f2a9fc625e0f48067c0fda899 Mon Sep 17 00:00:00 2001 From: Joao Morais Date: Thu, 27 Jul 2017 13:34:09 -0300 Subject: [PATCH] Remove syncSecret on add secret event --- core/pkg/ingress/controller/backend_ssl.go | 22 ---------------------- core/pkg/ingress/controller/controller.go | 7 ------- 2 files changed, 29 deletions(-) diff --git a/core/pkg/ingress/controller/backend_ssl.go b/core/pkg/ingress/controller/backend_ssl.go index d91670daf..faeae2693 100644 --- a/core/pkg/ingress/controller/backend_ssl.go +++ b/core/pkg/ingress/controller/backend_ssl.go @@ -24,11 +24,9 @@ import ( "github.com/golang/glog" api "k8s.io/api/core/v1" - extensions "k8s.io/api/extensions/v1beta1" "k8s.io/client-go/tools/cache" "k8s.io/ingress/core/pkg/ingress" - "k8s.io/ingress/core/pkg/ingress/annotations/parser" "k8s.io/ingress/core/pkg/net/ssl" ) @@ -111,26 +109,6 @@ func (ic *GenericController) getPemCertificate(secretName string) (*ingress.SSLC return s, nil } -// secrReferenced checks if a secret is referenced or not by one or more Ingress rules -func (ic *GenericController) secrReferenced(name, namespace string) bool { - for _, ingIf := range ic.ingLister.Store.List() { - ing := ingIf.(*extensions.Ingress) - str, err := parser.GetStringAnnotation("ingress.kubernetes.io/auth-tls-secret", ing) - if err == nil && str == fmt.Sprintf("%v/%v", namespace, name) { - return true - } - if ing.Namespace != namespace { - continue - } - for _, tls := range ing.Spec.TLS { - if tls.SecretName == name { - return true - } - } - } - return false -} - // sslCertTracker holds a store of referenced Secrets in Ingress rules type sslCertTracker struct { cache.ThreadSafeStore diff --git a/core/pkg/ingress/controller/controller.go b/core/pkg/ingress/controller/controller.go index 2281ba085..49ea4d5ac 100644 --- a/core/pkg/ingress/controller/controller.go +++ b/core/pkg/ingress/controller/controller.go @@ -214,13 +214,6 @@ func newIngressController(config *Configuration) *GenericController { } secrEventHandler := cache.ResourceEventHandlerFuncs{ - AddFunc: func(obj interface{}) { - sec := obj.(*api.Secret) - key := fmt.Sprintf("%v/%v", sec.Namespace, sec.Name) - if ic.secrReferenced(sec.Namespace, sec.Name) { - ic.syncSecret(key) - } - }, UpdateFunc: func(old, cur interface{}) { if !reflect.DeepEqual(old, cur) { sec := cur.(*api.Secret)