* allow disabling backups without pgbackrest image

* fall back to internal PKI when cert-manager is not ready

Author: hors

e2e-tests/tests/backup-enable-disable/01-create-cluster.yaml

@@ -8,5 +8,5 @@ commands:
       source ../../functions
 
       get_cr "some-name" ${RANDOM} \
-        | yq '.spec.backups.enabled=false' \
+        | yq '.spec.backups.enabled=false | del(.spec.backups.pgbackrest)' \
         | kubectl -n "${NAMESPACE}" apply -f -

internal/config/config.go

@@ -136,8 +136,9 @@ func VerifyImageValues(cluster *v1beta1.PostgresCluster) error {
 	var images []string
 
 	backupsEnabled := cluster.Spec.Backups.Enabled == nil || *cluster.Spec.Backups.Enabled
+	dataSourceRestore := cluster.Spec.DataSource != nil && cluster.Spec.DataSource.PostgresCluster != nil
 	// K8SPG-710: Image check will fail without a backup section in PostgresCluster
-	if cluster.BackupSpecFound() && backupsEnabled && PGBackRestContainerImage(cluster) == "" {
+	if (cluster.BackupSpecFound() && backupsEnabled || dataSourceRestore) && PGBackRestContainerImage(cluster) == "" {
 		images = append(images, "crunchy-pgbackrest")
 	}
 	if PGAdminContainerImage(cluster) == "" &&

internal/controller/postgrescluster/pki.go

@@ -372,7 +372,8 @@ func (r *Reconciler) isCertManagerInstalled(ctx context.Context, ns string) (boo
 		case errors.Is(err, certmanager.ErrCertManagerNotFound):
 			return false, nil
 		case errors.Is(err, certmanager.ErrCertManagerNotReady):
-			return true, nil
+			logging.FromContext(ctx).Info("cert-manager is not ready, falling back to internal PKI")
+			return false, nil
 		}
 		return false, err
 	}

percona/certmanager/certmanager.go

@@ -83,7 +83,7 @@ func (c *controller) Check(ctx context.Context, config *rest.Config, ns string)
 		case errors.Is(err, cmapichecker.ErrCertManagerCRDsNotFound):
 			return ErrCertManagerNotFound
 		case errors.Is(err, cmapichecker.ErrWebhookCertificateFailure), errors.Is(err, cmapichecker.ErrWebhookServiceFailure), errors.Is(err, cmapichecker.ErrWebhookDeploymentFailure):
-			log.Error(cmapichecker.TranslateToSimpleError(err), "cert-manager is not ready")
+			log.Info("cert-manager is not ready", "reason", cmapichecker.TranslateToSimpleError(err))
 			return ErrCertManagerNotReady
 		}
 		return err

pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go

@@ -703,6 +703,9 @@ func (b Backups) ToCrunchy(version string) crunchyv1beta1.Backups {
 	if b.Enabled != nil && !*b.Enabled {
 		return crunchyv1beta1.Backups{
 			Enabled: ptr.To(false),
+			PGBackRest: crunchyv1beta1.PGBackRestArchive{
+				Image: b.PGBackRest.Image,
+			},
 		}
 	}