fix: add missing owner on knative-serving-cert

- why using default ingress cert, owner is not set to FTer: serverless-serving-gateway Signed-off-by: Wen Zhou <[email protected]>
opendatahub-io · Aug 19, 2024 · bf1b7ae · bf1b7ae
1 parent a0e0a29
commit bf1b7ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/pkg/cluster/cert.go b/pkg/cluster/cert.go
@@ -123,7 +123,7 @@ func generateCertificate(addr string) ([]byte, []byte, error) {
 }
 
 // PropagateDefaultIngressCertificate copies ingress cert secrets from openshift-ingress ns to given namespace.
-func PropagateDefaultIngressCertificate(ctx context.Context, c client.Client, secretName, namespace string) error {
+func PropagateDefaultIngressCertificate(ctx context.Context, c client.Client, secretName, namespace string, metaOptions ...MetaOptions) error {
 	// Add IngressController to scheme
 	runtime.Must(operatorv1.Install(c.Scheme()))
 	defaultIngressCtrl, err := FindAvailableIngressController(ctx, c)
@@ -138,7 +138,7 @@ func PropagateDefaultIngressCertificate(ctx context.Context, c client.Client, se
 		return err
 	}
 
-	return copySecretToNamespace(ctx, c, defaultIngressSecret, secretName, namespace)
+	return copySecretToNamespace(ctx, c, defaultIngressSecret, secretName, namespace, metaOptions...)
 }
 
 func FindAvailableIngressController(ctx context.Context, c client.Client) (*operatorv1.IngressController, error) {
@@ -167,7 +167,7 @@ func GetSecret(ctx context.Context, c client.Client, namespace, name string) (*c
 	return secret, nil
 }
 
-func copySecretToNamespace(ctx context.Context, c client.Client, secret *corev1.Secret, newSecretName, namespace string) error {
+func copySecretToNamespace(ctx context.Context, c client.Client, secret *corev1.Secret, newSecretName, namespace string, opts ...MetaOptions) error {
 	newSecret := &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      newSecretName,
@@ -179,6 +179,9 @@ func copySecretToNamespace(ctx context.Context, c client.Client, secret *corev1.
 	if err := generateCertSecret(ctx, c, newSecret, newSecretName, namespace); err != nil {
 		return fmt.Errorf("failed to deploy default cert secret to namespace %s: %w", namespace, err)
 	}
+	if err := ApplyMetaOptions(newSecret, opts...); err != nil {
+		return err
+	}
 	return nil
 }
 

diff --git a/pkg/feature/serverless/resources.go b/pkg/feature/serverless/resources.go
@@ -25,7 +25,7 @@ func ServingCertificateResource(ctx context.Context, f *feature.Feature) error {
 	case infrav1.Provided:
 		return nil
 	default:
-		return cluster.PropagateDefaultIngressCertificate(ctx, f.Client, secretData.Name, secretData.Namespace)
+		return cluster.PropagateDefaultIngressCertificate(ctx, f.Client, secretData.Name, secretData.Namespace, feature.OwnedBy(f))
 	}
 }