Skip to content

Release 2.7.0 op #1219

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 6 commits into
base: release-2.7.0
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
2 changes: 1 addition & 1 deletion e2e-tests/functions
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
}
Expand Down
1 change: 0 additions & 1 deletion e2e-tests/run-release.csv
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ demand-backup
finalizers
init-deploy
major-upgrade
migration-backup-s3
monitoring
monitoring-pmm3
one-pod
Expand Down
10 changes: 7 additions & 3 deletions e2e-tests/tests/upgrade-minor/01-create-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
24 changes: 18 additions & 6 deletions e2e-tests/vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ 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

export IMAGE_BASE=${IMAGE_BASE:-"perconalab/percona-postgresql-operator"}
export IMAGE=${IMAGE:-"${IMAGE_BASE}:${VERSION}"}
export PG_VER="${PG_VER:-17}"
Expand All @@ -28,13 +34,19 @@ 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
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
var_value=$(eval "echo \$$var")
new_value="${REGISTRY}${var_value}"
export "$var=$new_value"
echo "$var=$new_value"
done
fi

# 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
Loading