Skip to content
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

CLOUD-881: Use release_versions in Makefile release rule #1037

Closed
wants to merge 4 commits into from
Closed

CLOUD-881: Use release_versions in Makefile release rule #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca15afa
Update PostgreSQL version handling and add release versions for multi…
ptankov Feb 7, 2025
d4ab13c
Update image versions to use perconalab repository
ptankov Feb 8, 2025
4f6bd67
Add AKS and OpenShift version ranges to release_versions
ptankov Feb 8, 2025
c661ea1
Clear deprecated PostgreSQL image variables in release_versions
ptankov Feb 8, 2025
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
40 changes: 40 additions & 0 deletions e2e-tests/release_versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Images versions
IMAGE_OPERATOR=perconalab/percona-postgresql-operator:main

IMAGE_POSTGRESQL17=perconalab/percona-postgresql-operator:main-ppg17-postgres
IMAGE_PGBOUNCER17=perconalab/percona-postgresql-operator:main-ppg17-pgbouncer
IMAGE_BACKREST17=perconalab/percona-postgresql-operator:main-ppg17-pgbackrest

IMAGE_POSTGRESQL16=
IMAGE_PGBOUNCER16=
IMAGE_BACKREST16=

IMAGE_POSTGRESQL15=
IMAGE_PGBOUNCER15=
IMAGE_BACKREST15=

IMAGE_POSTGRESQL14=
IMAGE_PGBOUNCER14=
IMAGE_BACKREST14=

IMAGE_POSTGRESQL13=
IMAGE_PGBOUNCER13=
IMAGE_BACKREST13=

IMAGE_POSTGRESQL13=
IMAGE_PGBOUNCER13=
IMAGE_BACKREST13=

IMAGE_PMM_CLIENT=percona/pmm-client:2.44.0
IMAGE_PMM_SERVER=percona/pmm-server:2.44.0

# Supported k8s versions
GKE_MIN=1.29
GKE_MAX=1.31
EKS_MIN=1.29
EKS_MAX=1.32
AKS_MIN=1.29
AKS_MAX=1.31
OPENSHIFT_MIN=4.14.46
OPENSHIFT_MAX=4.17.15
MINIKUBE_MAX=1.32.0
2 changes: 1 addition & 1 deletion e2e-tests/vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
export DEPLOY_DIR="${DEPLOY_DIR:-${ROOT_REPO}/deploy}"
export TESTS_DIR="${TESTS_DIR:-${ROOT_REPO}/e2e-tests}"
export TESTS_CONFIG_DIR="${TESTS_CONFIG_DIR:-${TESTS_DIR}/conf}"
export TEMP_DIR="/tmp/kuttl/pg/${test_name}"

Check warning on line 8 in e2e-tests/vars.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] e2e-tests/vars.sh#L8 <ShellCheck.SC2154> 

test_name is referenced but not assigned.
Raw output 
./e2e-tests/vars.sh:8:32: warning: test_name is referenced but not assigned. (ShellCheck.SC2154)

export GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)

Check warning on line 10 in e2e-tests/vars.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] e2e-tests/vars.sh#L10 <ShellCheck.SC2155> 

Declare and assign separately to avoid masking return values.
Raw output 
./e2e-tests/vars.sh:10:8: warning: Declare and assign separately to avoid masking return values. (ShellCheck.SC2155)
export VERSION=${VERSION:-$(echo "${GIT_BRANCH}" | sed -e 's^/^-^g; s^[.]^-^g;' | tr '[:upper:]' '[:lower:]')}

export IMAGE_BASE=${IMAGE_BASE:-"perconalab/percona-postgresql-operator"}
export IMAGE=${IMAGE:-"${IMAGE_BASE}:${VERSION}"}
export PG_VER="${PG_VER:-17}"
export IMAGE_PGBOUNCER=${IMAGE_PGBOUNCER:-"${IMAGE_BASE}:main-ppg$PG_VER-pgbouncer"}
export IMAGE_POSTGRESQL=${IMAGE_POSTGRESQL:-"${IMAGE_BASE}:main-ppg$PG_VER-postgres"}
export PG_VER=$(echo $IMAGE_POSTGRESQL | grep -Eo 'ppg[0-9]+'| sed 's/ppg//g')

Check warning on line 17 in e2e-tests/vars.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] e2e-tests/vars.sh#L17 <ShellCheck.SC2155> 

Declare and assign separately to avoid masking return values.
Raw output 
./e2e-tests/vars.sh:17:8: warning: Declare and assign separately to avoid masking return values. (ShellCheck.SC2155)

Check notice on line 17 in e2e-tests/vars.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] e2e-tests/vars.sh#L17 <ShellCheck.SC2086> 

Double quote to prevent globbing and word splitting.
Raw output 
./e2e-tests/vars.sh:17:22: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
ptankov marked this conversation as resolved.
Show resolved Hide resolved
export IMAGE_BACKREST=${IMAGE_BACKREST:-"${IMAGE_BASE}:main-ppg$PG_VER-pgbackrest"}
export IMAGE_UPGRADE=${IMAGE_UPGRADE:-"${IMAGE_BASE}:main-upgrade"}
export BUCKET=${BUCKET:-"pg-operator-testing"}
Expand All @@ -24,8 +24,8 @@
export PGOV1_TAG=${PGOV1_TAG:-"1.4.0"}
export PGOV1_VER=${PGOV1_VER:-"14"}

date=$(which gdate || which date)

Check warning on line 27 in e2e-tests/vars.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] e2e-tests/vars.sh#L27 <ShellCheck.SC2034> 

date appears unused. Verify use (or export if used externally).
Raw output 
./e2e-tests/vars.sh:27:1: warning: date appears unused. Verify use (or export if used externally). (ShellCheck.SC2034)
sed=$(which gsed || which sed)

Check warning on line 28 in e2e-tests/vars.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] e2e-tests/vars.sh#L28 <ShellCheck.SC2034> 

sed appears unused. Verify use (or export if used externally).
Raw output 
./e2e-tests/vars.sh:28:1: warning: sed appears unused. Verify use (or export if used externally). (ShellCheck.SC2034)

if command -v oc &>/dev/null; then
if oc get projects; then
Expand Down
Loading