From 7c2ac010c9c365a5f9a5191a9201eff59d741589 Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Wed, 19 Feb 2025 17:56:26 +0100 Subject: [PATCH] Make Certifacte factory more generic Signed-off-by: Matthias Wessendorf --- .../integration/sink/integrationsink.go | 2 +- .../integration/sink/resources/certificate.go | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkg/reconciler/integration/sink/integrationsink.go b/pkg/reconciler/integration/sink/integrationsink.go index ea2033ddae8..e049938982e 100644 --- a/pkg/reconciler/integration/sink/integrationsink.go +++ b/pkg/reconciler/integration/sink/integrationsink.go @@ -170,7 +170,7 @@ func (r *Reconciler) reconcileService(ctx context.Context, sink *sinks.Integrati func (r *Reconciler) reconcileCMCertificate(ctx context.Context, sink *sinks.IntegrationSink) (*cmv1.Certificate, error) { - expected := resources.MakeCertificate(sink) + expected := resources.MakeCertificate(sink, sink.Name) cert, err := r.cmCertificateLister.Certificates(sink.Namespace).Get(expected.Name) if apierrors.IsNotFound(err) { diff --git a/pkg/reconciler/integration/sink/resources/certificate.go b/pkg/reconciler/integration/sink/resources/certificate.go index b67957dbe0c..7699349fc95 100644 --- a/pkg/reconciler/integration/sink/resources/certificate.go +++ b/pkg/reconciler/integration/sink/resources/certificate.go @@ -25,28 +25,27 @@ import ( "knative.dev/pkg/kmeta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "knative.dev/eventing/pkg/apis/sinks/v1alpha1" ) func CertificateName(sinkName string) string { return kmeta.ChildName(sinkName, "-server-tls") } -func MakeCertificate(sink *v1alpha1.IntegrationSink) *cmv1.Certificate { +func MakeCertificate(sink kmeta.OwnerRefableAccessor, name string) *cmv1.Certificate { return &cmv1.Certificate{ ObjectMeta: metav1.ObjectMeta{ - Name: CertificateName(sink.Name), - Namespace: sink.Namespace, + Name: CertificateName(name), + Namespace: sink.GetNamespace(), OwnerReferences: []metav1.OwnerReference{ *kmeta.NewControllerRef(sink), }, }, Spec: cmv1.CertificateSpec{ - SecretName: CertificateName(sink.Name), + SecretName: CertificateName(name), SecretTemplate: &cmv1.CertificateSecretTemplate{ Labels: map[string]string{ "app.kubernetes.io/component": "knative-eventing", - "app.kubernetes.io/name": sink.Name, + "app.kubernetes.io/name": name, }, }, Duration: &metav1.Duration{ @@ -66,8 +65,8 @@ func MakeCertificate(sink *v1alpha1.IntegrationSink) *cmv1.Certificate { RotationPolicy: cmv1.RotationPolicyAlways, }, DNSNames: []string{ - fmt.Sprintf("%s.%s.svc.cluster.local", DeploymentName(sink.Name), sink.Namespace), - fmt.Sprintf("%s.%s.svc", DeploymentName(sink.Name), sink.Namespace), + fmt.Sprintf("%s.%s.svc.cluster.local", DeploymentName(name), sink.GetNamespace()), + fmt.Sprintf("%s.%s.svc", DeploymentName(name), sink.GetNamespace()), }, IssuerRef: cmmeta.ObjectReference{ Name: "knative-eventing-ca-issuer",