Merge branch 'main' into dependabot/go_modules/sigs.k8s.io/controller-runtime-0.20.4

Author: gkech

Makefile

@@ -120,6 +120,7 @@ uninstall: ## Delete the postgrescluster CRD
 deploy: ## Deploy the PostgreSQL Operator (enables the postgrescluster controller)
 	yq eval '(.spec.template.spec.containers[] | select(.name=="operator")).image = "$(IMAGE)"' ./deploy/operator.yaml \
 		| yq eval '(.spec.template.spec.containers[] | select(.name=="operator") | .env[] | select(.name=="DISABLE_TELEMETRY") | .value) = "true"' - \
+		| yq eval '(.spec.template.spec.containers[] | select(.name=="operator") | .env[] | select(.name=="LOG_LEVEL") | .value) = "DEBUG"' - \
 		| kubectl apply -f -
 
 .PHONY: undeploy

build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml

@@ -389,6 +389,8 @@ spec:
                           pgBackRest repository hosts and backups. The image may also be set using
                           the RELATED_IMAGE_PGBACKREST environment variable
                         type: string
+                      initImage:
+                        type: string
                       jobs:
                         description: Jobs field allows configuration for all backup
                           jobs
@@ -8402,6 +8404,8 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              initImage:
+                type: string
               instances:
                 description: |-
                   Specifies one or more sets of PostgreSQL pods that replicate data for
@@ -14019,6 +14023,15 @@ spec:
                 type: boolean
               patroni:
                 properties:
+                  createReplicaMethods:
+                    description: CreateReplicaMethods allows overriding create_replica_methods
+                      for all instances.
+                    items:
+                      enum:
+                      - basebackup
+                      - pgbackrest
+                      type: string
+                    type: array
                   dynamicConfiguration:
                     description: |-
                       Patroni dynamic configuration settings. Changes to this value will be

build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml

@@ -545,6 +545,8 @@ spec:
                           pgBackRest repository hosts and backups. The image may also be set using
                           the RELATED_IMAGE_PGBACKREST environment variable
                         type: string
+                      initImage:
+                        type: string
                       jobs:
                         description: Jobs field allows configuration for all backup
                           jobs
@@ -8070,6 +8072,8 @@ spec:
                         type: boolean
                       pg_stat_monitor:
                         type: boolean
+                      pg_stat_statements:
+                        type: boolean
                       pgvector:
                         type: boolean
                     type: object
@@ -8203,6 +8207,8 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              initImage:
+                type: string
               instances:
                 description: |-
                   Specifies one or more sets of PostgreSQL pods that replicate data for
@@ -13349,6 +13355,15 @@ spec:
                 type: boolean
               patroni:
                 properties:
+                  createReplicaMethods:
+                    description: CreateReplicaMethods allows overriding create_replica_methods
+                      for all instances.
+                    items:
+                      enum:
+                      - basebackup
+                      - pgbackrest
+                      type: string
+                    type: array
                   dynamicConfiguration:
                     description: |-
                       Patroni dynamic configuration settings. Changes to this value will be

build/postgres-operator/Dockerfile

@@ -34,8 +34,12 @@ RUN mkdir -p build/_output/bin \
        go build -ldflags "-w -s -X main.GitCommit=$GIT_COMMIT -X main.GitBranch=$GIT_BRANCH -X main.BuildTime=$BUILD_TIME" \
            -o build/_output/bin/extension-installer \
                ./cmd/extension-installer \
+    && CGO_ENABLED=$PGBACKREST_CGO_ENABLED GOARCH=${TARGETARCH} GOOS=$GOOS GO_LDFLAGS=$GO_LDFLAGS \
+        go build \
+            -o build/_output/bin/pgbackrest ./cmd/pgbackrest \
     && cp -r build/_output/bin/postgres-operator /usr/local/bin/postgres-operator \
-    && cp -r build/_output/bin/extension-installer /usr/local/bin/extension-installer
+    && cp -r build/_output/bin/extension-installer /usr/local/bin/extension-installer \
+    && cp -r build/_output/bin/pgbackrest /usr/local/bin/pgbackrest
 
 
 RUN ./bin/license_aggregator.sh ./cmd/...; \
@@ -55,8 +59,10 @@ COPY licenses /licenses
 
 COPY --from=go_builder /usr/local/bin/postgres-operator /usr/local/bin
 COPY --from=go_builder /usr/local/bin/extension-installer /usr/local/bin
+COPY --from=go_builder /usr/local/bin/pgbackrest /usr/local/bin/
 COPY --from=go_builder /licenses /licenses
 COPY build/postgres-operator/install-extensions.sh /usr/local/bin
+COPY build/postgres-operator/init-entrypoint.sh /usr/local/bin
 COPY hack/tools/queries /opt/crunchy/conf
 
 RUN chgrp -R 0 /opt/crunchy/conf && chmod -R g=u opt/crunchy/conf

build/postgres-operator/init-entrypoint.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o xtrace
+
+CRUNCHY_BINDIR="/opt/crunchy"
+
+install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "/usr/local/bin/pgbackrest" "${CRUNCHY_BINDIR}/bin/pgbackrest"