K8SPG-724: fix extension reinstall

build/postgres-operator/install-extensions.sh

@@ -16,19 +16,6 @@ if [[ -n $STORAGE_ENDPOINT ]]; then
 	args+=(-endpoint "$STORAGE_ENDPOINT")
 fi
 
-for key in "${extensions[@]}"; do
-	if [ -f "${PGDATA_EXTENSIONS}"/"${key}".installed ]; then
-		echo "Extension ${key} already installed"
-		continue
-	fi
-
-	echo "Installing extension: ${key}"
-	/usr/local/bin/extension-installer \
-		"${args[@]}" \
-		-key "${key}" \
-		-install
-done
-
 for installed in "${PGDATA_EXTENSIONS}"/*.installed; do
 	filename=$(basename -- "${installed}")
 	key=${filename%.*}
@@ -45,3 +32,16 @@ for installed in "${PGDATA_EXTENSIONS}"/*.installed; do
 		rm -f "${installed}"
 	fi
 done
+
+for key in "${extensions[@]}"; do
+	if [ -f "${PGDATA_EXTENSIONS}"/"${key}".installed ]; then
+		echo "Extension ${key} already installed"
+		continue
+	fi
+
+	echo "Installing extension: ${key}"
+	/usr/local/bin/extension-installer \
+		"${args[@]}" \
+		-key "${key}" \
+		-install
+done

e2e-tests/tests/custom-extensions/02-install-pg_cron.yaml

@@ -11,4 +11,4 @@ spec:
     dynamicConfiguration:
       postgresql:
         parameters:
-          shared_preload_libraries: pg_cron
+          shared_preload_libraries: pg_cron

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

@@ -22,8 +22,6 @@ spec:
       - name: postgres-startup
       - command:
         - /usr/local/bin/relocate-extensions.sh
-        env:
-        - name: PG_VERSION
         resources: {}
         volumeMounts:
         - mountPath: /pgdata
@@ -58,7 +56,7 @@ spec:
         - /usr/local/bin/init-entrypoint.sh
       - name: nss-wrapper-init
 status:
-  observedGeneration: 3
+  observedGeneration: 2
   replicas: 1
   updatedReplicas: 1
   readyReplicas: 1

e2e-tests/tests/custom-extensions/06-update-pg_cron.yaml

@@ -0,0 +1,14 @@
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGCluster
+metadata:
+  name: custom-extensions
+spec:
+  extensions:
+    custom:
+    - name: pg_cron
+      version: 1.6.4
+  patroni:
+    dynamicConfiguration:
+      postgresql:
+        parameters:
+          shared_preload_libraries: pg_cron

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

@@ -22,8 +22,36 @@ spec:
       - name: postgres-startup
       - command:
         - /usr/local/bin/relocate-extensions.sh
+        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_ENDPOINT
+        - 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
+        resources: {}
+        volumeMounts:
+        - mountPath: /pgdata
+          name: postgres-data
+        - name: postgres-data
+        - name: postgres-data
+        - mountPath: /tmp
+          name: tmp
       - command:
         - /usr/local/bin/init-entrypoint.sh
       - name: nss-wrapper-init

e2e-tests/tests/custom-extensions/07-restart-cluster.yaml

@@ -6,7 +6,7 @@ commands:
       set -o xtrace
 
       source ../../functions
-
+      
       wait_cluster_consistency custom-extensions
 
       restart_pg_pods custom-extensions instance1

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

@@ -5,8 +5,9 @@ timeout: 30
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: 10-check-extensions
+  name: 08-check-extensions
 data:
   data: |2-
+     pg_cron
      pg_stat_monitor
      pgaudit

e2e-tests/tests/custom-extensions/08-check-extensions.yaml

@@ -10,4 +10,4 @@ commands:
 
       data=$(kubectl -n ${NAMESPACE} exec $(get_client_pod) -- psql -v ON_ERROR_STOP=1 -t -q postgres://postgres:$(get_psql_user_pass custom-extensions-pguser-postgres)@$(get_psql_user_host custom-extensions-pguser-postgres) -c "\c postgres" -c "select name from pg_available_extensions where name in ('pg_cron','pg_stat_monitor','pgaudit') order by name")
 
-      kubectl create configmap -n "${NAMESPACE}" 10-check-extensions --from-literal=data="${data}"
+      kubectl create configmap -n "${NAMESPACE}" 08-check-extensions --from-literal=data="${data}"

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

@@ -1,13 +1,82 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 30
+timeout: 300
 ---
-kind: ConfigMap
-apiVersion: v1
+kind: StatefulSet
+apiVersion: apps/v1
 metadata:
-  name: 11-check-extensions
-data:
-  data: |2-
-     pg_stat_monitor
-     pgaudit
-     plpgsql
+  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
+      - command:
+        - /usr/local/bin/relocate-extensions.sh
+        env:
+        - name: PG_VERSION
+        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_ENDPOINT
+        - 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
+        resources: {}
+        volumeMounts:
+        - mountPath: /pgdata
+          name: postgres-data
+        - name: postgres-data
+        - name: postgres-data
+        - mountPath: /tmp
+          name: tmp
+      - command:
+        - /usr/local/bin/init-entrypoint.sh
+      - name: nss-wrapper-init
+status:
+  observedGeneration: 4
+  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

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

@@ -0,0 +1,52 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+timeout: 120
+---
+kind: StatefulSet
+apiVersion: apps/v1
+metadata:
+  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
+      - command:
+        - /usr/local/bin/relocate-extensions.sh
+      - command:
+        - /usr/local/bin/install-extensions.sh
+      - command:
+        - /usr/local/bin/init-entrypoint.sh
+      - name: nss-wrapper-init
+status:
+  observedGeneration: 4
+  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

e2e-tests/tests/custom-extensions/05-restart-cluster.yaml → e2e-tests/tests/custom-extensions/10-restart-cluster.yaml

@@ -6,7 +6,7 @@ commands:
       set -o xtrace
 
       source ../../functions
-      
+
       wait_cluster_consistency custom-extensions
 
       restart_pg_pods custom-extensions instance1

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

@@ -0,0 +1,12 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+timeout: 30
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: 11-check-extensions
+data:
+  data: |2-
+     pg_stat_monitor
+     pgaudit

e2e-tests/tests/custom-extensions/11-check-extensions.yaml

@@ -0,0 +1,13 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+timeout: 30
+commands:
+  - script: |-
+      set -o errexit
+      set -o xtrace
+
+      source ../../functions
+
+      data=$(kubectl -n ${NAMESPACE} exec $(get_client_pod) -- psql -v ON_ERROR_STOP=1 -t -q postgres://postgres:$(get_psql_user_pass custom-extensions-pguser-postgres)@$(get_psql_user_host custom-extensions-pguser-postgres) -c "\c postgres" -c "select name from pg_available_extensions where name in ('pg_cron','pg_stat_monitor','pgaudit') order by name")
+
+      kubectl create configmap -n "${NAMESPACE}" 11-check-extensions --from-literal=data="${data}"

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

@@ -0,0 +1,13 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+timeout: 30
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: 12-check-extensions
+data:
+  data: |2-
+     pg_stat_monitor
+     pgaudit
+     plpgsql

e2e-tests/tests/custom-extensions/09-check-installed-extensions.yaml → e2e-tests/tests/custom-extensions/12-check-installed-extensions.yaml

@@ -10,4 +10,4 @@ commands:
 
       data=$(kubectl -n ${NAMESPACE} exec $(get_client_pod) -- psql -v ON_ERROR_STOP=1 -t -q postgres://postgres:$(get_psql_user_pass custom-extensions-pguser-postgres)@$(get_psql_user_host custom-extensions-pguser-postgres) -c "\c postgres" -c "select extname from pg_extension order by extname")
 
-      kubectl create configmap -n "${NAMESPACE}" 11-check-extensions --from-literal=data="${data}"
+      kubectl create configmap -n "${NAMESPACE}" 12-check-extensions --from-literal=data="${data}"