Merge branch 'main' into K8SPG-613-test

Author: hors

.github/workflows/reviewdog.yml

@@ -16,6 +16,20 @@ jobs:
           only-new-issues: true
           args: --timeout 5m
 
+  goimports-reviser:
+    name: runner / suggester / goimports-reviser
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '^1.23'
+      - run: go install -v github.com/incu6us/goimports-reviser/v3@latest
+      - run: $(go env GOPATH)/bin/goimports-reviser -imports-order "std,general,company,project" -company-prefixes "github.com/percona" ./...
+      - uses: reviewdog/action-suggester@v1
+        with:
+          tool_name: goimports-reviser
+
   gofmt:
     name: runner / suggester / gofmt
     runs-on: ubuntu-latest

.github/workflows/scan.yml

@@ -31,7 +31,7 @@ jobs:
           make build-docker-image
 
       - name: Run Trivy vulnerability scanner image (linux/arm64)
-        uses: aquasecurity/trivy-action@0.29.0
+        uses: aquasecurity/trivy-action@0.30.0
         with:
           image-ref: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-arm64'
           format: 'table'
@@ -50,7 +50,7 @@ jobs:
           make build-docker-image
 
       - name: Run Trivy vulnerability scanner image (linux/amd64)
-        uses: aquasecurity/trivy-action@0.29.0
+        uses: aquasecurity/trivy-action@0.30.0
         with:
           image-ref: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-amd64'
           format: 'table'

.github/workflows/test.yml

@@ -3,7 +3,7 @@ on: [pull_request]
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Clone the code
         uses: actions/checkout@v4

.golangci.yaml

@@ -6,6 +6,7 @@ linters:
     - errchkjson
     - gci
     - gofumpt
+    - goimports
   enable:
     - depguard
     - gomodguard
@@ -49,9 +50,6 @@ linters-settings:
   exhaustive:
     default-signifies-exhaustive: true
 
-  goimports:
-    local-prefixes: github.com/percona/percona-postgresql-operator
-
   gomodguard:
     blocked:
       modules:

Makefile

@@ -326,6 +326,7 @@ generate-crd: generate-crunchy-crd generate-percona-crd
 	$(KUSTOMIZE) build ./config/crd/ > ./deploy/crd.yaml
 
 generate-percona-crd:
+	go generate ./percona/...
 	GOBIN='$(CURDIR)/hack/tools' ./hack/controller-generator.sh \
 		crd:crdVersions='v1' \
 		paths='./pkg/apis/pgv2.percona.com/...' \

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
@@ -8352,6 +8354,8 @@ spec:
                 properties:
                   pgAudit:
                     type: boolean
+                  pgRepack:
+                    type: boolean
                   pgStatMonitor:
                     type: boolean
                   pgStatStatements:
@@ -8400,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

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
@@ -8066,6 +8068,8 @@ spec:
                     properties:
                       pg_audit:
                         type: boolean
+                      pg_repack:
+                        type: boolean
                       pg_stat_monitor:
                         type: boolean
                       pgvector:
@@ -8201,6 +8205,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
@@ -13633,6 +13639,8 @@ spec:
                     - Never
                     - IfNotPresent
                     type: string
+                  postgresParams:
+                    type: string
                   querySource:
                     default: pgstatmonitor
                     enum:

build/postgres-operator/Dockerfile

@@ -27,15 +27,19 @@ RUN mkdir -p build/_output/bin \
         apt-get update -y && apt-get install gcc-x86-64-linux-gnu -y && export CC=x86_64-linux-gnu-gcc; \
       fi \
    && CGO_ENABLED=$OPERATOR_CGO_ENABLED GOARCH=${TARGETARCH} GOOS=$GOOS GO_LDFLAGS=$GO_LDFLAGS \
-       go build -ldflags "-w -s -X main.GitCommit=$GIT_COMMIT -X main.GitBranch=$GIT_BRANCH" \
+       go build -ldflags "-w -s -X main.GitCommit=$GIT_COMMIT -X main.GitBranch=$GIT_BRANCH -X main.BuildTime=$BUILD_TIME" \
            -o build/_output/bin/postgres-operator \
                ./cmd/postgres-operator \
     && CGO_ENABLED=$EXTENSION_INSTALLER_CGO_ENABLED GOARCH=${TARGETARCH} GOOS=$GOOS GO_LDFLAGS=$GO_LDFLAGS \
-       go build -ldflags "-w -s -X main.GitCommit=$GIT_COMMIT -X main.GitBranch=$GIT_BRANCH" \
+       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"