K8SPG-611: official postgres image support (#1212)

pooknull · nmarukovich · egegunes · web-flow · commit d44a9260957c · 2025-09-29T13:01:28.000+03:00
* K8SPG-611: official postgres image support https://perconadev.atlassian.net/browse/K8SPG-611 * fix custom-extensions test * fix init-deploy test * all tests passed reverting version changes * revert image changes * fix merge * fix custom-extensions test * fix test * use official image in tests --------- Co-authored-by: Natalia Marukovich <nmarukovich@gmail.com> Co-authored-by: Ege Güneş <ege.gunes@percona.com>
diff --git a/build/postgres-operator/Dockerfile b/build/postgres-operator/Dockerfile
@@ -62,6 +62,7 @@ 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/relocate-extensions.sh /usr/local/bin
 COPY build/postgres-operator/init-entrypoint.sh /usr/local/bin
 COPY build/postgres-operator/postgres-entrypoint.sh /usr/local/bin
 COPY build/postgres-operator/postgres-liveness-check.sh /usr/local/bin
diff --git a/build/postgres-operator/init-entrypoint.sh b/build/postgres-operator/init-entrypoint.sh
@@ -9,3 +9,4 @@ install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "/usr/local/bin/pgbackrest" "${CR
 install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "/usr/local/bin/postgres-entrypoint.sh" "${CRUNCHY_BINDIR}/bin/postgres-entrypoint.sh"
 install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "/usr/local/bin/postgres-liveness-check.sh" "${CRUNCHY_BINDIR}/bin/postgres-liveness-check.sh"
 install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "/usr/local/bin/postgres-readiness-check.sh" "${CRUNCHY_BINDIR}/bin/postgres-readiness-check.sh"
+install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "/usr/local/bin/relocate-extensions.sh" "${CRUNCHY_BINDIR}/bin/relocate-extensions.sh"
diff --git a/build/postgres-operator/relocate-extensions.sh b/build/postgres-operator/relocate-extensions.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+PG_EXTENSIONS_DIR=/usr/pgsql-${PG_VERSION}/share/extension
+PG_LIB_DIR=/usr/pgsql-${PG_VERSION}/lib
+
+PGDATA_EXTENSIONS_DIR=/pgdata/extension/${PG_VERSION}/usr/pgsql-${PG_VERSION}/share/extension
+PGDATA_LIB_DIR=/pgdata/extension/${PG_VERSION}/usr/pgsql-${PG_VERSION}/lib
+
+mkdir -p "${PGDATA_EXTENSIONS_DIR}"
+mkdir -p "${PGDATA_LIB_DIR}"
+
+cp -r "${PG_EXTENSIONS_DIR}"/* "${PGDATA_EXTENSIONS_DIR}/"
+cp -r "${PG_LIB_DIR}"/* "${PGDATA_LIB_DIR}/"
diff --git a/e2e-tests/tests/custom-extensions/02-assert.yaml b/e2e-tests/tests/custom-extensions/02-assert.yaml
@@ -19,13 +19,17 @@ spec:
   template:
     spec:
       initContainers:
+      - command:
+        - /usr/local/bin/init-entrypoint.sh
       - name: postgres-startup
       - command:
-        - /usr/local/bin/relocate-extensions.sh
+        - /opt/crunchy/bin/relocate-extensions.sh
         resources: {}
         volumeMounts:
         - mountPath: /pgdata
           name: postgres-data
+        - mountPath: /opt/crunchy
+          name: crunchy-bin
         - mountPath: /tmp
           name: tmp
       - command:
@@ -56,8 +60,6 @@ spec:
         - name: postgres-data
         - mountPath: /tmp
           name: tmp
-      - command:
-        - /usr/local/bin/init-entrypoint.sh
       - name: nss-wrapper-init
 status:
   observedGeneration: 2
diff --git a/e2e-tests/tests/custom-extensions/05-assert.yaml b/e2e-tests/tests/custom-extensions/05-assert.yaml
@@ -19,13 +19,17 @@ spec:
   template:
     spec:
       initContainers:
+      - command:
+        - /usr/local/bin/init-entrypoint.sh
       - name: postgres-startup
       - command:
-        - /usr/local/bin/relocate-extensions.sh
+        - /opt/crunchy/bin/relocate-extensions.sh
         resources: {}
         volumeMounts:
         - mountPath: /pgdata
           name: postgres-data
+        - mountPath: /opt/crunchy
+          name: crunchy-bin
         - mountPath: /tmp
           name: tmp
       - command:
@@ -56,8 +60,6 @@ spec:
         - name: postgres-data
         - mountPath: /tmp
           name: tmp
-      - command:
-        - /usr/local/bin/init-entrypoint.sh
       - name: nss-wrapper-init
 status:
   observedGeneration: 2
diff --git a/e2e-tests/tests/custom-extensions/06-assert.yaml b/e2e-tests/tests/custom-extensions/06-assert.yaml
@@ -1,6 +1,6 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 180
+timeout: 240
 ---
 kind: StatefulSet
 apiVersion: apps/v1
@@ -19,15 +19,19 @@ spec:
   template:
     spec:
       initContainers:
+      - command:
+        - /usr/local/bin/init-entrypoint.sh
       - name: postgres-startup
       - command:
-        - /usr/local/bin/relocate-extensions.sh
+        - /opt/crunchy/bin/relocate-extensions.sh
         env:
         - name: PG_VERSION
         resources: {}
         volumeMounts:
         - mountPath: /pgdata
           name: postgres-data
+        - mountPath: /opt/crunchy
+          name: crunchy-bin
         - mountPath: /tmp
           name: tmp
       - command:
@@ -58,8 +62,6 @@ spec:
         - name: postgres-data
         - mountPath: /tmp
           name: tmp
-      - command:
-        - /usr/local/bin/init-entrypoint.sh
       - name: nss-wrapper-init
 status:
   observedGeneration: 3
diff --git a/e2e-tests/tests/custom-extensions/07-assert.yaml b/e2e-tests/tests/custom-extensions/07-assert.yaml
@@ -19,13 +19,13 @@ spec:
   template:
     spec:
       initContainers:
+      - command:
+        - /usr/local/bin/init-entrypoint.sh
       - name: postgres-startup
       - command:
-        - /usr/local/bin/relocate-extensions.sh
+        - /opt/crunchy/bin/relocate-extensions.sh
       - command:
         - /usr/local/bin/install-extensions.sh
-      - command:
-        - /usr/local/bin/init-entrypoint.sh
       - name: nss-wrapper-init
 status:
   observedGeneration: 3
diff --git a/e2e-tests/tests/custom-extensions/11-assert.yaml b/e2e-tests/tests/custom-extensions/11-assert.yaml
@@ -19,15 +19,11 @@ spec:
   template:
     spec:
       initContainers:
+      - command:
+        - /usr/local/bin/init-entrypoint.sh
       - name: postgres-startup
       - command:
-        - /usr/local/bin/relocate-extensions.sh
-        resources: {}
-        volumeMounts:
-        - mountPath: /pgdata
-          name: postgres-data
-        - mountPath: /tmp
-          name: tmp
+        - /opt/crunchy/bin/relocate-extensions.sh
       - command:
         - /usr/local/bin/install-extensions.sh
         env:
@@ -52,8 +48,6 @@ spec:
         - name: postgres-data
         - mountPath: /tmp
           name: tmp
-      - command:
-        - /usr/local/bin/init-entrypoint.sh
       - name: nss-wrapper-init
 status:
   observedGeneration: 5
diff --git a/e2e-tests/tests/custom-extensions/14-assert.yaml b/e2e-tests/tests/custom-extensions/14-assert.yaml
@@ -19,15 +19,11 @@ spec:
   template:
     spec:
       initContainers:
+      - command:
+        - /usr/local/bin/init-entrypoint.sh
       - name: postgres-startup
       - command:
-        - /usr/local/bin/relocate-extensions.sh
-        resources: {}
-        volumeMounts:
-        - mountPath: /pgdata
-          name: postgres-data
-        - mountPath: /tmp
-          name: tmp
+        - /opt/crunchy/bin/relocate-extensions.sh
       - command:
         - /usr/local/bin/install-extensions.sh
         env:
@@ -52,8 +48,6 @@ spec:
         - name: postgres-data
         - mountPath: /tmp
           name: tmp
-      - command:
-        - /usr/local/bin/init-entrypoint.sh
       - name: nss-wrapper-init
 status:
   observedGeneration: 5
diff --git a/e2e-tests/tests/custom-extensions/15-assert.yaml b/e2e-tests/tests/custom-extensions/15-assert.yaml
@@ -19,15 +19,11 @@ spec:
   template:
     spec:
       initContainers:
+      - command:
+        - /usr/local/bin/init-entrypoint.sh
       - name: postgres-startup
       - command:
-        - /usr/local/bin/relocate-extensions.sh
-        resources: {}
-        volumeMounts:
-        - mountPath: /pgdata
-          name: postgres-data
-        - mountPath: /tmp
-          name: tmp
+        - /opt/crunchy/bin/relocate-extensions.sh
       - command:
         - /usr/local/bin/install-extensions.sh
         env:
@@ -52,8 +48,6 @@ spec:
         - name: postgres-data
         - mountPath: /tmp
           name: tmp
-      - command:
-        - /usr/local/bin/init-entrypoint.sh
       - name: nss-wrapper-init
 status:
   observedGeneration: 6
diff --git a/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml b/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml
@@ -9,7 +9,7 @@ commands:
       source ../../functions
 
       get_cr \
-        | yq eval '
-            .spec.crVersion="2.6.0"' - \
+        | yq eval '.spec.crVersion="2.6.0"' - \
+        | yq eval ".spec.image=\"${IMAGE_BASE}:main-ppg$PG_VER-postgres\"" - \
         | yq eval ".spec.backups.pgbackrest.image=\"${IMAGE_BASE}:main-ppg$PG_VER-pgbackrest\"" - \
         | kubectl -n "${NAMESPACE}" apply -f -
diff --git a/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml b/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml
@@ -11,6 +11,7 @@ commands:
       get_cr \
         | yq eval '
             .spec.crVersion="2.7.0"' - \
+        | yq eval ".spec.image=\"${IMAGE_BASE}:main-ppg$PG_VER-postgres\"" - \
         | kubectl -n "${NAMESPACE}" apply -f -
 
       sleep 10
diff --git a/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml b/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml
@@ -11,7 +11,6 @@ commands:
       get_cr \
         | yq eval '
             .spec.crVersion="2.8.0"' - \
-        | yq eval ".spec.backups.pgbackrest.image=\"$IMAGE_BACKREST\"" - \
         | kubectl -n "${NAMESPACE}" apply -f -
 
       sleep 10
diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh
@@ -25,7 +25,7 @@ export IMAGE_BASE=${IMAGE_BASE:-"perconalab/percona-postgresql-operator"}
 export IMAGE=${IMAGE:-"${IMAGE_BASE}:${VERSION}"}
 export PG_VER="${PG_VER:-17}"
 export IMAGE_PGBOUNCER=${IMAGE_PGBOUNCER:-"${IMAGE_BASE}:main-pgbouncer$PG_VER"}
-export IMAGE_POSTGRESQL=${IMAGE_POSTGRESQL:-"${IMAGE_BASE}:main-ppg$PG_VER-postgres"}
+export IMAGE_POSTGRESQL=${IMAGE_POSTGRESQL:-"perconalab/percona-distribution-postgresql:$PG_VER"}
 export IMAGE_BACKREST=${IMAGE_BACKREST:-"${IMAGE_BASE}:main-pgbackrest$PG_VER"}
 export IMAGE_UPGRADE=${IMAGE_UPGRADE:-"${IMAGE_BASE}:main-upgrade"}
 export BUCKET=${BUCKET:-"pg-operator-testing"}
diff --git a/internal/patroni/reconcile.go b/internal/patroni/reconcile.go
@@ -147,14 +147,21 @@ func InstancePod(ctx context.Context,
 
 // K8SPG-708 instanceInitContainer adds the instance init container
 func instanceInitContainer(cluster *v1beta1.PostgresCluster, container *corev1.Container, instancePod *corev1.PodTemplateSpec, inInstanceSpec *v1beta1.PostgresInstanceSetSpec, initImage string) {
-	instancePod.Spec.InitContainers = append(instancePod.Spec.InitContainers, k8s.InitContainer(
+	initContainer := k8s.InitContainer(
 		cluster,
 		naming.ContainerDatabase,
 		initImage,
 		cluster.Spec.ImagePullPolicy,
 		initialize.RestrictedSecurityContext(true),
 		container.Resources,
-		inInstanceSpec))
+		inInstanceSpec)
+
+	if cluster.CompareVersion("2.8.0") >= 0 {
+		// The operator's init container must be the first one to run so that the other init containers can use the installed scripts.
+		instancePod.Spec.InitContainers = append([]corev1.Container{initContainer}, instancePod.Spec.InitContainers...)
+	} else {
+		instancePod.Spec.InitContainers = append(instancePod.Spec.InitContainers, initContainer)
+	}
 
 	instancePod.Spec.Volumes = append(instancePod.Spec.Volumes, corev1.Volume{
 		Name: pNaming.CrunchyBinVolumeName,
@@ -171,7 +178,6 @@ func instanceInitContainer(cluster *v1beta1.PostgresCluster, container *corev1.C
 
 // instanceProbes adds Patroni liveness and readiness probes to container.
 func instanceProbes(cluster *v1beta1.PostgresCluster, container *corev1.Container) {
-
 	// Patroni uses a watchdog to ensure that PostgreSQL does not accept commits
 	// after the leader lock expires, even if Patroni becomes unresponsive.
 	// - https://github.com/zalando/patroni/blob/v2.0.1/docs/watchdog.rst
diff --git a/percona/extensions/containers.go b/percona/extensions/containers.go
@@ -6,6 +6,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
+	"github.com/percona/percona-postgresql-operator/percona/naming"
 	pgv2 "github.com/percona/percona-postgresql-operator/pkg/apis/pgv2.percona.com/v2"
 )
 
@@ -15,24 +16,36 @@ func GetExtensionKey(pgMajor int, name, version string) string {
 
 // RelocatorContainer returns a container that will relocate extensions from the base image (i.e. pg_stat_monitor, pg_audit)
 // to the data directory so we don't lose them when user adds a custom extension.
-func RelocatorContainer(_ *pgv2.PerconaPGCluster, image string, imagePullPolicy corev1.PullPolicy, postgresVersion int) corev1.Container {
+func RelocatorContainer(cr *pgv2.PerconaPGCluster, image string, imagePullPolicy corev1.PullPolicy, postgresVersion int) corev1.Container {
+	mounts := []corev1.VolumeMount{
+		{
+			Name:      "postgres-data",
+			MountPath: "/pgdata",
+		},
+	}
+
+	command := "/usr/local/bin/relocate-extensions.sh"
+
+	if cr.CompareVersion("2.8.0") >= 0 {
+		command = "/opt/crunchy/bin/relocate-extensions.sh"
+		mounts = append(mounts, corev1.VolumeMount{
+			Name:      naming.CrunchyBinVolumeName,
+			MountPath: naming.CrunchyBinVolumePath,
+		})
+	}
+
 	return corev1.Container{
 		Name:            fmt.Sprintf("extension-relocator-%d", postgresVersion),
 		Image:           image,
 		ImagePullPolicy: imagePullPolicy,
-		Command:         []string{"/usr/local/bin/relocate-extensions.sh"},
+		Command:         []string{command},
 		Env: []corev1.EnvVar{
 			{
 				Name:  "PG_VERSION",
 				Value: strconv.Itoa(postgresVersion),
 			},
 		},
-		VolumeMounts: []corev1.VolumeMount{
-			{
-				Name:      "postgres-data",
-				MountPath: "/pgdata",
-			},
-		},
+		VolumeMounts: mounts,
 	}
 }
 
