K8SPG-375: Merge extension installer image into operator (#573)

* K8SPG-375: Merge extension installer image into operator

* fix tests

* fix openshift

* detect openshift

* don't use hardcoded postgres version

* don't use hardcoded postgres version

Author: egegunes

build/extension-installer/Dockerfile

@@ -15,7 +15,12 @@ RUN mkdir -p build/_output/bin \
        go build -ldflags "-w -s -X main.GitCommit=$GIT_COMMIT -X main.GitBranch=$GIT_BRANCH" \
            -o build/_output/bin/postgres-operator \
                ./cmd/postgres-operator \
-    && cp -r build/_output/bin/postgres-operator /usr/local/bin/postgres-operator
+    && CGO_ENABLED=$CGO_ENABLED GOOS=$GOOS GO_LDFLAGS=$GO_LDFLAGS \
+       go build -ldflags "-w -s -X main.GitCommit=$GIT_COMMIT -X main.GitBranch=$GIT_BRANCH" \
+           -o build/_output/bin/extension-installer \
+               ./cmd/extension-installer \
+    && cp -r build/_output/bin/postgres-operator /usr/local/bin/postgres-operator \
+    && cp -r build/_output/bin/extension-installer /usr/local/bin/extension-installer
 
 
 RUN ./bin/license_aggregator.sh ./cmd/...; \
@@ -34,7 +39,9 @@ RUN microdnf update -y && microdnf clean all -y
 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 /licenses /licenses
+COPY build/postgres-operator/install-extensions.sh /usr/local/bin
 
 USER 2
 

build/postgres-operator/Dockerfile

@@ -167,6 +167,7 @@ func addControllersToManager(ctx context.Context, mgr manager.Manager) error {
 		Platform:          detectPlatform(ctx, mgr.GetConfig()),
 		KubeVersion:       getServerVersion(ctx, mgr.GetConfig()),
 		CrunchyController: cm.Controller(),
+		IsOpenShift:       isOpenshift(ctx, mgr.GetConfig()),
 	}
 	if err := pc.SetupWithManager(mgr); err != nil {
 		return err

build/extension-installer/install-extensions.sh build/postgres-operator/install-extensions.sh

@@ -283,7 +283,7 @@ spec:
 #          work_mem: 2MB
 
 #  extensions:
-#    image: perconalab/percona-postgresql-operator:main-ext-installer
+#    image: perconalab/percona-postgresql-operator:main
 #    imagePullPolicy: Always
 #    storage:
 #      type: s3

cmd/postgres-operator/main.go

@@ -154,9 +154,7 @@ get_cr() {
 			;;
 		custom-extensions)
 			yq eval '
-				.spec.postgresVersion = 15
-				| .spec.image = "'${IMAGE_BASE}:k8spg-375-ppg15-postgres'"
-				| .spec.extensions.image = "'${IMAGE_EXT_INSTALLER}'"
+				.spec.extensions.image = "'${IMAGE}'"
 				| .spec.extensions.imagePullPolicy = "Always"
 				| .spec.extensions.storage = {"type": "s3", "bucket": "pg-extensions", "region": "eu-central-1", "secret": {"name": "aws-s3-secret"}}
 			' "${TEMP_DIR}/cr.yaml" \

deploy/cr.yaml

@@ -22,9 +22,6 @@ spec:
       - name: postgres-startup
       - command:
         - /usr/local/bin/relocate-extensions.sh
-        env:
-        - name: PG_VERSION
-          value: "15"
         name: extension-relocator
         resources: {}
         volumeMounts:
@@ -42,11 +39,8 @@ spec:
         - name: STORAGE_BUCKET
           value: pg-extensions
         - name: INSTALL_EXTENSIONS
-          value: pg_cron-pg15-1.6.1
         - name: PG_VERSION
-          value: "15"
         - name: PGDATA_EXTENSIONS
-          value: /pgdata/extension/15
         envFrom:
         - secretRef:
             name: aws-s3-secret
@@ -55,12 +49,8 @@ spec:
         volumeMounts:
         - mountPath: /pgdata
           name: postgres-data
-        - mountPath: /usr/pgsql-15/share/extension
-          name: postgres-data
-          subPath: extension/15/usr/pgsql-15/share/extension
-        - mountPath: /usr/pgsql-15/lib
-          name: postgres-data
-          subPath: extension/15/usr/pgsql-15/lib
+        - name: postgres-data
+        - name: postgres-data
         - mountPath: /tmp
           name: tmp
       - name: nss-wrapper-init

e2e-tests/functions

@@ -43,6 +43,7 @@ data:
      pg_cron
      pg_freespacemap
      pg_prewarm
+     pg_repack
      pg_stat_monitor
      pg_stat_statements
      pg_surgery

e2e-tests/tests/custom-extensions/02-assert.yaml

@@ -22,9 +22,6 @@ spec:
       - name: postgres-startup
       - command:
         - /usr/local/bin/relocate-extensions.sh
-        env:
-        - name: PG_VERSION
-          value: "15"
         name: extension-relocator
         resources: {}
         volumeMounts:
@@ -42,11 +39,8 @@ spec:
         - name: STORAGE_BUCKET
           value: pg-extensions
         - name: INSTALL_EXTENSIONS
-          value: pg_cron-pg15-1.6.1,timescaledb-pg15-2.11.2
         - name: PG_VERSION
-          value: "15"
         - name: PGDATA_EXTENSIONS
-          value: /pgdata/extension/15
         envFrom:
         - secretRef:
             name: aws-s3-secret
@@ -55,20 +49,17 @@ spec:
         volumeMounts:
         - mountPath: /pgdata
           name: postgres-data
-        - mountPath: /usr/pgsql-15/share/extension
-          name: postgres-data
-          subPath: extension/15/usr/pgsql-15/share/extension
-        - mountPath: /usr/pgsql-15/lib
-          name: postgres-data
-          subPath: extension/15/usr/pgsql-15/lib
+        - name: postgres-data
+        - name: postgres-data
         - mountPath: /tmp
           name: tmp
       - name: nss-wrapper-init
 status:
-  observedGeneration: 3
+  observedGeneration: 2
   replicas: 1
   updatedReplicas: 1
   readyReplicas: 1
+  availableReplicas: 1
 ---
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGCluster
@@ -85,4 +76,4 @@ status:
       size: 3
     ready: 3
     size: 3
-  state: ready
+  state: ready

e2e-tests/tests/custom-extensions/04-assert.yaml

@@ -20,8 +20,41 @@ spec:
     spec:
       initContainers:
       - name: postgres-startup
-      - name: extension-relocator
-      - name: extension-installer
+      - command:
+        - /usr/local/bin/relocate-extensions.sh
+        env:
+        - name: PG_VERSION
+        name: extension-relocator
+        resources: {}
+        volumeMounts:
+        - mountPath: /pgdata
+          name: postgres-data
+        - mountPath: /tmp
+          name: tmp
+      - command:
+        - /usr/local/bin/install-extensions.sh
+        env:
+        - name: STORAGE_TYPE
+          value: s3
+        - name: STORAGE_REGION
+          value: eu-central-1
+        - name: STORAGE_BUCKET
+          value: pg-extensions
+        - name: INSTALL_EXTENSIONS
+        - name: PG_VERSION
+        - name: PGDATA_EXTENSIONS
+        envFrom:
+        - secretRef:
+            name: aws-s3-secret
+        name: extension-installer
+        resources: {}
+        volumeMounts:
+        - mountPath: /pgdata
+          name: postgres-data
+        - name: postgres-data
+        - name: postgres-data
+        - mountPath: /tmp
+          name: tmp
       - name: nss-wrapper-init
 status:
   observedGeneration: 3

e2e-tests/tests/custom-extensions/05-assert.yaml

@@ -4,10 +4,9 @@ metadata:
   name: custom-extensions
 spec:
   extensions:
-    custom:
-    - name: pg_cron
-      version: 1.6.1
+    custom: []
   patroni:
     dynamicConfiguration:
       postgresql:
-        shared_preload_libraries: pg_cron
+        parameters:
+          shared_preload_libraries: ""

e2e-tests/tests/custom-extensions/05-install-timescaledb.yaml

@@ -1,70 +1,48 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 30
+timeout: 120
 ---
-kind: ConfigMap
-apiVersion: v1
+kind: StatefulSet
+apiVersion: apps/v1
 metadata:
-  name: 07-check-extensions
-data:
-  data: |2-
-     adminpack
-     amcheck
-     autoinc
-     bloom
-     btree_gin
-     btree_gist
-     citext
-     cube
-     dblink
-     dict_int
-     dict_xsyn
-     earthdistance
-     file_fdw
-     fuzzystrmatch
-     hstore
-     hstore_plperl
-     hstore_plperlu
-     hstore_plpython3u
-     insert_username
-     intagg
-     intarray
-     isn
-     jsonb_plperl
-     jsonb_plperlu
-     jsonb_plpython3u
-     lo
-     ltree
-     ltree_plpython3u
-     moddatetime
-     old_snapshot
-     pageinspect
-     pg_buffercache
-     pg_cron
-     pg_freespacemap
-     pg_prewarm
-     pg_stat_monitor
-     pg_stat_statements
-     pg_surgery
-     pg_trgm
-     pg_visibility
-     pg_walinspect
-     pgaudit
-     pgcrypto
-     pgrowlocks
-     pgstattuple
-     plpgsql
-     plpython3u
-     postgres_fdw
-     refint
-     seg
-     set_user
-     sslinfo
-     tablefunc
-     tcn
-     timescaledb
-     tsm_system_rows
-     tsm_system_time
-     unaccent
-     uuid-ossp
-     xml2
+  labels:
+    postgres-operator.crunchydata.com/cluster: custom-extensions
+    postgres-operator.crunchydata.com/data: postgres
+    postgres-operator.crunchydata.com/instance-set: instance1
+  ownerReferences:
+    - apiVersion: postgres-operator.crunchydata.com/v1beta1
+      kind: PostgresCluster
+      name: custom-extensions
+      controller: true
+      blockOwnerDeletion: true
+spec:
+  template:
+    spec:
+      initContainers:
+      - name: postgres-startup
+      - name: extension-relocator
+      - name: extension-installer
+      - name: nss-wrapper-init
+status:
+  observedGeneration: 3
+  replicas: 1
+  updatedReplicas: 1
+  readyReplicas: 1
+  availableReplicas: 1
+---
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGCluster
+metadata:
+  name: custom-extensions
+status:
+  pgbouncer:
+    ready: 3
+    size: 3
+  postgres:
+    instances:
+    - name: instance1
+      ready: 3
+      size: 3
+    ready: 3
+    size: 3
+  state: ready