Merge pull request #164 from gardener/fix/update-entry-cn64

Fix updateEntry for first domain len > 64
gardener · Mar 6, 2024 · 226baf5 · 226baf5
2 parents 3ff6269 + 4c34a12
commit 226baf5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/pkg/cert/source/reconciler.go b/pkg/cert/source/reconciler.go
@@ -397,8 +397,13 @@ func (r *sourceReconciler) updateEntry(logger logger.LogContext, info CertInfo,
 		var cn *string
 		var dnsNames []string
 		if len(info.Domains) > 0 {
-			cn = &info.Domains[0]
-			dnsNames = info.Domains[1:]
+			if len(info.Domains[0]) <= 64 {
+				cn = &info.Domains[0]
+				dnsNames = info.Domains[1:]
+			} else {
+				cn = nil
+				dnsNames = info.Domains
+			}
 		}
 
 		mod.AssureStringPtrPtr(&spec.CommonName, cn)

diff --git a/pkg/controller/issuer/certificate/reconciler.go b/pkg/controller/issuer/certificate/reconciler.go
@@ -771,10 +771,10 @@ func (r *certReconciler) buildSpecNewHash(spec *api.CertificateSpec, issuerKey u
 	if spec.CommonName != nil {
 		h.Write([]byte(*spec.CommonName))
 		h.Write([]byte{0})
-		for _, domain := range spec.DNSNames {
-			h.Write([]byte(domain))
-			h.Write([]byte{0})
-		}
+	}
+	for _, domain := range spec.DNSNames {
+		h.Write([]byte(domain))
+		h.Write([]byte{0})
 	}
 	if spec.CSR != nil {
 		h.Write([]byte{0})