Commit 4ac7832
authored
fix(pgadmin): switch standalone pgAdmin to python3.12 site-packages path (#4500)
* fix(pgadmin): switch standalone pgAdmin to python3.12 site-packages path
The new internal-registry pgAdmin image
(registry.internal.crunchydata.com/gitlab/crunchy-pgadmin4-ubi9@sha256:
b10575053e71e820ae15747f5e11e543296f0dafeb5513bbf44a8053b5cd7c1a) ships
pgadmin4 under /usr/local/lib/python3.12/site-packages/pgadmin4. The
previous developers.crunchydata.com image was on python3.11, so the
operator hard-codes that path. The startup script generated by the
operator does `cd "$PGADMIN_DIR"`, which fails on the new image with:
cd: /usr/local/lib/python3.11/site-packages/pgadmin4:
No such file or directory
The container exits 1 immediately and the pod ends up in
CrashLoopBackOff. This was caught running the
standalone-pgadmin-user-management kuttl suite against the new image.
* internal/controller/standalone_pgadmin/config.go: bump pgAdminDir
from python3.11 -> python3.12 so the generated startup script's
`cd "$PGADMIN_DIR"` succeeds.
* internal/controller/standalone_pgadmin/pod_test.go: refresh both
golden pod-spec fixtures to match the new path.
* updated pgadmin dockerfile
* resolve conflict1 parent 9fa17c8 commit 4ac7832
3 files changed
Lines changed: 20 additions & 4 deletions
File tree
- components/image-pgadmin
- internal/controller/standalone_pgadmin
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
118 | 124 | | |
119 | 125 | | |
120 | 126 | | |
| 127 | + | |
121 | 128 | | |
122 | 129 | | |
| 130 | + | |
123 | 131 | | |
124 | 132 | | |
125 | 133 | | |
| |||
129 | 137 | | |
130 | 138 | | |
131 | 139 | | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
132 | 148 | | |
133 | 149 | | |
134 | 150 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
| |||
246 | 246 | | |
247 | 247 | | |
248 | 248 | | |
249 | | - | |
| 249 | + | |
250 | 250 | | |
251 | 251 | | |
252 | 252 | | |
| |||
0 commit comments