Skip to content

K8SPG-511 fix variables #1054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 7, 2025
+32 −100
Merged

K8SPG-511 fix variables #1054

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3cf4f4b
fix variables
nmarukovich Feb 20, 2025
2affefa
fix
nmarukovich Feb 24, 2025
e275e07
delete default value for pgbackrest repo
nmarukovich Feb 25, 2025
4e3a1f8
Merge branch 'main' into K8SPG-511_fix
nmarukovich Feb 26, 2025
02f00f6
Merge branch 'main' into K8SPG-511_fix
hors Mar 6, 2025
6d1234a
Merge branch 'main' into K8SPG-511_fix
hors Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml
View file
Original file line number Diff line number Diff line change
@@ -3336,7 +3336,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -4578,7 +4577,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -6671,7 +6669,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -6997,10 +6994,8 @@ spec:
type: object
type: object
stanza:
default: db
description: |-
The name of an existing pgBackRest stanza to use as the data source for the new PostgresCluster.
Defaults to `db` if not provided.
description: The name of an existing pgBackRest stanza to
use as the data source for the new PostgresCluster.
type: string
tolerations:
description: |-
@@ -8012,7 +8007,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -17725,7 +17719,7 @@ spec:
or archive.
properties:
enabled:
default: true
default: false
description: |-
Whether or not the PostgreSQL cluster should be read-only. When this is
true, WAL files are applied from a pgBackRest repository or another
1 change: 0 additions & 1 deletion build/crd/percona/generated/pgv2.percona.com_perconapgbackups.yaml
View file
Original file line number Diff line number Diff line change
@@ -132,7 +132,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
12 changes: 3 additions & 9 deletions build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml
View file
Original file line number Diff line number Diff line change
@@ -3492,7 +3492,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -4734,7 +4733,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -6317,7 +6315,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -6643,10 +6640,8 @@ spec:
type: object
type: object
stanza:
default: db
description: |-
The name of an existing pgBackRest stanza to use as the data source for the new PostgresCluster.
Defaults to `db` if not provided.
description: The name of an existing pgBackRest stanza to
use as the data source for the new PostgresCluster.
type: string
tolerations:
description: |-
@@ -7658,7 +7653,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -17405,7 +17399,7 @@ spec:
or archive.
properties:
enabled:
default: true
default: false
description: |-
Whether or not the PostgreSQL cluster should be read-only. When this is
true, WAL files are applied from a pgBackRest repository or another
13 changes: 3 additions & 10 deletions config/crd/bases/pgv2.percona.com_perconapgclusters.yaml
View file
Original file line number Diff line number Diff line change
@@ -131,7 +131,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -3898,7 +3897,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -5140,7 +5138,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -6723,7 +6720,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -7049,10 +7045,8 @@ spec:
type: object
type: object
stanza:
default: db
description: |-
The name of an existing pgBackRest stanza to use as the data source for the new PostgresCluster.
Defaults to `db` if not provided.
description: The name of an existing pgBackRest stanza to
use as the data source for the new PostgresCluster.
type: string
tolerations:
description: |-
@@ -8064,7 +8058,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -17811,7 +17804,7 @@ spec:
or archive.
properties:
enabled:
default: true
default: false
description: |-
Whether or not the PostgreSQL cluster should be read-only. When this is
true, WAL files are applied from a pgBackRest repository or another
12 changes: 3 additions & 9 deletions config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml
View file
Original file line number Diff line number Diff line change
@@ -3318,7 +3318,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -4568,7 +4567,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -6631,7 +6629,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -6957,10 +6954,8 @@ spec:
type: object
type: object
stanza:
default: db
description: |-
The name of an existing pgBackRest stanza to use as the data source for the new PostgresCluster.
Defaults to `db` if not provided.
description: The name of an existing pgBackRest stanza to
use as the data source for the new PostgresCluster.
type: string
tolerations:
description: |-
@@ -7972,7 +7967,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -17634,7 +17628,7 @@ spec:
or archive.
properties:
enabled:
default: true
default: false
description: |-
Whether or not the PostgreSQL cluster should be read-only. When this is
true, WAL files are applied from a pgBackRest repository or another
25 changes: 6 additions & 19 deletions deploy/bundle.yaml
View file
Original file line number Diff line number Diff line change
@@ -424,7 +424,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -4191,7 +4190,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -5433,7 +5431,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -7016,7 +7013,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -7342,10 +7338,8 @@ spec:
type: object
type: object
stanza:
default: db
description: |-
The name of an existing pgBackRest stanza to use as the data source for the new PostgresCluster.
Defaults to `db` if not provided.
description: The name of an existing pgBackRest stanza to
use as the data source for the new PostgresCluster.
type: string
tolerations:
description: |-
@@ -8357,7 +8351,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -18104,7 +18097,7 @@ spec:
or archive.
properties:
enabled:
default: true
default: false
description: |-
Whether or not the PostgreSQL cluster should be read-only. When this is
true, WAL files are applied from a pgBackRest repository or another
@@ -29005,7 +28998,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -30255,7 +30247,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -32318,7 +32309,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -32644,10 +32634,8 @@ spec:
type: object
type: object
stanza:
default: db
description: |-
The name of an existing pgBackRest stanza to use as the data source for the new PostgresCluster.
Defaults to `db` if not provided.
description: The name of an existing pgBackRest stanza to
use as the data source for the new PostgresCluster.
type: string
tolerations:
description: |-
@@ -33659,7 +33647,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -43321,7 +43308,7 @@ spec:
or archive.
properties:
enabled:
default: true
default: false
description: |-
Whether or not the PostgreSQL cluster should be read-only. When this is
true, WAL files are applied from a pgBackRest repository or another
25 changes: 6 additions & 19 deletions deploy/crd.yaml
View file
Original file line number Diff line number Diff line change
@@ -424,7 +424,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -4191,7 +4190,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -5433,7 +5431,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -7016,7 +7013,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -7342,10 +7338,8 @@ spec:
type: object
type: object
stanza:
default: db
description: |-
The name of an existing pgBackRest stanza to use as the data source for the new PostgresCluster.
Defaults to `db` if not provided.
description: The name of an existing pgBackRest stanza to
use as the data source for the new PostgresCluster.
type: string
tolerations:
description: |-
@@ -8357,7 +8351,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -18104,7 +18097,7 @@ spec:
or archive.
properties:
enabled:
default: true
default: false
description: |-
Whether or not the PostgreSQL cluster should be read-only. When this is
true, WAL files are applied from a pgBackRest repository or another
@@ -29005,7 +28998,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -30255,7 +30247,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -32318,7 +32309,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -32644,10 +32634,8 @@ spec:
type: object
type: object
stanza:
default: db
description: |-
The name of an existing pgBackRest stanza to use as the data source for the new PostgresCluster.
Defaults to `db` if not provided.
description: The name of an existing pgBackRest stanza to
use as the data source for the new PostgresCluster.
type: string
tolerations:
description: |-
@@ -33659,7 +33647,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -43321,7 +43308,7 @@ spec:
or archive.
properties:
enabled:
default: true
default: false
description: |-
Whether or not the PostgreSQL cluster should be read-only. When this is
true, WAL files are applied from a pgBackRest repository or another
25 changes: 6 additions & 19 deletions deploy/cw-bundle.yaml
View file
Original file line number Diff line number Diff line change
@@ -424,7 +424,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -4191,7 +4190,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -5433,7 +5431,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -7016,7 +7013,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -7342,10 +7338,8 @@ spec:
type: object
type: object
stanza:
default: db
description: |-
The name of an existing pgBackRest stanza to use as the data source for the new PostgresCluster.
Defaults to `db` if not provided.
description: The name of an existing pgBackRest stanza to
use as the data source for the new PostgresCluster.
type: string
tolerations:
description: |-
@@ -8357,7 +8351,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -18104,7 +18097,7 @@ spec:
or archive.
properties:
enabled:
default: true
default: false
description: |-
Whether or not the PostgreSQL cluster should be read-only. When this is
true, WAL files are applied from a pgBackRest repository or another
@@ -29005,7 +28998,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -30255,7 +30247,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -32318,7 +32309,6 @@ spec:
- bucket
type: object
name:
default: repo1
description: The name of the repository
pattern: ^repo[1-4]
type: string
@@ -32644,10 +32634,8 @@ spec:
type: object
type: object
stanza:
default: db
description: |-
The name of an existing pgBackRest stanza to use as the data source for the new PostgresCluster.
Defaults to `db` if not provided.
description: The name of an existing pgBackRest stanza to
use as the data source for the new PostgresCluster.
type: string
tolerations:
description: |-
@@ -33659,7 +33647,6 @@ spec:
More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
type: string
repoName:
default: repo1
description: |-
The name of the pgBackRest repo within the source PostgresCluster that contains the backups
that should be utilized to perform a pgBackRest restore when initializing the data source
@@ -43321,7 +43308,7 @@ spec:
or archive.
properties:
enabled:
default: true
default: false
description: |-
Whether or not the PostgreSQL cluster should be read-only. When this is
true, WAL files are applied from a pgBackRest repository or another
4 changes: 1 addition & 3 deletions pkg/apis/postgres-operator.crunchydata.com/v1beta1/pgbackrest_types.go
View file
Original file line number Diff line number Diff line change
@@ -317,7 +317,6 @@ type PGBackRestRepo struct {
// The name of the repository
// +kubebuilder:validation:Required
// +kubebuilder:validation:Pattern=^repo[1-4]
// +kubebuilder:default="repo1"
Name string `json:"name"`

// Defines the schedules for the pgBackRest backups
@@ -445,8 +444,7 @@ type PGBackRestDataSource struct {
Repo PGBackRestRepo `json:"repo"`

// The name of an existing pgBackRest stanza to use as the data source for the new PostgresCluster.
// Defaults to `db` if not provided.
// +kubebuilder:default="db"
// +kubebuilder:validation:Required
Stanza string `json:"stanza"`

// Command line options to include when running the pgBackRest restore command.
3 changes: 1 addition & 2 deletions pkg/apis/postgres-operator.crunchydata.com/v1beta1/postgrescluster_types.go
View file
Original file line number Diff line number Diff line change
@@ -291,7 +291,6 @@ type PostgresClusterDataSource struct {
// for the new PostgresCluster.
// +kubebuilder:validation:Required
// +kubebuilder:validation:Pattern=^repo[1-4]
// +kubebuilder:default="repo1"
RepoName string `json:"repoName"`

// Command line options to include when running the pgBackRest restore command.
@@ -630,7 +629,7 @@ type PostgresStandbySpec struct {
// true, WAL files are applied from a pgBackRest repository or another
// PostgreSQL server.
// +optional
// +kubebuilder:default=true
// +kubebuilder:default=false
Enabled bool `json:"enabled"`

// The name of the pgBackRest repository to follow for WAL files.