Merge pull request #93 from nginxinc/secrets

Fix overwriting of secrets from different namespaces
nginx · Dec 2, 2016 · 414a0d3 · 414a0d3
2 parents 37b2ac0 + 0807419
commit 414a0d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/nginx-controller/nginx/configurator.go b/nginx-controller/nginx/configurator.go
@@ -66,7 +66,8 @@ func (cnf *Configurator) updateCertificates(ingEx *IngressEx) map[string]string
 			continue
 		}
 
-		pemFileName := cnf.nginx.AddOrUpdateCertAndKey(secretName, string(cert), string(key))
+		name := ingEx.Ingress.Namespace + "-" + secretName
+		pemFileName := cnf.nginx.AddOrUpdateCertAndKey(name, string(cert), string(key))
 
 		for _, host := range tls.Hosts {
 			pems[host] = pemFileName

diff --git a/nginx-plus-controller/nginx/configurator.go b/nginx-plus-controller/nginx/configurator.go
@@ -68,7 +68,8 @@ func (cnf *Configurator) updateCertificates(ingEx *IngressEx) map[string]string
 			continue
 		}
 
-		pemFileName := cnf.nginx.AddOrUpdateCertAndKey(secretName, string(cert), string(key))
+		name := ingEx.Ingress.Namespace + "-" + secretName
+		pemFileName := cnf.nginx.AddOrUpdateCertAndKey(name, string(cert), string(key))
 
 		for _, host := range tls.Hosts {
 			pems[host] = pemFileName