diff --git a/build/crd/crunchy/generated/postgres-operator.crunchydata.com_pgupgrades.yaml b/build/crd/crunchy/generated/postgres-operator.crunchydata.com_pgupgrades.yaml index bd943f5e64..472b261240 100644 --- a/build/crd/crunchy/generated/postgres-operator.crunchydata.com_pgupgrades.yaml +++ b/build/crd/crunchy/generated/postgres-operator.crunchydata.com_pgupgrades.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: pgupgrades.postgres-operator.crunchydata.com spec: group: postgres-operator.crunchydata.com 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 699a62f265..bc14ab6042 100644 --- a/build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml +++ b/build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: postgresclusters.postgres-operator.crunchydata.com spec: group: postgres-operator.crunchydata.com @@ -1331,6 +1331,9 @@ spec: x-kubernetes-list-type: atomic type: object type: object + backoffLimit: + format: int32 + type: integer priorityClassName: description: |- Priority class name for the pgBackRest backup Job pods. @@ -1398,6 +1401,13 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + restartPolicy: + description: |- + RestartPolicy describes how the container should be restarted. + Only one of the following restart policies may be specified. + If none of the following policies is specified, the default one + is RestartPolicyAlways. + type: string securityContext: description: SecurityContext defines the security settings for PGBackRest pod. diff --git a/build/crd/percona/generated/pgv2.percona.com_perconapgbackups.yaml b/build/crd/percona/generated/pgv2.percona.com_perconapgbackups.yaml index 115aafcca2..42dab159a0 100644 --- a/build/crd/percona/generated/pgv2.percona.com_perconapgbackups.yaml +++ b/build/crd/percona/generated/pgv2.percona.com_perconapgbackups.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgbackups.pgv2.percona.com spec: group: pgv2.percona.com diff --git a/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml b/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml index 5d4b34f4ed..8c0958d2ea 100644 --- a/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml +++ b/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgclusters.pgv2.percona.com spec: group: pgv2.percona.com @@ -1487,6 +1487,9 @@ spec: x-kubernetes-list-type: atomic type: object type: object + backoffLimit: + format: int32 + type: integer priorityClassName: description: |- Priority class name for the pgBackRest backup Job pods. @@ -1554,6 +1557,13 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + restartPolicy: + description: |- + RestartPolicy describes how the container should be restarted. + Only one of the following restart policies may be specified. + If none of the following policies is specified, the default one + is RestartPolicyAlways. + type: string securityContext: description: SecurityContext defines the security settings for PGBackRest pod. diff --git a/build/crd/percona/generated/pgv2.percona.com_perconapgrestores.yaml b/build/crd/percona/generated/pgv2.percona.com_perconapgrestores.yaml index d85b1b8ca5..2ff2df988a 100644 --- a/build/crd/percona/generated/pgv2.percona.com_perconapgrestores.yaml +++ b/build/crd/percona/generated/pgv2.percona.com_perconapgrestores.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgrestores.pgv2.percona.com spec: group: pgv2.percona.com diff --git a/build/crd/percona/generated/pgv2.percona.com_perconapgupgrades.yaml b/build/crd/percona/generated/pgv2.percona.com_perconapgupgrades.yaml index 17d2081724..93e5421991 100644 --- a/build/crd/percona/generated/pgv2.percona.com_perconapgupgrades.yaml +++ b/build/crd/percona/generated/pgv2.percona.com_perconapgupgrades.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgupgrades.pgv2.percona.com spec: group: pgv2.percona.com diff --git a/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml b/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml index 9ff41ce653..aa4cfdaa03 100644 --- a/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml +++ b/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgbackups.pgv2.percona.com spec: group: pgv2.percona.com @@ -409,7 +409,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgclusters.pgv2.percona.com spec: group: pgv2.percona.com @@ -1893,6 +1893,9 @@ spec: x-kubernetes-list-type: atomic type: object type: object + backoffLimit: + format: int32 + type: integer priorityClassName: description: |- Priority class name for the pgBackRest backup Job pods. @@ -1960,6 +1963,13 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + restartPolicy: + description: |- + RestartPolicy describes how the container should be restarted. + Only one of the following restart policies may be specified. + If none of the following policies is specified, the default one + is RestartPolicyAlways. + type: string securityContext: description: SecurityContext defines the security settings for PGBackRest pod. @@ -17969,7 +17979,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgrestores.pgv2.percona.com spec: group: pgv2.percona.com @@ -18067,7 +18077,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgupgrades.pgv2.percona.com spec: group: pgv2.percona.com diff --git a/config/crd/bases/postgres-operator.crunchydata.com_crunchybridgeclusters.yaml b/config/crd/bases/postgres-operator.crunchydata.com_crunchybridgeclusters.yaml index 859d5471a3..f93a59f512 100644 --- a/config/crd/bases/postgres-operator.crunchydata.com_crunchybridgeclusters.yaml +++ b/config/crd/bases/postgres-operator.crunchydata.com_crunchybridgeclusters.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest diff --git a/config/crd/bases/postgres-operator.crunchydata.com_pgadmins.yaml b/config/crd/bases/postgres-operator.crunchydata.com_pgadmins.yaml index 8a571d9978..0a3d60b7c0 100644 --- a/config/crd/bases/postgres-operator.crunchydata.com_pgadmins.yaml +++ b/config/crd/bases/postgres-operator.crunchydata.com_pgadmins.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest diff --git a/config/crd/bases/postgres-operator.crunchydata.com_pgupgrades.yaml b/config/crd/bases/postgres-operator.crunchydata.com_pgupgrades.yaml index 2e632c54fa..7afbf9ce9d 100644 --- a/config/crd/bases/postgres-operator.crunchydata.com_pgupgrades.yaml +++ b/config/crd/bases/postgres-operator.crunchydata.com_pgupgrades.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest diff --git a/config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml b/config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml index cb1a044b1b..f73d1c5da3 100644 --- a/config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml +++ b/config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: 5.4.2 @@ -1323,6 +1323,9 @@ spec: x-kubernetes-list-type: atomic type: object type: object + backoffLimit: + format: int32 + type: integer priorityClassName: description: |- Priority class name for the pgBackRest backup Job pods. @@ -1390,6 +1393,13 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + restartPolicy: + description: |- + RestartPolicy describes how the container should be restarted. + Only one of the following restart policies may be specified. + If none of the following policies is specified, the default one + is RestartPolicyAlways. + type: string securityContext: description: SecurityContext defines the security settings for PGBackRest pod. diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index 2798435855..0f4e8b3482 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest @@ -295,7 +295,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgbackups.pgv2.percona.com spec: group: pgv2.percona.com @@ -702,7 +702,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgclusters.pgv2.percona.com spec: group: pgv2.percona.com @@ -2186,6 +2186,9 @@ spec: x-kubernetes-list-type: atomic type: object type: object + backoffLimit: + format: int32 + type: integer priorityClassName: description: |- Priority class name for the pgBackRest backup Job pods. @@ -2253,6 +2256,13 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + restartPolicy: + description: |- + RestartPolicy describes how the container should be restarted. + Only one of the following restart policies may be specified. + If none of the following policies is specified, the default one + is RestartPolicyAlways. + type: string securityContext: description: SecurityContext defines the security settings for PGBackRest pod. @@ -18262,7 +18272,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgrestores.pgv2.percona.com spec: group: pgv2.percona.com @@ -18360,7 +18370,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgupgrades.pgv2.percona.com spec: group: pgv2.percona.com @@ -21072,7 +21082,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest @@ -22976,7 +22986,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest @@ -25677,7 +25687,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: 5.4.2 @@ -26998,6 +27008,9 @@ spec: x-kubernetes-list-type: atomic type: object type: object + backoffLimit: + format: int32 + type: integer priorityClassName: description: |- Priority class name for the pgBackRest backup Job pods. @@ -27065,6 +27078,13 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + restartPolicy: + description: |- + RestartPolicy describes how the container should be restarted. + Only one of the following restart policies may be specified. + If none of the following policies is specified, the default one + is RestartPolicyAlways. + type: string securityContext: description: SecurityContext defines the security settings for PGBackRest pod. diff --git a/deploy/cr.yaml b/deploy/cr.yaml index a83851e24f..c8a20b7cee 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -336,6 +336,8 @@ spec: # - secret: # name: cluster1-pgbackrest-secrets # jobs: +# restartPolicy: OnFailure +# backoffLimit: 2 # priorityClassName: high-priority # resources: # limits: diff --git a/deploy/crd.yaml b/deploy/crd.yaml index ac6e661060..ed3e3b1bfb 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest @@ -295,7 +295,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgbackups.pgv2.percona.com spec: group: pgv2.percona.com @@ -702,7 +702,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgclusters.pgv2.percona.com spec: group: pgv2.percona.com @@ -2186,6 +2186,9 @@ spec: x-kubernetes-list-type: atomic type: object type: object + backoffLimit: + format: int32 + type: integer priorityClassName: description: |- Priority class name for the pgBackRest backup Job pods. @@ -2253,6 +2256,13 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + restartPolicy: + description: |- + RestartPolicy describes how the container should be restarted. + Only one of the following restart policies may be specified. + If none of the following policies is specified, the default one + is RestartPolicyAlways. + type: string securityContext: description: SecurityContext defines the security settings for PGBackRest pod. @@ -18262,7 +18272,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgrestores.pgv2.percona.com spec: group: pgv2.percona.com @@ -18360,7 +18370,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgupgrades.pgv2.percona.com spec: group: pgv2.percona.com @@ -21072,7 +21082,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest @@ -22976,7 +22986,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest @@ -25677,7 +25687,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: 5.4.2 @@ -26998,6 +27008,9 @@ spec: x-kubernetes-list-type: atomic type: object type: object + backoffLimit: + format: int32 + type: integer priorityClassName: description: |- Priority class name for the pgBackRest backup Job pods. @@ -27065,6 +27078,13 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + restartPolicy: + description: |- + RestartPolicy describes how the container should be restarted. + Only one of the following restart policies may be specified. + If none of the following policies is specified, the default one + is RestartPolicyAlways. + type: string securityContext: description: SecurityContext defines the security settings for PGBackRest pod. diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index 1e0665f8ab..20b59c1c67 100644 --- a/deploy/cw-bundle.yaml +++ b/deploy/cw-bundle.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest @@ -295,7 +295,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgbackups.pgv2.percona.com spec: group: pgv2.percona.com @@ -702,7 +702,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgclusters.pgv2.percona.com spec: group: pgv2.percona.com @@ -2186,6 +2186,9 @@ spec: x-kubernetes-list-type: atomic type: object type: object + backoffLimit: + format: int32 + type: integer priorityClassName: description: |- Priority class name for the pgBackRest backup Job pods. @@ -2253,6 +2256,13 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + restartPolicy: + description: |- + RestartPolicy describes how the container should be restarted. + Only one of the following restart policies may be specified. + If none of the following policies is specified, the default one + is RestartPolicyAlways. + type: string securityContext: description: SecurityContext defines the security settings for PGBackRest pod. @@ -18262,7 +18272,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgrestores.pgv2.percona.com spec: group: pgv2.percona.com @@ -18360,7 +18370,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 name: perconapgupgrades.pgv2.percona.com spec: group: pgv2.percona.com @@ -21072,7 +21082,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest @@ -22976,7 +22986,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest @@ -25677,7 +25687,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.5 labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: 5.4.2 @@ -26998,6 +27008,9 @@ spec: x-kubernetes-list-type: atomic type: object type: object + backoffLimit: + format: int32 + type: integer priorityClassName: description: |- Priority class name for the pgBackRest backup Job pods. @@ -27065,6 +27078,13 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + restartPolicy: + description: |- + RestartPolicy describes how the container should be restarted. + Only one of the following restart policies may be specified. + If none of the following policies is specified, the default one + is RestartPolicyAlways. + type: string securityContext: description: SecurityContext defines the security settings for PGBackRest pod. diff --git a/e2e-tests/tests/upgrade-minor/05-assert.yaml b/e2e-tests/tests/upgrade-minor/05-assert.yaml index 478ec3551c..8d7c8c1cac 100644 --- a/e2e-tests/tests/upgrade-minor/05-assert.yaml +++ b/e2e-tests/tests/upgrade-minor/05-assert.yaml @@ -85,7 +85,7 @@ status: apiVersion: postgres-operator.crunchydata.com/v1beta1 kind: PostgresCluster metadata: - generation: 1 + generation: 2 # K8SPG-619 labels: e2e: upgrade-minor name: upgrade-minor @@ -103,7 +103,7 @@ status: readyReplicas: 3 replicas: 3 updatedReplicas: 3 - observedGeneration: 1 + observedGeneration: 2 pgbackrest: repoHost: apiVersion: apps/v1 @@ -135,4 +135,4 @@ status: size: 3 ready: 3 size: 3 - state: ready \ No newline at end of file + state: ready diff --git a/e2e-tests/tests/upgrade-minor/06-assert.yaml b/e2e-tests/tests/upgrade-minor/06-assert.yaml index 5367bb784c..b0ecfed7f7 100644 --- a/e2e-tests/tests/upgrade-minor/06-assert.yaml +++ b/e2e-tests/tests/upgrade-minor/06-assert.yaml @@ -112,7 +112,7 @@ status: apiVersion: postgres-operator.crunchydata.com/v1beta1 kind: PostgresCluster metadata: - generation: 2 + generation: 3 # K8SPG-619 labels: e2e: upgrade-minor name: upgrade-minor @@ -130,7 +130,7 @@ status: readyReplicas: 3 replicas: 3 updatedReplicas: 3 - observedGeneration: 2 + observedGeneration: 3 pgbackrest: repoHost: apiVersion: apps/v1 diff --git a/hack/controller-generator.sh b/hack/controller-generator.sh index 6216914599..6a7b603f25 100755 --- a/hack/controller-generator.sh +++ b/hack/controller-generator.sh @@ -22,6 +22,6 @@ set -eu # Find `controller-gen` on the current PATH or install it to the Go install path. tool="$(command -v controller-gen || true)" [ -n "$tool" ] || tool="$GOBIN/controller-gen" -[ -x "$tool" ] || go install 'sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.3' +[ -x "$tool" ] || go install 'sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.5' "$tool" "$@" diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go index 61587e0943..7c2ac7ee56 100644 --- a/internal/controller/postgrescluster/pgbackrest.go +++ b/internal/controller/postgrescluster/pgbackrest.go @@ -859,8 +859,16 @@ func generateBackupJobSpecIntent(ctx context.Context, postgresCluster *v1beta1.P if postgresCluster.Spec.Backups.PGBackRest.Jobs != nil { jobSpec.Template.Spec.Tolerations = postgresCluster.Spec.Backups.PGBackRest.Jobs.Tolerations jobSpec.Template.Spec.Affinity = postgresCluster.Spec.Backups.PGBackRest.Jobs.Affinity - jobSpec.Template.Spec.PriorityClassName = - initialize.FromPointer(postgresCluster.Spec.Backups.PGBackRest.Jobs.PriorityClassName) + jobSpec.Template.Spec.PriorityClassName = initialize.FromPointer(postgresCluster.Spec.Backups.PGBackRest.Jobs.PriorityClassName) + + // K8SPG-619 + if postgresCluster.Spec.Backups.PGBackRest.Jobs.RestartPolicy != "" { + jobSpec.Template.Spec.RestartPolicy = postgresCluster.Spec.Backups.PGBackRest.Jobs.RestartPolicy + } + // K8SPG-619 + if jobSpec.BackoffLimit != nil { + jobSpec.BackoffLimit = postgresCluster.Spec.Backups.PGBackRest.Jobs.BackoffLimit + } } // Set the image pull secrets, if any exist. diff --git a/percona/controller/pgcluster/controller_test.go b/percona/controller/pgcluster/controller_test.go index 95642a807e..3c7100419e 100644 --- a/percona/controller/pgcluster/controller_test.go +++ b/percona/controller/pgcluster/controller_test.go @@ -552,7 +552,7 @@ var _ = Describe("Watching secrets", Ordered, func() { } return false - }, time.Second*30, time.Millisecond*250).Should(Equal(true)) + }, time.Second*60, time.Millisecond*250).Should(Equal(true)) reconcileCount = getReconcileCount(crunchyR) }) }) diff --git a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go index 4a2aa1a6b6..0c49e631fc 100644 --- a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go +++ b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go @@ -219,6 +219,10 @@ func (cr *PerconaPGCluster) Default() { } cr.Spec.Backups.PGBackRest.Metadata.Labels[LabelOperatorVersion] = cr.Spec.CRVersion + if cr.Spec.Backups.PGBackRest.Jobs == nil { + cr.Spec.Backups.PGBackRest.Jobs = new(crunchyv1beta1.BackupJobs) + } + if cr.Spec.Extensions.BuiltIn.PGStatMonitor == nil { cr.Spec.Extensions.BuiltIn.PGStatMonitor = &t } diff --git a/pkg/apis/postgres-operator.crunchydata.com/v1beta1/pgbackrest_types.go b/pkg/apis/postgres-operator.crunchydata.com/v1beta1/pgbackrest_types.go index 3b578fb4d2..e297804e74 100644 --- a/pkg/apis/postgres-operator.crunchydata.com/v1beta1/pgbackrest_types.go +++ b/pkg/apis/postgres-operator.crunchydata.com/v1beta1/pgbackrest_types.go @@ -179,6 +179,12 @@ type BackupJobs struct { // SecurityContext defines the security settings for PGBackRest pod. // +optional SecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"` + + // +optional + BackoffLimit *int32 `json:"backoffLimit,omitempty"` // K8SPG-619 + + // +optional + RestartPolicy corev1.RestartPolicy `json:"restartPolicy,omitempty"` // K8SPG-619 } // PGBackRestManualBackup contains information that is used for creating a diff --git a/pkg/apis/postgres-operator.crunchydata.com/v1beta1/zz_generated.deepcopy.go b/pkg/apis/postgres-operator.crunchydata.com/v1beta1/zz_generated.deepcopy.go index 9b2b364be9..a30a97e478 100644 --- a/pkg/apis/postgres-operator.crunchydata.com/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/postgres-operator.crunchydata.com/v1beta1/zz_generated.deepcopy.go @@ -64,6 +64,11 @@ func (in *BackupJobs) DeepCopyInto(out *BackupJobs) { *out = new(corev1.PodSecurityContext) (*in).DeepCopyInto(*out) } + if in.BackoffLimit != nil { + in, out := &in.BackoffLimit, &out.BackoffLimit + *out = new(int32) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackupJobs.