Skip to content

Commit 71fec83

Browse files
valmiranogueiragithub-actions[bot]jvpasinatto
authored
K8SPS-721 add docker.io to images during tests (#1450)
* Add docker.io to images during tests * Fix reviewdog comment Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fix versions --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julio Pasinatto <julio.pasinatto@percona.com>
1 parent e2e515d commit 71fec83

3 files changed

Lines changed: 45 additions & 20 deletions

File tree

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,9 @@ release: manifests
298298
-e "/initContainer:/,/image:/{s#image: .*#image: $(IMAGE_OPERATOR)#}" \
299299
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(IMAGE_PMM_CLIENT)#}" \
300300
deploy/cr.yaml
301+
$(SED) -i \
302+
-e "/^# binlogServer:/,/^# image:/{s|^# image: .*|# image: $(IMAGE_BINLOG_SERVER)|}" \
303+
deploy/backup/restore.yaml
301304
$(SED) -i \
302305
-e "/^ mysqlshellRunner:/,/^ image:/{s#image: .*#image: $(IMAGE_MYSQL84)#}" \
303306
deploy/clusterset.yaml

‎e2e-tests/release_versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ IMAGE_ORCHESTRATOR=percona/percona-orchestrator:3.2.6-22
1010
IMAGE_TOOLKIT=percona/percona-toolkit:3.7.1-4
1111
IMAGE_PMM_CLIENT=percona/pmm-client:3.8.1
1212
IMAGE_PMM_SERVER=percona/pmm-server:3.8.1
13-
IMAGE_BINLOG_SERVER=percona/percona-server-mysql-operator:1.2.0-binlog-server-0.3.1
13+
IMAGE_BINLOG_SERVER=percona/percona-server-mysql-operator:1.2.0-binlog-server-0.3.1
1414

1515
GKE_MIN=1.33
1616
GKE_MAX=1.35

‎e2e-tests/vars.sh‎

Lines changed: 41 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22

33
export ROOT_REPO=${ROOT_REPO:-${PWD}}
4-
54
export DEPLOY_DIR="${DEPLOY_DIR:-${ROOT_REPO}/deploy}"
65
export TESTS_DIR="${TESTS_DIR:-${ROOT_REPO}/e2e-tests}"
76
export TESTS_CONFIG_DIR="${TESTS_CONFIG_DIR:-${TESTS_DIR}/conf}"
@@ -11,31 +10,54 @@ export TEMP_DIR="/tmp/kuttl/ps/${test_name}"
1110
export GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
1211
export VERSION=${VERSION:-$(echo "${GIT_BRANCH}" | sed -e 's^/^-^g; s^[.]^-^g;' | tr '[:upper:]' '[:lower:]')}
1312

14-
export IMAGE=${IMAGE:-"perconalab/percona-server-mysql-operator:${VERSION}"}
15-
if [[ -z ${MYSQL_VERSION-} && -n ${IMAGE_MYSQL-} ]]; then
16-
export MYSQL_VERSION=$(echo "$IMAGE_MYSQL" | sed -E 's/.*://; s/^[^0-9]*([0-9]+\.[0-9]+).*/\1/')
17-
else
18-
export MYSQL_VERSION=${MYSQL_VERSION:-"8.4"}
19-
fi
20-
export IMAGE_MYSQL=${IMAGE_MYSQL:-"perconalab/percona-server-mysql-operator:main-psmysql${MYSQL_VERSION}"}
21-
export IMAGE_BACKUP=${IMAGE_BACKUP:-"perconalab/percona-server-mysql-operator:main-backup${MYSQL_VERSION}"}
22-
export IMAGE_ORCHESTRATOR=${IMAGE_ORCHESTRATOR:-"perconalab/percona-server-mysql-operator:main-orchestrator"}
23-
export IMAGE_ROUTER=${IMAGE_ROUTER:-"perconalab/percona-server-mysql-operator:main-router${MYSQL_VERSION}"}
24-
export IMAGE_TOOLKIT=${IMAGE_TOOLKIT:-"perconalab/percona-server-mysql-operator:main-toolkit"}
25-
export IMAGE_HAPROXY=${IMAGE_HAPROXY:-"perconalab/percona-server-mysql-operator:main-haproxy"}
26-
export IMAGE_BINLOG_SERVER=${IMAGE_BINLOG_SERVER:-"perconalab/percona-binlog-server:0.3.1"}
13+
export MYSQL_VERSION=${MYSQL_VERSION:-"8.4"}
2714
export PMM_SERVER_VERSION=${PMM_SERVER_VERSION:-"1.4.3"}
28-
export IMAGE_PMM_CLIENT=${IMAGE_PMM_CLIENT:-"perconalab/pmm-client:3-dev-latest"}
29-
export IMAGE_PMM_SERVER=${IMAGE_PMM_SERVER:-"perconalab/pmm-server:3-dev-latest"}
30-
export CERT_MANAGER_VER="1.20.2"
15+
export CERT_MANAGER_VER="1.20.3"
3116
export MINIO_VER="5.4.0"
3217
export CHAOS_MESH_VER="2.7.2"
3318
export VAULT_VER="0.16.1"
3419

35-
export date=$(which gdate || which date)
20+
if [[ -z ${MYSQL_VERSION-} && -n ${IMAGE_MYSQL-} ]]; then
21+
export MYSQL_VERSION=$(echo "$IMAGE_MYSQL" | sed -E 's/.*://; s/^[^0-9]*([0-9]+\.[0-9]+).*/\1/')
22+
fi
3623

37-
oc get projects &> /dev/null && export OPENSHIFT=4 || :
24+
export date=$(which gdate || which date)
25+
export sed=$(which gsed || which sed)
3826

27+
oc get projects &>/dev/null && export OPENSHIFT=4 || :
3928
if kubectl get nodes | grep "^minikube" >/dev/null; then
4029
export MINIKUBE=1
4130
fi
31+
32+
image_with_registry() {
33+
local image="$1"
34+
local registry="${IMAGE_REGISTRY:-docker.io}"
35+
36+
case "$image" in
37+
percona/* | perconalab/*)
38+
echo "${registry%/}/${image}"
39+
;;
40+
*)
41+
echo "$image"
42+
;;
43+
esac
44+
}
45+
46+
set_image() {
47+
local image_var="$1"
48+
local default_image="$2"
49+
local image="${!image_var:-$default_image}"
50+
51+
export "${image_var}=$(image_with_registry "$image")"
52+
}
53+
54+
set_image IMAGE "perconalab/percona-server-mysql-operator:${VERSION}"
55+
set_image IMAGE_MYSQL "perconalab/percona-server-mysql-operator:main-psmysql${MYSQL_VERSION}"
56+
set_image IMAGE_BACKUP "perconalab/percona-server-mysql-operator:main-backup${MYSQL_VERSION}"
57+
set_image IMAGE_ORCHESTRATOR "perconalab/percona-server-mysql-operator:main-orchestrator"
58+
set_image IMAGE_ROUTER "perconalab/percona-server-mysql-operator:main-router${MYSQL_VERSION}"
59+
set_image IMAGE_TOOLKIT "perconalab/percona-server-mysql-operator:main-toolkit"
60+
set_image IMAGE_HAPROXY "perconalab/percona-server-mysql-operator:main-haproxy"
61+
set_image IMAGE_BINLOG_SERVER "percona/percona-server-mysql-operator:1.2.0-binlog-server-0.3.1"
62+
set_image IMAGE_PMM_CLIENT "perconalab/pmm-client:3-dev-latest"
63+
set_image IMAGE_PMM_SERVER "perconalab/pmm-server:3-dev-latest"

0 commit comments

Comments
 (0)