Remove syncSecret on add secret event
This commit is contained in:
parent
b9070d76cc
commit
08bcd94159
2 changed files with 0 additions and 29 deletions
|
@ -24,11 +24,9 @@ import (
|
||||||
"github.com/golang/glog"
|
"github.com/golang/glog"
|
||||||
|
|
||||||
api "k8s.io/api/core/v1"
|
api "k8s.io/api/core/v1"
|
||||||
extensions "k8s.io/api/extensions/v1beta1"
|
|
||||||
"k8s.io/client-go/tools/cache"
|
"k8s.io/client-go/tools/cache"
|
||||||
|
|
||||||
"k8s.io/ingress/core/pkg/ingress"
|
"k8s.io/ingress/core/pkg/ingress"
|
||||||
"k8s.io/ingress/core/pkg/ingress/annotations/parser"
|
|
||||||
"k8s.io/ingress/core/pkg/net/ssl"
|
"k8s.io/ingress/core/pkg/net/ssl"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -111,26 +109,6 @@ func (ic *GenericController) getPemCertificate(secretName string) (*ingress.SSLC
|
||||||
return s, nil
|
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
|
// sslCertTracker holds a store of referenced Secrets in Ingress rules
|
||||||
type sslCertTracker struct {
|
type sslCertTracker struct {
|
||||||
cache.ThreadSafeStore
|
cache.ThreadSafeStore
|
||||||
|
|
|
@ -214,13 +214,6 @@ func newIngressController(config *Configuration) *GenericController {
|
||||||
}
|
}
|
||||||
|
|
||||||
secrEventHandler := cache.ResourceEventHandlerFuncs{
|
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{}) {
|
UpdateFunc: func(old, cur interface{}) {
|
||||||
if !reflect.DeepEqual(old, cur) {
|
if !reflect.DeepEqual(old, cur) {
|
||||||
sec := cur.(*api.Secret)
|
sec := cur.(*api.Secret)
|
||||||
|
|
Loading…
Reference in a new issue