Skip to content

Commit 50ed187

Browse files
tony-landrethtony-landreth
tony-landreth
authored andcommitted
Updates GH workflows test
The latest version discontinues pgadmin4 v4.30. This commit removes it from related images, updates to the latest developer images, and removes tests that rely on the old pgadmin image.
1 parent 4ce71d7 commit 50ed187

File tree

4 files changed

+27
-65
lines changed

4 files changed

+27
-65
lines changed

.github/workflows/test.yaml

+24-27
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ jobs:
6767
with:
6868
k3s-channel: "${{ matrix.kubernetes }}"
6969
prefetch-images: |
70-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.54.1-1
71-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-4
72-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.8-0
70+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.54.2-2513
71+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2513
72+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2513
7373
7474
- run: make createnamespaces check-envtest-existing
7575
env:
@@ -101,17 +101,15 @@ jobs:
101101
with:
102102
k3s-channel: "${{ matrix.kubernetes }}"
103103
prefetch-images: |
104-
registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-35
105-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.54.1-1
106-
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-4
107-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:latest
108-
registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:latest
109-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.8-0
110-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.8-3.3-0
111-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.8-3.4-0
112-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-17.4-0
113-
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-17.4-3.4-0
114-
registry.developers.crunchydata.com/crunchydata/postgres-operator:latest
104+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.54.2-2513
105+
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2513
106+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi9-0.16.0-2513
107+
registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-17.4-2513
108+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2513
109+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.3-2513
110+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.4-2513
111+
registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-17.4-2513
112+
registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-17.4-3.4-2513
115113
- run: go mod download
116114
- name: Build executable
117115
run: PGO_VERSION='${{ github.sha }}' make build-postgres-operator
@@ -133,18 +131,17 @@ jobs:
133131
--env 'CHECK_FOR_UPGRADES=false' \
134132
--env 'QUERIES_CONFIG_DIR=/mnt/hack/tools/queries' \
135133
--env 'KUBECONFIG=hack/.kube/postgres-operator/pgo' \
136-
--env 'RELATED_IMAGE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-35' \
137-
--env 'RELATED_IMAGE_PGBACKREST=registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.54.1-1' \
138-
--env 'RELATED_IMAGE_PGBOUNCER=registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-4' \
139-
--env 'RELATED_IMAGE_PGEXPORTER=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:latest' \
140-
--env 'RELATED_IMAGE_PGUPGRADE=registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:latest' \
141-
--env 'RELATED_IMAGE_POSTGRES_16=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.8-0' \
142-
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.3=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.8-3.3-0' \
143-
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.8-3.4-0' \
144-
--env 'RELATED_IMAGE_POSTGRES_17=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-17.4-0' \
145-
--env 'RELATED_IMAGE_POSTGRES_17_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-17.4-3.4-0' \
146-
--env 'RELATED_IMAGE_STANDALONE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.14-2' \
147-
--env 'RELATED_IMAGE_COLLECTOR=registry.developers.crunchydata.com/crunchydata/postgres-operator:latest' \
134+
--env 'RELATED_IMAGE_PGBACKREST=registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.54.2-2513' \
135+
--env 'RELATED_IMAGE_PGBOUNCER=registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.24-2513' \
136+
--env 'RELATED_IMAGE_PGEXPORTER=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi9-0.16.0-2513' \
137+
--env 'RELATED_IMAGE_PGUPGRADE=registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-17.4-2513' \
138+
--env 'RELATED_IMAGE_POSTGRES_16=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2513' \
139+
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.3=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.3-2513' \
140+
--env 'RELATED_IMAGE_POSTGRES_16_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.8-3.4-2513' \
141+
--env 'RELATED_IMAGE_POSTGRES_17=registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-17.4-2513' \
142+
--env 'RELATED_IMAGE_POSTGRES_17_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-17.4-3.4-2513' \
143+
--env 'RELATED_IMAGE_STANDALONE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi9-9.1-2513' \
144+
--env 'RELATED_IMAGE_COLLECTOR=registry.developers.crunchydata.com/crunchydata/postgres-operator:ubi9-5.8.0-0' \
148145
--env 'PGO_FEATURE_GATES=TablespaceVolumes=true,OpenTelemetryLogs=true,OpenTelemetryMetrics=true' \
149146
--name 'postgres-operator' ubuntu \
150147
postgres-operator
@@ -159,7 +156,7 @@ jobs:
159156
KUTTL_PG_UPGRADE_TO_VERSION: '17'
160157
KUTTL_PG_VERSION: '16'
161158
KUTTL_POSTGIS_VERSION: '3.4'
162-
KUTTL_PSQL_IMAGE: 'registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.6-2'
159+
KUTTL_PSQL_IMAGE: 'registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2513'
163160
- run: |
164161
make check-kuttl && exit
165162
failed=$?

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,11 @@ check-kuttl: ## example command: make check-kuttl KUTTL_TEST='
225225
--config testing/kuttl/kuttl-test.yaml
226226

227227
.PHONY: generate-kuttl
228-
generate-kuttl: export KUTTL_PG_UPGRADE_FROM_VERSION ?= 15
229-
generate-kuttl: export KUTTL_PG_UPGRADE_TO_VERSION ?= 16
228+
generate-kuttl: export KUTTL_PG_UPGRADE_FROM_VERSION ?= 16
229+
generate-kuttl: export KUTTL_PG_UPGRADE_TO_VERSION ?= 17
230230
generate-kuttl: export KUTTL_PG_VERSION ?= 16
231231
generate-kuttl: export KUTTL_POSTGIS_VERSION ?= 3.4
232-
generate-kuttl: export KUTTL_PSQL_IMAGE ?= registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.8-0
232+
generate-kuttl: export KUTTL_PSQL_IMAGE ?= registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.8-2513
233233
generate-kuttl: export KUTTL_TEST_DELETE_NAMESPACE ?= kuttl-test-delete-namespace
234234
generate-kuttl: ## Generate kuttl tests
235235
[ ! -d testing/kuttl/e2e-generated ] || rm -r testing/kuttl/e2e-generated

testing/kuttl/e2e/security-context/00--cluster.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ spec:
1818
proxy:
1919
pgBouncer:
2020
replicas: 1
21-
userInterface:
22-
pgAdmin:
23-
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
2421
monitoring:
2522
pgmonitor:
2623
exporter: {}

testing/kuttl/e2e/security-context/00-assert.yaml

-32
Original file line numberDiff line numberDiff line change
@@ -92,38 +92,6 @@ spec:
9292
readOnlyRootFilesystem: true
9393
runAsNonRoot: true
9494
---
95-
# pgAdmin
96-
apiVersion: v1
97-
kind: Pod
98-
metadata:
99-
labels:
100-
postgres-operator.crunchydata.com/cluster: security-context
101-
postgres-operator.crunchydata.com/data: pgadmin
102-
postgres-operator.crunchydata.com/role: pgadmin
103-
statefulset.kubernetes.io/pod-name: security-context-pgadmin-0
104-
name: security-context-pgadmin-0
105-
spec:
106-
containers:
107-
- name: pgadmin
108-
securityContext:
109-
allowPrivilegeEscalation: false
110-
privileged: false
111-
readOnlyRootFilesystem: true
112-
runAsNonRoot: true
113-
initContainers:
114-
- name: pgadmin-startup
115-
securityContext:
116-
allowPrivilegeEscalation: false
117-
privileged: false
118-
readOnlyRootFilesystem: true
119-
runAsNonRoot: true
120-
- name: nss-wrapper-init
121-
securityContext:
122-
allowPrivilegeEscalation: false
123-
privileged: false
124-
readOnlyRootFilesystem: true
125-
runAsNonRoot: true
126-
---
12795
# pgBouncer
12896
apiVersion: v1
12997
kind: Pod

0 commit comments

Comments
 (0)