Update default secret

pkg/cluster/cert.go

@@ -124,7 +124,7 @@ func generateCertificate(addr string) ([]byte, []byte, error) {
 }
 
 // GetDefaultIngressCertificate copies ingress cert secrets from openshift-ingress ns to given namespace.
-func GetDefaultIngressCertificate(ctx context.Context, c client.Client, namespace string) error {
+func GetDefaultIngressCertificate(ctx context.Context, c client.Client, knativeSecret, namespace string) error {
 	// Add IngressController to scheme
 	runtime.Must(operatorv1.Install(c.Scheme()))
 	defaultIngressCtrl, err := FindAvailableIngressController(ctx, c)
@@ -139,7 +139,7 @@ func GetDefaultIngressCertificate(ctx context.Context, c client.Client, namespac
 		return err
 	}
 
-	return copySecretToNamespace(ctx, c, defaultIngressSecret, namespace)
+	return copySecretToNamespace(ctx, c, defaultIngressSecret, knativeSecret, namespace)
 }
 
 func FindAvailableIngressController(ctx context.Context, c client.Client) (*operatorv1.IngressController, error) {
@@ -153,14 +153,10 @@ func FindAvailableIngressController(ctx context.Context, c client.Client) (*oper
 		return nil, err
 	}
 
-	for _, ingressCtrl := range defaultIngressCtrlList.Items {
-		for _, condition := range ingressCtrl.Status.Conditions {
-			if condition.Type == operatorv1.IngressControllerAvailableConditionType && condition.Status == operatorv1.ConditionTrue {
-				return &ingressCtrl, nil
-			}
-		}
+	if len(defaultIngressCtrlList.Items) > 0 {
+		return &defaultIngressCtrlList.Items[0], nil
 	}
-	return nil, err
+	return nil, fmt.Errorf("no ingresscontroller resource available")
 }
 
 func GetDefaultIngressCertSecretName(ingressCtrl *operatorv1.IngressController) string {
@@ -179,18 +175,18 @@ func getSecret(ctx context.Context, c client.Client, namespace, name string) (*v
 	return secret, nil
 }
 
-func copySecretToNamespace(ctx context.Context, c client.Client, secret *v1.Secret, namespace string) error {
+func copySecretToNamespace(ctx context.Context, c client.Client, secret *v1.Secret, newSecretName, namespace string) error {
 	newSecret := &v1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      secret.Name,
+			Name:      newSecretName,
 			Namespace: namespace,
 		},
 		Data: secret.Data,
 		Type: secret.Type,
 	}
 
 	existingSecret := &v1.Secret{}
-	err := c.Get(ctx, client.ObjectKey{Name: secret.Name, Namespace: namespace}, existingSecret)
+	err := c.Get(ctx, client.ObjectKey{Name: newSecretName, Namespace: namespace}, existingSecret)
 	if apierrors.IsNotFound(err) {
 		err = c.Create(ctx, newSecret)
 		if err != nil {

pkg/feature/serverless/resources.go

@@ -19,6 +19,6 @@ func ServingCertificateResource(f *feature.Feature) error {
 	case infrav1.Provided:
 		return nil
 	default:
-		return cluster.GetDefaultIngressCertificate(context.TODO(), f.Client, f.Spec.ControlPlane.Namespace)
+		return cluster.GetDefaultIngressCertificate(context.TODO(), f.Client, f.Spec.KnativeCertificateSecret, f.Spec.ControlPlane.Namespace)
 	}
 }

tests/e2e/dsc_creation_test.go

@@ -343,7 +343,7 @@ func (tc *testContext) validateDSC() error {
 		Name:            "knative-serving",
 		IngressGateway: infrav1.IngressGatewaySpec{
 			Certificate: infrav1.CertificateSpec{
-				Type: infrav1.DefaultIngress,
+				Type: infrav1.OpenshiftDefaultIngress,
 			},
 		},
 	}