diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 7e5c21a7b4..569e1b64c2 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -23,29 +23,27 @@ spec: - name: CRUNCHY_DEBUG value: "true" - name: RELATED_IMAGE_POSTGRES_16 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.8-0" + value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2513" - name: RELATED_IMAGE_POSTGRES_16_GIS_3.3 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.8-3.3-0" + value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.3-2513" - name: RELATED_IMAGE_POSTGRES_16_GIS_3.4 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.8-3.4-0" + value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.4-2513" - name: RELATED_IMAGE_POSTGRES_17 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-17.4-0" + value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.4-2513" - name: RELATED_IMAGE_POSTGRES_17_GIS_3.4 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-17.4-3.4-0" - - name: RELATED_IMAGE_PGADMIN - value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-35" + value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-17.4-3.5-2513" - name: RELATED_IMAGE_PGBACKREST - value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.54.1-1" + value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.54.2-2513" - name: RELATED_IMAGE_PGBOUNCER - value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-4" + value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2513" - name: RELATED_IMAGE_PGEXPORTER - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:latest" + value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi9-0.16.0-2513" - name: RELATED_IMAGE_PGUPGRADE - value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:latest" + value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-17.4-2513" - name: RELATED_IMAGE_STANDALONE_PGADMIN - value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.14-2" + value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi9-9.1-2513" - name: RELATED_IMAGE_COLLECTOR - value: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.119.0" + value: "registry.developers.crunchydata.com/crunchydata/postgres-operator:ubi9-5.8.0-0" securityContext: allowPrivilegeEscalation: false capabilities: { drop: [ALL] } diff --git a/testing/kuttl/e2e/pgadmin/01--cluster.yaml b/testing/kuttl/e2e/pgadmin/01--cluster.yaml deleted file mode 100644 index d1afb7be04..0000000000 --- a/testing/kuttl/e2e/pgadmin/01--cluster.yaml +++ /dev/null @@ -1,40 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: test-cm -data: - configMap: config ---- -apiVersion: v1 -kind: Secret -metadata: - name: test-secret -type: Opaque -stringData: - password: myPassword ---- -# Create a cluster with a configured pgAdmin UI. -apiVersion: postgres-operator.crunchydata.com/v1beta1 -kind: PostgresCluster -metadata: - name: interfaced - labels: { postgres-operator-test: kuttl } -spec: - postgresVersion: ${KUTTL_PG_VERSION} - instances: - - name: instance1 - replicas: 1 - dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - userInterface: - pgAdmin: - dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - config: - files: - - secret: - name: test-secret - - configMap: - name: test-cm - settings: - SHOW_GRAVATAR_IMAGE: False - LOGIN_BANNER: | - Custom KUTTL Login Banner diff --git a/testing/kuttl/e2e/pgadmin/01-assert.yaml b/testing/kuttl/e2e/pgadmin/01-assert.yaml deleted file mode 100644 index e4192a1217..0000000000 --- a/testing/kuttl/e2e/pgadmin/01-assert.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -apiVersion: postgres-operator.crunchydata.com/v1beta1 -kind: PostgresCluster -metadata: - name: interfaced -status: - instances: - - name: instance1 - replicas: 1 - readyReplicas: 1 - updatedReplicas: 1 - ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: interfaced-pgadmin -status: - replicas: 1 - readyReplicas: 1 - updatedReplicas: 1 - ---- -apiVersion: v1 -kind: Secret -metadata: - name: test-secret ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: test-cm diff --git a/testing/kuttl/e2e/pgadmin/02--check-settings.yaml b/testing/kuttl/e2e/pgadmin/02--check-settings.yaml deleted file mode 100644 index c68d032d1e..0000000000 --- a/testing/kuttl/e2e/pgadmin/02--check-settings.yaml +++ /dev/null @@ -1,56 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - # Log the amount of space on the startup volume. Assert that 4KiB are used. - - script: | - kubectl exec --namespace "${NAMESPACE}" statefulset.apps/interfaced-pgadmin \ - -- df --block-size=1K /etc/pgadmin | - awk '{ print } END { exit ($3 != "4") }' - - # Assert that current settings contain values from the spec. - - script: | - SETTINGS=$( - kubectl exec --namespace "${NAMESPACE}" statefulset.apps/interfaced-pgadmin \ - -- cat /etc/pgadmin/conf.d/~postgres-operator/pgadmin.json - ) - - contains() { bash -ceu '[[ "$1" == *"$2"* ]]' - "$@"; } - { - contains "${SETTINGS}" '"LOGIN_BANNER": "Custom KUTTL Login Banner\n"' && - contains "${SETTINGS}" '"SHOW_GRAVATAR_IMAGE": false' - } || { - echo >&2 'Wrong settings!' - echo "${SETTINGS}" - exit 1 - } - - - script: | - CONTENTS=$( - kubectl exec --namespace "${NAMESPACE}" statefulset.apps/interfaced-pgadmin \ - -- cat /etc/pgadmin/conf.d/configMap - ) - - contains() { bash -ceu '[[ "$1" == *"$2"* ]]' - "$@"; } - { - contains "${CONTENTS}" 'config' - } || { - echo >&2 'Wrong settings!' - echo "${CONTENTS}" - exit 1 - } - - - script: | - CONTENTS=$( - kubectl exec --namespace "${NAMESPACE}" statefulset.apps/interfaced-pgadmin \ - -- cat /etc/pgadmin/conf.d/password - ) - - contains() { bash -ceu '[[ "$1" == *"$2"* ]]' - "$@"; } - { - contains "${CONTENTS}" 'myPassword' - } || { - echo >&2 'Wrong settings!' - echo "${CONTENTS}" - exit 1 - }