Merge pull request #835 from emosbaugh/omit-empty-hostname-in-kotsadm…

…-tls-secret Omit empty hostname from kotsadm-tls secret
replicatedhq · Jul 23, 2020 · b85733b · b85733b
2 parents a64f3e6 + 70714ef
commit b85733b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/kotsadm/kurl_proxy/cmd/main.go b/kotsadm/kurl_proxy/cmd/main.go
@@ -270,7 +270,9 @@ func getHttpsServer(upstream *url.URL, tlsSecretName string, secrets corev1.Secr
 			if len(secret.StringData) == 0 {
 				secret.StringData = make(map[string]string)
 			}
-			secret.StringData["hostname"] = hostString
+			if hostString != "" {
+				secret.StringData["hostname"] = hostString
+			}
 
 			if secret.Type == "Opaque" {
 				// Old version version of secret was type 'Opaque'
@@ -343,7 +345,9 @@ func getHttpsServer(upstream *url.URL, tlsSecretName string, secrets corev1.Secr
 			if len(secret.StringData) == 0 {
 				secret.StringData = make(map[string]string)
 			}
-			secret.StringData["hostname"] = hostString
+			if hostString != "" {
+				secret.StringData["hostname"] = hostString
+			}
 
 			if secret.Type == "Opaque" {
 				// Old version version of secret was type 'Opaque'