Skip to content

K8SPG-719 use image.tag and image.repository to configure pmm3 server on e2e tests #1144

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.

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions e2e-tests/functions
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,8 @@ deploy_pmm3_server() {
helm repo add percona https://percona.github.io/percona-helm-charts/
helm install monitoring percona/pmm -n "${NAMESPACE}" \
--set fullnameOverride=monitoring \
--set imageTag=3-dev-latest \
--set imageRepo=perconalab/pmm-server \
--set image.tag=${IMAGE_PMM3_SERVER#*:} \
--set image.repository=${IMAGE_PMM3_SERVER%:*} \
--set service.type=LoadBalancer \
--set platform="$platform" \
--force
Expand Down
2 changes: 2 additions & 0 deletions e2e-tests/release_versions
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ IMAGE_UPGRADE=percona/percona-postgresql-operator:2.6.0-upgrade

IMAGE_PMM_CLIENT=percona/pmm-client:2.44.0
IMAGE_PMM_SERVER=percona/pmm-server:2.44.0
IMAGE_PMM3_CLIENT=percona/pmm-client:3.1.0
IMAGE_PMM3_SERVER=percona/pmm-server:3.1.0

# Supported k8s versions
GKE_MIN=1.29
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/monitoring-pmm3/03-create-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ commands:

get_cr \
| yq eval '.spec.pmm.enabled=true' - \
| yq eval '.spec.pmm.image="perconalab/pmm-client:3-dev-latest"' - \
| yq eval ".spec.pmm.image=\"${IMAGE_PMM3_CLIENT}\"" - \
| kubectl -n "${NAMESPACE}" apply -f -
2 changes: 2 additions & 0 deletions e2e-tests/vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export BUCKET=${BUCKET:-"pg-operator-testing"}
export PMM_SERVER_VERSION=${PMM_SERVER_VERSION:-"9.9.9"}
export IMAGE_PMM_CLIENT=${IMAGE_PMM_CLIENT:-"perconalab/pmm-client:dev-latest"}
export IMAGE_PMM_SERVER=${IMAGE_PMM_SERVER:-"perconalab/pmm-server:dev-latest"}
export IMAGE_PMM3_CLIENT=${IMAGE_PMM3_CLIENT:-"perconalab/pmm-client:3-dev-latest"}
export IMAGE_PMM3_SERVER=${IMAGE_PMM3_SERVER:-"perconalab/pmm-server:3-dev-latest"}
export PGOV1_TAG=${PGOV1_TAG:-"1.4.0"}
export PGOV1_VER=${PGOV1_VER:-"14"}

Expand Down
Loading