Merge pull request #817 from fmount/direct_tls

openshift-merge-bot[bot] · web-flow · commit 6fe60e7cf628 · 2024-06-11T14:54:57.000Z
Additional SubjectName in the CertificateRequest
diff --git a/pkg/openstack/common.go b/pkg/openstack/common.go
@@ -298,6 +298,11 @@ func EnsureEndpointConfig(
 						Labels:      util.MergeMaps(ed.Labels, map[string]string{serviceCertSelector: ""}),
 						Usages:      nil,
 					}
+
+					addSubjNames := util.GetStringListFromMap(svc.Annotations, tls.AdditionalSubjectNamesKey)
+					if len(addSubjNames) > 0 {
+						certRequest.Hostnames = append(certRequest.Hostnames, addSubjNames...)
+					}
 					if instance.Spec.TLS.Ingress.Cert.Duration != nil {
 						certRequest.Duration = &instance.Spec.TLS.Ingress.Cert.Duration.Duration
 					}
@@ -343,6 +348,11 @@ func EnsureEndpointConfig(
 					Labels:      util.MergeMaps(ed.Labels, map[string]string{serviceCertSelector: ""}),
 					Usages:      nil,
 				}
+
+				addSubjNames := util.GetStringListFromMap(svc.Annotations, tls.AdditionalSubjectNamesKey)
+				if len(addSubjNames) > 0 {
+					certRequest.Hostnames = append(certRequest.Hostnames, addSubjNames...)
+				}
 				if instance.Spec.TLS.PodLevel.Internal.Cert.Duration != nil {
 					certRequest.Duration = &instance.Spec.TLS.PodLevel.Internal.Cert.Duration.Duration
 				}

Original file line number	Diff line number	Diff line change
`@@ -298,6 +298,11 @@ func EnsureEndpointConfig(`
`298`	`298`	`Labels: util.MergeMaps(ed.Labels, map[string]string{serviceCertSelector: ""}),`
`299`	`299`	`Usages: nil,`
`300`	`300`	`}`
	`301`	`+`
	`302`	`+ addSubjNames := util.GetStringListFromMap(svc.Annotations, tls.AdditionalSubjectNamesKey)`
	`303`	`+ if len(addSubjNames) > 0 {`
	`304`	`+ certRequest.Hostnames = append(certRequest.Hostnames, addSubjNames...)`
	`305`	`+ }`
`301`	`306`	`if instance.Spec.TLS.Ingress.Cert.Duration != nil {`
`302`	`307`	`certRequest.Duration = &instance.Spec.TLS.Ingress.Cert.Duration.Duration`
`303`	`308`	`}`
`@@ -343,6 +348,11 @@ func EnsureEndpointConfig(`
`343`	`348`	`Labels: util.MergeMaps(ed.Labels, map[string]string{serviceCertSelector: ""}),`
`344`	`349`	`Usages: nil,`
`345`	`350`	`}`
	`351`	`+`
	`352`	`+ addSubjNames := util.GetStringListFromMap(svc.Annotations, tls.AdditionalSubjectNamesKey)`
	`353`	`+ if len(addSubjNames) > 0 {`
	`354`	`+ certRequest.Hostnames = append(certRequest.Hostnames, addSubjNames...)`
	`355`	`+ }`
`346`	`356`	`if instance.Spec.TLS.PodLevel.Internal.Cert.Duration != nil {`
`347`	`357`	`certRequest.Duration = &instance.Spec.TLS.PodLevel.Internal.Cert.Duration.Duration`
`348`	`358`	`}`