From d7415f76ecb1ea76ad1ee6a58690362053734352 Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Fri, 11 Jul 2025 10:37:21 +0300 Subject: [PATCH 1/6] Add docker.io registry to images for openshift --- e2e-tests/vars.sh | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh index 47a3dd2cf..ebe36a20f 100755 --- a/e2e-tests/vars.sh +++ b/e2e-tests/vars.sh @@ -12,6 +12,14 @@ export TEMP_DIR="/tmp/kuttl/pg/${test_name}" export GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) export VERSION=${VERSION:-$(echo "${GIT_BRANCH}" | sed -e 's^/^-^g; s^[.]^-^g;' | tr '[:upper:]' '[:lower:]')} +if command -v oc &>/dev/null; then + if oc get projects; then + export OPENSHIFT=4 + fi +fi + +OPENSHIFT=4 + export IMAGE_BASE=${IMAGE_BASE:-"perconalab/percona-postgresql-operator"} export IMAGE=${IMAGE:-"${IMAGE_BASE}:${VERSION}"} export PG_VER="${PG_VER:-17}" @@ -28,13 +36,32 @@ export IMAGE_PMM3_SERVER=${IMAGE_PMM3_SERVER:-"perconalab/pmm-server:3-dev-lates export PGOV1_TAG=${PGOV1_TAG:-"1.4.0"} export PGOV1_VER=${PGOV1_VER:-"14"} +# if [[ $OPENSHIFT ]]; then +# REGISTRY='docker.io/' +# echo "Append 'docker.io to images for openshift'" +# for var in $(printenv | grep IMAGE | awk -F'=' '{print $1}'); do +# echo "Reassigning vars" +# var_value=$(eval "echo \$$var") +# eval "$var='$REGISTRY$var_value'" +# done +# fi + +if [[ $OPENSHIFT ]]; then + REGISTRY='docker.io/' + echo "Appending 'docker.io/' to image variables for OpenShift..." + + for var in $(printenv | grep -E '^IMAGE' | awk -F'=' '{print $1}'); do + var_value=$(eval "echo \$$var") + new_value="${REGISTRY}${var_value}" + export "$var=$new_value" + echo "$var=$new_value" + done +fi + +echo $IMAGE_BASE $IMAGE $IMAGE_PGBOUNCER $IMAGE_BACKREST $IMAGE_PMM_CLIENT $IMAGE_PMM_SERVER $IMAGE_PMM3_CLIENT $IMAGE_PMM3_CLIENT $IMAGE_PMM3_SERVER + # shellcheck disable=SC2034 date=$(which gdate || which date) # shellcheck disable=SC2034 sed=$(which gsed || which sed) -if command -v oc &>/dev/null; then - if oc get projects; then - export OPENSHIFT=4 - fi -fi From 24019ffc28f06074e9b990825a12ccb918b5250e Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Fri, 11 Jul 2025 13:24:55 +0300 Subject: [PATCH 2/6] Remove extra openshift VAR --- e2e-tests/vars.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh index ebe36a20f..ae5001fd7 100755 --- a/e2e-tests/vars.sh +++ b/e2e-tests/vars.sh @@ -18,8 +18,6 @@ if command -v oc &>/dev/null; then fi fi -OPENSHIFT=4 - export IMAGE_BASE=${IMAGE_BASE:-"perconalab/percona-postgresql-operator"} export IMAGE=${IMAGE:-"${IMAGE_BASE}:${VERSION}"} export PG_VER="${PG_VER:-17}" From cec0e427d6c106775e6dee2c9e5d31ab47b6561f Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Fri, 11 Jul 2025 16:40:43 +0300 Subject: [PATCH 3/6] Remove extra stuff --- e2e-tests/vars.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh index ae5001fd7..9727b0de9 100755 --- a/e2e-tests/vars.sh +++ b/e2e-tests/vars.sh @@ -34,16 +34,6 @@ export IMAGE_PMM3_SERVER=${IMAGE_PMM3_SERVER:-"perconalab/pmm-server:3-dev-lates export PGOV1_TAG=${PGOV1_TAG:-"1.4.0"} export PGOV1_VER=${PGOV1_VER:-"14"} -# if [[ $OPENSHIFT ]]; then -# REGISTRY='docker.io/' -# echo "Append 'docker.io to images for openshift'" -# for var in $(printenv | grep IMAGE | awk -F'=' '{print $1}'); do -# echo "Reassigning vars" -# var_value=$(eval "echo \$$var") -# eval "$var='$REGISTRY$var_value'" -# done -# fi - if [[ $OPENSHIFT ]]; then REGISTRY='docker.io/' echo "Appending 'docker.io/' to image variables for OpenShift..." @@ -56,8 +46,6 @@ if [[ $OPENSHIFT ]]; then done fi -echo $IMAGE_BASE $IMAGE $IMAGE_PGBOUNCER $IMAGE_BACKREST $IMAGE_PMM_CLIENT $IMAGE_PMM_SERVER $IMAGE_PMM3_CLIENT $IMAGE_PMM3_CLIENT $IMAGE_PMM3_SERVER - # shellcheck disable=SC2034 date=$(which gdate || which date) # shellcheck disable=SC2034 From 893322d28c7317fd45d7765a36c182d0606ef455 Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Fri, 11 Jul 2025 16:51:08 +0300 Subject: [PATCH 4/6] Update e2e-tests/vars.sh Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- e2e-tests/vars.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh index 9727b0de9..e3b541293 100755 --- a/e2e-tests/vars.sh +++ b/e2e-tests/vars.sh @@ -35,15 +35,15 @@ export PGOV1_TAG=${PGOV1_TAG:-"1.4.0"} export PGOV1_VER=${PGOV1_VER:-"14"} if [[ $OPENSHIFT ]]; then - REGISTRY='docker.io/' - echo "Appending 'docker.io/' to image variables for OpenShift..." - - for var in $(printenv | grep -E '^IMAGE' | awk -F'=' '{print $1}'); do - var_value=$(eval "echo \$$var") - new_value="${REGISTRY}${var_value}" - export "$var=$new_value" - echo "$var=$new_value" - done + REGISTRY='docker.io/' + echo "Appending 'docker.io/' to image variables for OpenShift..." + + for var in $(printenv | grep -E '^IMAGE' | awk -F'=' '{print $1}'); do + var_value=$(eval "echo \$$var") + new_value="${REGISTRY}${var_value}" + export "$var=$new_value" + echo "$var=$new_value" + done fi # shellcheck disable=SC2034 From 1d2d877c0759768b3f8c23df5bf0ca70019b3b0a Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Fri, 11 Jul 2025 23:46:34 +0300 Subject: [PATCH 5/6] Update upgrade-minor with docker and remove migration test --- e2e-tests/functions | 2 +- e2e-tests/run-release.csv | 1 - e2e-tests/tests/upgrade-minor/01-create-cluster.yaml | 10 +++++++--- e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml | 6 +++--- e2e-tests/vars.sh | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/e2e-tests/functions b/e2e-tests/functions index a12ef9b6c..e4f6d0b5f 100644 --- a/e2e-tests/functions +++ b/e2e-tests/functions @@ -92,7 +92,7 @@ deploy_operator_gh() { curl -s "https://raw.githubusercontent.com/percona/percona-postgresql-operator/${git_tag}/deploy/${cw_prefix}operator.yaml" >"${TEMP_DIR}/${cw_prefix}operator_${git_tag}.yaml" - yq eval '.spec.template.spec.containers[0].image = "percona/percona-postgresql-operator:'${git_tag#v}'"' \ + yq eval '.spec.template.spec.containers[0].image = "'${REGISTRY}'percona/percona-postgresql-operator:'${git_tag#v}'"' \ "${TEMP_DIR}/${cw_prefix}operator_${git_tag}.yaml" \ | kubectl -n "${OPERATOR_NS:-$NAMESPACE}" apply -f - } diff --git a/e2e-tests/run-release.csv b/e2e-tests/run-release.csv index 55e8d4406..6217656a3 100644 --- a/e2e-tests/run-release.csv +++ b/e2e-tests/run-release.csv @@ -5,7 +5,6 @@ demand-backup finalizers init-deploy major-upgrade -migration-backup-s3 monitoring monitoring-pmm3 one-pod diff --git a/e2e-tests/tests/upgrade-minor/01-create-cluster.yaml b/e2e-tests/tests/upgrade-minor/01-create-cluster.yaml index ac31b4a33..e34fe62ea 100644 --- a/e2e-tests/tests/upgrade-minor/01-create-cluster.yaml +++ b/e2e-tests/tests/upgrade-minor/01-create-cluster.yaml @@ -24,14 +24,18 @@ commands: fi echo $pg_ver >"${TEMP_DIR}/pg_ver.txt" + if [[ $OPENSHIFT ]]; then + $sed -E -i "s|^( *image: *)(.*)|\1${REGISTRY}\2|" ${TEMP_DIR}/cr_lower.yaml + fi + yq -i eval ' .metadata.name = "'${test_name}'" | .metadata.labels = {"e2e":"'${test_name}'"} | - .spec.image = "percona/percona-postgresql-operator:'${lower_ver}'-ppg'$pg_ver'-postgres" | + .spec.image = "'${REGISTRY}'percona/percona-postgresql-operator:'${lower_ver}'-ppg'$pg_ver'-postgres" | .spec.postgresVersion = '$pg_ver' | - .spec.proxy.pgBouncer.image = "percona/percona-postgresql-operator:'${lower_ver}'-ppg'$pg_ver'-pgbouncer" | + .spec.proxy.pgBouncer.image = "'${REGISTRY}'percona/percona-postgresql-operator:'${lower_ver}'-ppg'$pg_ver'-pgbouncer" | .spec.backups.pgbackrest.repos[0].schedules = null | - .spec.backups.pgbackrest.image = "percona/percona-postgresql-operator:'${lower_ver}'-ppg'$pg_ver'-pgbackrest" | + .spec.backups.pgbackrest.image = "'${REGISTRY}'percona/percona-postgresql-operator:'${lower_ver}'-ppg'$pg_ver'-pgbackrest" | .spec.users += [{"name":"postgres","password":{"type":"AlphaNumeric"}}] | .spec.users += [{"name":"'${test_name}'","password":{"type":"AlphaNumeric"}}]' "${TEMP_DIR}/cr_lower.yaml" kubectl -n "${NAMESPACE}" apply -f "${TEMP_DIR}/cr_lower.yaml" diff --git a/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml b/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml index f43220c9e..a6fb44aa2 100644 --- a/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml +++ b/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml @@ -13,9 +13,9 @@ commands: target_image_backrest=$IMAGE_BACKREST if [ "$pg_ver_lower" != "$PG_VER" ]; then - target_image_postgresql="perconalab/percona-postgresql-operator:main-ppg$pg_ver_lower-postgres" - target_image_pgbouncer="perconalab/percona-postgresql-operator:main-ppg$pg_ver_lower-pgbouncer" - target_image_backrest="perconalab/percona-postgresql-operator:main-ppg$pg_ver_lower-pgbackrest" + target_image_postgresql="${REGISTRY}perconalab/percona-postgresql-operator:main-ppg$pg_ver_lower-postgres" + target_image_pgbouncer="${REGISTRY}perconalab/percona-postgresql-operator:main-ppg$pg_ver_lower-pgbouncer" + target_image_backrest="${REGISTRY}perconalab/percona-postgresql-operator:main-ppg$pg_ver_lower-pgbackrest" fi cr_ver=$(yq '.spec.crVersion' $DEPLOY_DIR/cr.yaml) diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh index e3b541293..5d3b79d2e 100755 --- a/e2e-tests/vars.sh +++ b/e2e-tests/vars.sh @@ -35,7 +35,7 @@ export PGOV1_TAG=${PGOV1_TAG:-"1.4.0"} export PGOV1_VER=${PGOV1_VER:-"14"} if [[ $OPENSHIFT ]]; then - REGISTRY='docker.io/' + export REGISTRY='docker.io/' echo "Appending 'docker.io/' to image variables for OpenShift..." for var in $(printenv | grep -E '^IMAGE' | awk -F'=' '{print $1}'); do From 4e210981cb44bd802bc26f19f3b9bba596601719 Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Fri, 11 Jul 2025 23:47:09 +0300 Subject: [PATCH 6/6] Update e2e-tests/vars.sh Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- e2e-tests/vars.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh index 5d3b79d2e..409caa3e8 100755 --- a/e2e-tests/vars.sh +++ b/e2e-tests/vars.sh @@ -50,4 +50,3 @@ fi date=$(which gdate || which date) # shellcheck disable=SC2034 sed=$(which gsed || which sed) -