Skip to content

Commit 10abd31

Browse files
committed
fix(kuttl): align standalone pgAdmin user-management asserts with python3.12
The four standalone-pgadmin-user-management assert scripts still exec setup.py out of /usr/local/lib/python3.11/site-packages/pgadmin4, which fails against the python3.12-built pgAdmin image now shipped for 5.8. Bump the path to /usr/local/lib/python3.12/site-packages/pgadmin4 in {01,03,05,07}-assert.yaml.
1 parent ff00ebf commit 10abd31

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

testing/kuttl/e2e/standalone-pgadmin-user-management/01-assert.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ commands:
66
pod_name=$(kubectl get pod -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)
77
secret_name=$(kubectl get secret -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)
88
9-
# /usr/local/lib/python3.11/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
10-
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")
9+
# /usr/local/lib/python3.12/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
10+
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")
1111
1212
bob_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="bob@example.com") | .role')
1313
dave_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="dave@example.com") | .role')

testing/kuttl/e2e/standalone-pgadmin-user-management/03-assert.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ commands:
66
pod_name=$(kubectl get pod -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)
77
secret_name=$(kubectl get secret -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)
88
9-
# /usr/local/lib/python3.11/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
10-
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")
9+
# /usr/local/lib/python3.12/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
10+
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")
1111
1212
bob_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="bob@example.com") | .role')
1313
dave_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="dave@example.com") | .role')

testing/kuttl/e2e/standalone-pgadmin-user-management/05-assert.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ commands:
66
pod_name=$(kubectl get pod -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)
77
secret_name=$(kubectl get secret -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)
88
9-
# /usr/local/lib/python3.11/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
10-
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")
9+
# /usr/local/lib/python3.12/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
10+
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")
1111
1212
bob_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="bob@example.com") | .role')
1313
dave_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="dave@example.com") | .role')

testing/kuttl/e2e/standalone-pgadmin-user-management/07-assert.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ commands:
66
pod_name=$(kubectl get pod -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)
77
secret_name=$(kubectl get secret -n "${NAMESPACE}" -l postgres-operator.crunchydata.com/pgadmin=pgadmin -o name)
88
9-
# /usr/local/lib/python3.11/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
10-
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")
9+
# /usr/local/lib/python3.12/site-packages/pgadmin4 allows for various Python versions to be referenced in testing
10+
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")
1111
1212
bob_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="bob@example.com") | .role')
1313
dave_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="dave@example.com") | .role')

0 commit comments

Comments
 (0)