Merge pull request #138 from Miciah/use-generateCertKey-consistently

Use generateCertKey consistently
openshift · Jul 10, 2020 · cb4650f · cb4650f
2 parents 67c08c8 + 79090f0
commit cb4650f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/router/template/router.go b/pkg/router/template/router.go
@@ -1094,7 +1094,8 @@ func (r *templateRouter) SyncedAtLeastOnce() bool {
 // hasRequiredEdgeCerts ensures that at least a host certificate and key are provided.
 // a ca cert is not required because it may be something that is in the root cert chain
 func hasRequiredEdgeCerts(cfg *ServiceAliasConfig) bool {
-	hostCert, ok := cfg.Certificates[cfg.Host]
+	certKey := generateCertKey(cfg)
+	hostCert, ok := cfg.Certificates[certKey]
 	return ok && len(hostCert.Contents) > 0 && len(hostCert.PrivateKey) > 0
 }
 

diff --git a/pkg/router/template/template_helper.go b/pkg/router/template/template_helper.go
@@ -168,7 +168,8 @@ func generateHAProxyCertConfigMap(td templateData) []string {
 	for k, cfg := range td.State {
 		hascert := false
 		if len(cfg.Host) > 0 {
-			cert, ok := cfg.Certificates[cfg.Host]
+			certKey := generateCertKey(&cfg)
+			cert, ok := cfg.Certificates[certKey]
 			hascert = ok && len(cert.Contents) > 0
 		}