From 15e1aeedf3985f71f27c4c48e467379f671f09e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20G=C3=BCne=C5=9F?= Date: Fri, 24 Jan 2025 12:35:23 +0300 Subject: [PATCH 1/2] K8SPG-710: Make spec.backups.pgbackrest optional --- .../percona/generated/pgv2.percona.com_perconapgclusters.yaml | 2 -- config/crd/bases/pgv2.percona.com_perconapgclusters.yaml | 2 -- deploy/bundle.yaml | 2 -- deploy/crd.yaml | 2 -- deploy/cw-bundle.yaml | 2 -- pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go | 2 +- 6 files changed, 1 insertion(+), 11 deletions(-) diff --git a/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml b/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml index 46ee039b0..d54ee7ec3 100644 --- a/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml +++ b/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml @@ -4987,8 +4987,6 @@ spec: trackLatestRestorableTime: description: Enable tracking latest restorable time type: boolean - required: - - pgbackrest type: object crVersion: description: |- diff --git a/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml b/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml index ad94a653f..67f03480b 100644 --- a/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml +++ b/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml @@ -5393,8 +5393,6 @@ spec: trackLatestRestorableTime: description: Enable tracking latest restorable time type: boolean - required: - - pgbackrest type: object crVersion: description: |- diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index 08fc8d937..aa9e98ea9 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -5686,8 +5686,6 @@ spec: trackLatestRestorableTime: description: Enable tracking latest restorable time type: boolean - required: - - pgbackrest type: object crVersion: description: |- diff --git a/deploy/crd.yaml b/deploy/crd.yaml index 6cdd58aa5..d6b52e242 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -5686,8 +5686,6 @@ spec: trackLatestRestorableTime: description: Enable tracking latest restorable time type: boolean - required: - - pgbackrest type: object crVersion: description: |- diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index cca501f56..7a0390bd7 100644 --- a/deploy/cw-bundle.yaml +++ b/deploy/cw-bundle.yaml @@ -5686,8 +5686,6 @@ spec: trackLatestRestorableTime: description: Enable tracking latest restorable time type: boolean - required: - - pgbackrest type: object crVersion: description: |- diff --git a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go index 979348028..195c241fc 100644 --- a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go +++ b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go @@ -436,7 +436,7 @@ type PerconaPGClusterStatus struct { type Backups struct { // pgBackRest archive configuration - // +kubebuilder:validation:Required + // +optional PGBackRest PGBackRestArchive `json:"pgbackrest"` // Enable tracking latest restorable time From eed29e68b464b5d8365ca853cd60ca50baaa0363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20G=C3=BCne=C5=9F?= Date: Fri, 24 Jan 2025 17:45:26 +0300 Subject: [PATCH 2/2] make spec.backups optional too --- .../postgres-operator.crunchydata.com_postgresclusters.yaml | 1 - .../percona/generated/pgv2.percona.com_perconapgclusters.yaml | 1 - config/crd/bases/pgv2.percona.com_perconapgclusters.yaml | 1 - .../postgres-operator.crunchydata.com_postgresclusters.yaml | 1 - deploy/bundle.yaml | 2 -- deploy/crd.yaml | 2 -- deploy/cw-bundle.yaml | 2 -- pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go | 2 +- .../v1beta1/postgrescluster_types.go | 2 +- 9 files changed, 2 insertions(+), 12 deletions(-) diff --git a/build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml b/build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml index 73b56ea67..9acf9375e 100644 --- a/build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml +++ b/build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml @@ -19709,7 +19709,6 @@ spec: - name x-kubernetes-list-type: map required: - - backups - instances - postgresVersion type: object diff --git a/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml b/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml index d54ee7ec3..8d61a98b3 100644 --- a/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml +++ b/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml @@ -17501,7 +17501,6 @@ spec: - name x-kubernetes-list-type: map required: - - backups - instances - postgresVersion type: object diff --git a/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml b/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml index 67f03480b..50096e0b5 100644 --- a/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml +++ b/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml @@ -17907,7 +17907,6 @@ spec: - name x-kubernetes-list-type: map required: - - backups - instances - postgresVersion type: object diff --git a/config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml b/config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml index 086a5a31b..3933bb8dd 100644 --- a/config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml +++ b/config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml @@ -19607,7 +19607,6 @@ spec: - name x-kubernetes-list-type: map required: - - backups - instances - postgresVersion type: object diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index aa9e98ea9..7bb8a272b 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -18200,7 +18200,6 @@ spec: - name x-kubernetes-list-type: map required: - - backups - instances - postgresVersion type: object @@ -45290,7 +45289,6 @@ spec: - name x-kubernetes-list-type: map required: - - backups - instances - postgresVersion type: object diff --git a/deploy/crd.yaml b/deploy/crd.yaml index d6b52e242..39e77dcca 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -18200,7 +18200,6 @@ spec: - name x-kubernetes-list-type: map required: - - backups - instances - postgresVersion type: object @@ -45290,7 +45289,6 @@ spec: - name x-kubernetes-list-type: map required: - - backups - instances - postgresVersion type: object diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index 7a0390bd7..52508e6c7 100644 --- a/deploy/cw-bundle.yaml +++ b/deploy/cw-bundle.yaml @@ -18200,7 +18200,6 @@ spec: - name x-kubernetes-list-type: map required: - - backups - instances - postgresVersion type: object @@ -45290,7 +45289,6 @@ spec: - name x-kubernetes-list-type: map required: - - backups - instances - postgresVersion type: object diff --git a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go index 195c241fc..9c85cb977 100644 --- a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go +++ b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go @@ -156,8 +156,8 @@ type PerconaPGClusterSpec struct { Proxy *PGProxySpec `json:"proxy,omitempty"` // PostgreSQL backup configuration - // +kubebuilder:validation:Required // +operator-sdk:csv:customresourcedefinitions:type=spec + // +optional Backups Backups `json:"backups"` // The specification of PMM sidecars. diff --git a/pkg/apis/postgres-operator.crunchydata.com/v1beta1/postgrescluster_types.go b/pkg/apis/postgres-operator.crunchydata.com/v1beta1/postgrescluster_types.go index 4cc53cba9..631ed6720 100644 --- a/pkg/apis/postgres-operator.crunchydata.com/v1beta1/postgrescluster_types.go +++ b/pkg/apis/postgres-operator.crunchydata.com/v1beta1/postgrescluster_types.go @@ -28,7 +28,7 @@ type PostgresClusterSpec struct { DataSource *DataSource `json:"dataSource,omitempty"` // PostgreSQL backup configuration - // +kubebuilder:validation:Required + // +optional Backups Backups `json:"backups"` // The secret containing the root CA certificate and key for