Skip to content

fix(kuttl): align standalone pgAdmin user-management asserts with python3.12 #4503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ValClarkson merged 2 commits into from
Jun 2, 2026
Merged

fix(kuttl): align standalone pgAdmin user-management asserts with python3.12 #4503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a90fcf
fix(kuttl): align standalone pgAdmin user-management asserts with pyt…
ValClarkson Jun 2, 2026
e7c4e9d
updated python 3.12
ValClarkson Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/controller/standalone_pgadmin/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ const (
pgAdminPort = 5050

// Directory for pgAdmin in container
pgAdminDir = "/usr/local/lib/python3.11/site-packages/pgadmin4"
pgAdminDir = "/usr/local/lib/python3.12/site-packages/pgadmin4"
)
4 changes: 2 additions & 2 deletions internal/controller/standalone_pgadmin/pod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ containers:
- |-
monitor() {
export PGADMIN_SETUP_PASSWORD="$(date +%s | sha256sum | base64 | head -c 32)"
PGADMIN_DIR=/usr/local/lib/python3.11/site-packages/pgadmin4
PGADMIN_DIR=/usr/local/lib/python3.12/site-packages/pgadmin4
APP_RELEASE=$(cd $PGADMIN_DIR && python3 -c "import config; print(config.APP_RELEASE)")

echo "Running pgAdmin4 Setup"
Expand Down Expand Up @@ -246,7 +246,7 @@ containers:
- |-
monitor() {
export PGADMIN_SETUP_PASSWORD="$(date +%s | sha256sum | base64 | head -c 32)"
PGADMIN_DIR=/usr/local/lib/python3.11/site-packages/pgadmin4
PGADMIN_DIR=/usr/local/lib/python3.12/site-packages/pgadmin4
APP_RELEASE=$(cd $PGADMIN_DIR && python3 -c "import config; print(config.APP_RELEASE)")

echo "Running pgAdmin4 Setup"
Expand Down
4 changes: 2 additions & 2 deletions testing/kuttl/e2e/standalone-pgadmin-user-management/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ commands:
pod_name=$(kubectl get pod -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)
secret_name=$(kubectl get secret -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)

# /usr/local/lib/python3.11/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
users_in_pgadmin=$(kubectl exec -n "${NAMESPACE}" "${pod_name}" -- bash -c "python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py get-users --json")
# /usr/local/lib/python3.12/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
users_in_pgadmin=$(kubectl exec -n "${NAMESPACE}" "${pod_name}" -- bash -c "python3 /usr/local/lib/python3.12/site-packages/pgadmin4/setup.py get-users --json")

bob_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="bob@example.com") | .role')
dave_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="dave@example.com") | .role')
Expand Down
4 changes: 2 additions & 2 deletions testing/kuttl/e2e/standalone-pgadmin-user-management/03-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ commands:
pod_name=$(kubectl get pod -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)
secret_name=$(kubectl get secret -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)

# /usr/local/lib/python3.11/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
users_in_pgadmin=$(kubectl exec -n "${NAMESPACE}" "${pod_name}" -- bash -c "python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py get-users --json")
# /usr/local/lib/python3.12/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
users_in_pgadmin=$(kubectl exec -n "${NAMESPACE}" "${pod_name}" -- bash -c "python3 /usr/local/lib/python3.12/site-packages/pgadmin4/setup.py get-users --json")

bob_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="bob@example.com") | .role')
dave_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="dave@example.com") | .role')
Expand Down
4 changes: 2 additions & 2 deletions testing/kuttl/e2e/standalone-pgadmin-user-management/05-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ commands:
pod_name=$(kubectl get pod -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)
secret_name=$(kubectl get secret -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)

# /usr/local/lib/python3.11/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
users_in_pgadmin=$(kubectl exec -n "${NAMESPACE}" "${pod_name}" -- bash -c "python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py get-users --json")
# /usr/local/lib/python3.12/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
users_in_pgadmin=$(kubectl exec -n "${NAMESPACE}" "${pod_name}" -- bash -c "python3 /usr/local/lib/python3.12/site-packages/pgadmin4/setup.py get-users --json")

bob_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="bob@example.com") | .role')
dave_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="dave@example.com") | .role')
Expand Down
4 changes: 2 additions & 2 deletions testing/kuttl/e2e/standalone-pgadmin-user-management/07-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ commands:
pod_name=$(kubectl get pod -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)
secret_name=$(kubectl get secret -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)

# /usr/local/lib/python3.11/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
users_in_pgadmin=$(kubectl exec -n "${NAMESPACE}" "${pod_name}" -- bash -c "python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py get-users --json")
# /usr/local/lib/python3.12/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
users_in_pgadmin=$(kubectl exec -n "${NAMESPACE}" "${pod_name}" -- bash -c "python3 /usr/local/lib/python3.12/site-packages/pgadmin4/setup.py get-users --json")

bob_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="bob@example.com") | .role')
dave_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="dave@example.com") | .role')
Expand Down
Loading