SCF-861: Upstream master sync 2026-08-13

.github/ISSUE_TEMPLATE/postgres-operator-issue-template.md

@@ -9,7 +9,7 @@ assignees: ''
 
 Please, answer some short questions which should help us to understand your problem / question better?
 
-- **Which image of the operator are you using?** e.g. ghcr.io/zalando/postgres-operator:v1.15.1
+- **Which image of the operator are you using?** e.g. ghcr.io/zalando/postgres-operator:v2.0.1
 - **Where do you run it - cloud or metal? Kubernetes or OpenShift?** [AWS K8s | GCP ... | Bare Metal K8s]
 - **Are you running Postgres Operator in production?** [yes | no]
 - **Type of issue?** [Bug report, question, feature request, etc.]

.github/workflows/build-and-push.yml

@@ -8,11 +8,8 @@ on:
     branches:
       - 'scalefield_v*'
   push:
-    paths-ignore:
-      - '**.md'
-      - 'docs/**'
-    branches:
-      - 'scalefield_v*'
+    tags:
+      - '*'
   workflow_dispatch:
     inputs:
       image_tags:
@@ -38,6 +35,14 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: "^1.26.4"
+
+      - name: Run unit tests
+        run: make mocks && go test -race ./...
+
       - name: Determine tags
         id: tags
         run: |

.github/workflows/publish_ghcr_image.yaml

@@ -8,7 +8,7 @@ env:
 on:
   push:
     tags:
-      - '*'
+      - 'never-publish-scalefield-*'
 
 jobs:
   publish:
@@ -19,11 +19,11 @@ jobs:
       packages: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v6
         with:
-          go-version: "^1.25.3"
+          go-version: "^1.26.4"
 
       - name: Run unit tests
         run: make test
@@ -34,6 +34,12 @@ jobs:
             OPERATOR_IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_REF/refs\/tags\//}"
             echo "OPERATOR_IMAGE=$OPERATOR_IMAGE" >> $GITHUB_OUTPUT
 
+      - name: Define pooler image name
+        id: image_pooler
+        run: |
+            POOLER_IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/pgbouncer:${GITHUB_REF/refs\/tags\//}"
+            echo "POOLER_IMAGE=$POOLER_IMAGE" >> $GITHUB_OUTPUT
+
       - name: Define UI image name
         id: image_ui
         run: |
@@ -47,20 +53,20 @@ jobs:
             echo "BACKUP_IMAGE=$BACKUP_IMAGE" >> $GITHUB_OUTPUT
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to GHCR
-        uses: docker/login-action@v2
+        uses: docker/login-action@v4
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push multiarch operator image to ghcr
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v7
         with:
           context: .
           file: docker/Dockerfile
@@ -69,8 +75,17 @@ jobs:
           tags: "${{ steps.image.outputs.OPERATOR_IMAGE }}"
           platforms: linux/amd64,linux/arm64
 
+      - name: Build and push multiarch pooler image to ghcr
+        uses: docker/build-push-action@v7
+        with:
+          context: pooler
+          push: true
+          build-args: BASE_IMAGE=alpine:3.22
+          tags: "${{ steps.image_pooler.outputs.POOLER_IMAGE }}"
+          platforms: linux/amd64,linux/arm64
+
       - name: Build and push multiarch ui image to ghcr
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v7
         with:
           context: ui
           push: true
@@ -79,10 +94,22 @@ jobs:
           platforms: linux/amd64,linux/arm64
 
       - name: Build and push multiarch logical-backup image to ghcr
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v7
         with:
           context: logical-backup
           push: true
           build-args: BASE_IMAGE=ubuntu:22.04
           tags: "${{ steps.image_lb.outputs.BACKUP_IMAGE }}"
           platforms: linux/amd64,linux/arm64
+
+      - name: Build and push postgres-operator chart to ghcr
+        run: |
+          helm package charts/postgres-operator
+          helm push postgres-operator-*.tgz oci://${{ env.REGISTRY }}/zalando/charts
+          rm -rf postgres-operator-*.tgz
+
+      - name: Build and push postgres-operator-ui chart to ghcr
+        run: |
+          helm package charts/postgres-operator-ui
+          helm push postgres-operator-ui-*.tgz oci://${{ env.REGISTRY }}/zalando/charts
+          rm -rf postgres-operator-ui-*.tgz

.github/workflows/run_e2e.yaml

@@ -3,24 +3,31 @@ name: operator-e2e-tests
 on:
   workflow_call:
   pull_request:
-  push:
     branches:
-    - master
+      - scalefield_v*
+  workflow_dispatch:
 
 jobs:
   tests:
     name: End-2-End tests
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-go@v2
+    - uses: actions/checkout@v6
+    - uses: actions/setup-go@v6
       with:
-          go-version: "^1.25.3"
+          go-version: "^1.26.4"
     - name: Make dependencies
       run: make mocks
     - name: Code generation
       run: make codegen
     - name: Run unit tests
       run: make test
+    - name: Pre-pull heavy images directly on Kind nodes
+      run: |
+        FOR_NODE=$(kind get nodes --name postgres-operator-e2e-tests 2>/dev/null || true)
+        for node in $FOR_NODE; do
+          echo "Pulling Spilo image on node $node..."
+          docker exec "$node" crictl pull ghcr.io/zalando/spilo-18:4.1-p2
+        done
     - name: Run end-2-end tests
       run: make e2e

.github/workflows/run_tests.yaml

@@ -1,30 +1,30 @@
 name: operator-tests
 
-on: 
+on:
   pull_request:
-  push:
     branches:
-    - master
+      - scalefield_v*
+  workflow_dispatch:
 
 jobs:
   tests:
     name: Unit tests and coverage
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-go@v2
+    - uses: actions/checkout@v6
+    - uses: actions/setup-go@v6
       with:
-          go-version: "^1.25.3"
+          go-version: "^1.26.4"
     - name: Make dependencies
       run: make mocks
     - name: Compile
       run: make linux
     - name: Run unit tests
       run: go test -race -covermode atomic -coverprofile=coverage.out ./...
     - name: Convert coverage to lcov
-      uses: jandelgado/gcov2lcov-action@v1.1.1
+      uses: jandelgado/gcov2lcov-action@v1.2.0
     - name: Coveralls
-      uses: coverallsapp/github-action@master
+      uses: coverallsapp/github-action@v2.3.4
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
-        path-to-lcov: coverage.lcov
+        file: coverage.lcov

.gitignore

@@ -26,7 +26,6 @@ _testmain.go
 *.test
 *.prof
 /vendor/
-/kubectl-pg/vendor/
 /build/
 /docker/build/
 /github.com/

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2025 Zalando SE
+Copyright (c) 2026 Zalando SE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,7 +1,8 @@
-.PHONY: clean local test linux macos mocks docker push e2e
+.PHONY: clean local test linux macos mocks docker pooler push e2e
 
 BINARY ?= postgres-operator
 BUILD_FLAGS ?= -v
+GOARCH ?= amd64
 CGO_ENABLED ?= 0
 ifeq ($(RACE),1)
 	BUILD_FLAGS += -race -a
@@ -28,16 +29,19 @@ PKG := `go list ./... | grep -v /vendor/`
 
 ifeq ($(DEBUG),1)
 	DOCKERFILE = DebugDockerfile
-	DEBUG_POSTFIX := -debug-$(shell date hhmmss)
+	DEBUG_POSTFIX := -debug-$(shell date +"%H%M%S")
 	BUILD_FLAGS += -gcflags "-N -l"
 else
 	DOCKERFILE = Dockerfile
 endif
 
+
 ifeq ($(FRESH),1)
   DEBUG_FRESH=$(shell date +"%H-%M-%S")
 endif
 
+SED := $(shell command -v gsed 2>/dev/null || command -v sed)
+
 ifdef CDP_PULL_REQUEST_NUMBER
 	CDP_TAG := -${CDP_BUILD_VERSION}
 endif
@@ -49,6 +53,7 @@ endif
 PATH 		:= $(GOPATH)/bin:$(PATH)
 SHELL 		:= env PATH="$(PATH)" $(SHELL)
 IMAGE_TAG 	:= $(IMAGE):$(TAG)$(CDP_TAG)$(DEBUG_FRESH)$(DEBUG_POSTFIX)
+POOLER_TAG 	:= $(IMAGE)/pgbouncer:$(TAG)$(CDP_TAG)$(DEBUG_FRESH)$(DEBUG_POSTFIX)
 
 default: local
 
@@ -65,38 +70,47 @@ $(GENERATED): go.mod $(CRD_SOURCES)
 
 $(GENERATED_CRDS): $(GENERATED)
 	go tool controller-gen crd:crdVersions=v1,allowDangerousTypes=true paths=./pkg/apis/acid.zalan.do/... output:crd:dir=manifests
-	# only generate postgresteam.crd.yaml and postgresql.crd.yaml for now
-	@rm manifests/acid.zalan.do_operatorconfigurations.yaml
 	@mv manifests/acid.zalan.do_postgresqls.yaml manifests/postgresql.crd.yaml
 	@# hack to use lowercase kind and listKind
-	@sed -i -e 's/kind: Postgresql/kind: postgresql/' manifests/postgresql.crd.yaml
-	@sed -i -e 's/listKind: PostgresqlList/listKind: postgresqlList/' manifests/postgresql.crd.yaml
+	@$(SED) -i -e 's/kind: Postgresql/kind: postgresql/' manifests/postgresql.crd.yaml
+	@$(SED) -i -e 's/listKind: PostgresqlList/listKind: postgresqlList/' manifests/postgresql.crd.yaml
 	@hack/adjust_postgresql_crd.sh
+	@mv manifests/acid.zalan.do_operatorconfigurations.yaml manifests/operatorconfiguration.crd.yaml
 	@mv manifests/acid.zalan.do_postgresteams.yaml manifests/postgresteam.crd.yaml
 	@cp manifests/postgresql.crd.yaml pkg/apis/acid.zalan.do/v1/postgresql.crd.yaml
+	@cp manifests/postgresql.crd.yaml charts/postgres-operator/crds/postgresqls.yaml
+	@cp manifests/operatorconfiguration.crd.yaml pkg/apis/acid.zalan.do/v1/operatorconfiguration.crd.yaml
+	@cp manifests/operatorconfiguration.crd.yaml charts/postgres-operator/crds/operatorconfigurations.yaml
+	@cp manifests/postgresteam.crd.yaml charts/postgres-operator/crds/postgresteams.yaml
 
 local: ${SOURCES} $(GENERATED_CRDS)
 	CGO_ENABLED=${CGO_ENABLED} go build -o build/${BINARY} $(LOCAL_BUILD_FLAGS) -ldflags "$(LDFLAGS)" $(SOURCES)
 
+wasm: ${SOURCES} $(GENERATED_CRDS)
+	GOOS=wasip1 GOARCH=wasm CGO_ENABLED=${CGO_ENABLED} go build -o build/${BINARY}.wasm ${BUILD_FLAGS} -ldflags "$(LDFLAGS)" $(SOURCES)
+
 linux: ${SOURCES} $(GENERATED_CRDS)
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=${CGO_ENABLED} go build -o build/linux/${BINARY} ${BUILD_FLAGS} -ldflags "$(LDFLAGS)" $(SOURCES)
+	GOOS=linux GOARCH=${GOARCH} CGO_ENABLED=${CGO_ENABLED} go build -o build/linux/${BINARY} ${BUILD_FLAGS} -ldflags "$(LDFLAGS)" $(SOURCES)
 
 macos: ${SOURCES} $(GENERATED_CRDS)
-	GOOS=darwin GOARCH=amd64 CGO_ENABLED=${CGO_ENABLED} go build -o build/macos/${BINARY} ${BUILD_FLAGS} -ldflags "$(LDFLAGS)" $(SOURCES)
+	GOOS=darwin GOARCH=${GOARCH} CGO_ENABLED=${CGO_ENABLED} go build -o build/macos/${BINARY} ${BUILD_FLAGS} -ldflags "$(LDFLAGS)" $(SOURCES)
 
 docker: $(GENERATED_CRDS) ${DOCKERDIR}/${DOCKERFILE}
 	echo `(env)`
 	echo "Tag ${TAG}"
 	echo "Version ${VERSION}"
 	echo "CDP tag ${CDP_TAG}"
 	echo "git describe $(shell git describe --tags --always --dirty)"
-	docker build --rm -t "$(IMAGE_TAG)" -f "${DOCKERDIR}/${DOCKERFILE}" --build-arg VERSION="${VERSION}" --build-arg BASE_IMAGE="${BASE_IMAGE}" .
+	docker buildx build --load --rm -t "$(IMAGE_TAG)" -f "${DOCKERDIR}/${DOCKERFILE}" --build-arg VERSION="${VERSION}" --build-arg BASE_IMAGE="${BASE_IMAGE}" .
+
+pooler:
+	cd pooler; docker buildx build --load --rm -t "$(POOLER_TAG)" --build-arg VERSION="${VERSION}" --build-arg BASE_IMAGE="${BASE_IMAGE}" .
 
 indocker-race:
-	docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.25.3 bash -c "make linux"
+	docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.26.4 bash -c "make linux"
 
 mocks:
-	GO111MODULE=on go generate ./...
+	go generate ./...
 
 fmt:
 	@gofmt -l -w -s $(DIRS)
@@ -106,9 +120,9 @@ vet:
 	@staticcheck $(PKG)
 
 test: mocks $(GENERATED) $(GENERATED_CRDS)
-	GO111MODULE=on go test ./...
+	go test ./...
 
 codegen: $(GENERATED)
 
-e2e: docker # build operator image to be tested
+e2e: docker pooler # build operator and pooler images to be tested
 	cd e2e; make e2etest

README.md

@@ -20,13 +20,14 @@ pipelines with no access to Kubernetes API directly, promoting infrastructure as
 * Pod protection during bootstrap phase and configurable maintenance windows
 * Restore and cloning Postgres clusters on AWS, GCS and Azure
 * Additionally logical backups to S3 or GCS bucket can be configured
-* Standby cluster from S3 or GCS WAL archive
+* Standby cluster from S3 or GCS WAL archive or remote host
 * Hibernate and wake-up of Postgres clusters (scale StatefulSet and pooler to 0 while preserving data, then restore)
 * Configurable for non-cloud environments
 * Basic credential and user management on K8s, eases application deployments
 * Support for custom TLS certificates
 * UI to create and edit Postgres cluster manifests
 * Compatible with OpenShift
+* Multi-arch support
 
 ### PostgreSQL features
 
@@ -64,22 +65,21 @@ production for over five years.
 
 | Release   | Postgres versions | K8s versions      | Golang  |
 | :-------- | :---------------: | :---------------: | :-----: |
+| v2.0.1    | 14 → 18      | 1.27+             | 1.26.4  |
 | v1.15.1   | 13 → 17      | 1.27+             | 1.25.3  |
 | v1.14.0   | 13 → 17      | 1.27+             | 1.23.4  |
 | v1.13.0   | 12 → 16      | 1.27+             | 1.22.5  |
 | v1.12.0   | 11 → 16      | 1.27+             | 1.22.3  |
 | v1.11.0   | 11 → 16      | 1.27+             | 1.21.7  |
-| v1.10.1   | 10 → 15      | 1.21+             | 1.19.8  |
 
 ## Getting started
 
 For a quick first impression follow the instructions of this
 [tutorial](docs/quickstart.md).
 
-## Supported setups of Postgres and Applications
+## Migrating from v1 to v2 operator
 
-![Features](docs/diagrams/neutral_operator_dark.png#gh-dark-mode-only)
-![Features](docs/diagrams/neutral_operator_light.png#gh-light-mode-only)
+If you have been using Postgres Operator since v1.x (thank you), make sure you have read the [migration docs](docs/migrate.md) before deploying a v2 operator.
 
 ## Documentation
 

charts/postgres-operator-ui/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: postgres-operator-ui
-version: 1.15.1
-appVersion: 1.15.1
+version: 2.0.1
+appVersion: 2.0.1
 home: https://github.com/zalando/postgres-operator
 description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience
 keywords: