Fix case where namespace is not watching secrets

nginxinc · Nov 11, 2022 · 07cc09f · 07cc09f
1 parent 8f3453f
commit 07cc09f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/examples/custom-resources/certmanager/cafe-virtual-server.yaml b/examples/custom-resources/certmanager/cafe-virtual-server.yaml
@@ -8,17 +8,10 @@ spec:
     secret: cafe-secret
     cert-manager:
       cluster-issuer: selfsigned-issuer
-  upstreams:
-  - name: tea
-    service: tea-svc
-    port: 80
-  - name: coffee
-    service: coffee-svc
-    port: 80
+  externalDNS:
+    enable: true
   routes:
   - path: /tea
-    action:
-      pass: tea
+    route: tea/tea
   - path: /coffee
-    action:
-      pass: coffee
+    route: coffee/coffee
diff --git a/internal/k8s/controller.go b/internal/k8s/controller.go
@@ -866,6 +866,9 @@ func (lbc *LoadBalancerController) updateAllConfigs() {
 // it will report warnings. (See https://github.com/nginxinc/kubernetes-ingress/issues/1448 )
 func (lbc *LoadBalancerController) preSyncSecrets() {
 	for _, ni := range lbc.namespacedInformers {
+		if !ni.isSecretsEnabledNamespace {
+			break
+		}
 		objects := ni.secretLister.List()
 		glog.V(3).Infof("PreSync %d Secrets", len(objects))
 

diff --git a/internal/k8s/controller_test.go b/internal/k8s/controller_test.go
@@ -2298,7 +2298,7 @@ func TestPreSyncSecrets(t *testing.T) {
 		},
 	}
 	nsi := make(map[string]*namespacedInformer)
-	nsi[""] = &namespacedInformer{secretLister: secretLister}
+	nsi[""] = &namespacedInformer{secretLister: secretLister, isSecretsEnabledNamespace: true}
 
 	lbc := LoadBalancerController{
 		isNginxPlus:         true,