Merge branch 'main' into K8SPG-612-pgbouncer

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'

.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/percona/generated/pgv2.percona.com_perconapgclusters.yaml

@@ -13617,6 +13617,8 @@ spec:
                             type: string
                         type: object
                     type: object
+                  customClusterName:
+                    type: string
                   enabled:
                     type: boolean
                   image:
@@ -13631,6 +13633,8 @@ spec:
                     - Never
                     - IfNotPresent
                     type: string
+                  postgresParams:
+                    type: string
                   querySource:
                     default: pgstatmonitor
                     enum:

build/postgres-operator/Dockerfile

@@ -27,11 +27,11 @@ 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 \
     && cp -r build/_output/bin/postgres-operator /usr/local/bin/postgres-operator \

cmd/postgres-operator/main.go

@@ -8,6 +8,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	goruntime "runtime"
 	"strconv"
 	"strings"
 	"time"
@@ -47,7 +48,12 @@ import (
 	"github.com/percona/percona-postgresql-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
-var versionString string
+var (
+	GitCommit     string
+	GitBranch     string
+	BuildTime     string
+	versionString string
+)
 
 // assertNoError panics when err is not nil.
 func assertNoError(err error) {
@@ -74,6 +80,9 @@ func main() {
 	log := logging.FromContext(ctx)
 	log.V(1).Info("debug flag set to true")
 
+	log.Info("Manager starting up", "gitCommit", GitCommit, "gitBranch", GitBranch,
+		"buildTime", BuildTime, "goVersion", goruntime.Version(), "os", goruntime.GOOS, "arch", goruntime.GOARCH)
+
 	features := feature.NewGate()
 	err = features.SetFromMap(map[string]bool{
 		string(feature.InstanceSidecars):  true, // needed for PMM

config/crd/bases/pgv2.percona.com_perconapgclusters.yaml

@@ -14022,6 +14022,8 @@ spec:
                             type: string
                         type: object
                     type: object
+                  customClusterName:
+                    type: string
                   enabled:
                     type: boolean
                   image:
@@ -14036,6 +14038,8 @@ spec:
                     - Never
                     - IfNotPresent
                     type: string
+                  postgresParams:
+                    type: string
                   querySource:
                     default: pgstatmonitor
                     enum:

config/crd/kustomization.yaml

@@ -7,3 +7,8 @@ resources:
 - bases/pgv2.percona.com_perconapgclusters.yaml
 - bases/postgres-operator.crunchydata.com_pgupgrades.yaml
 - bases/postgres-operator.crunchydata.com_pgadmins.yaml
+
+patchesStrategicMerge:
+- patches/versionlabel_in_perconapgclusters.yaml
+- patches/versionlabel_in_perconapgbackups.yaml
+- patches/versionlabel_in_perconapgrestores.yaml

config/crd/patches/versionlabel_in_perconapgbackups.yaml

@@ -0,0 +1,6 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: perconapgbackups.pgv2.percona.com
+  labels:
+    pgv2.percona.com/version: v2.7.0