Skip to content

Commit

Permalink
Merge pull request #280 from shreyas-s-rao/fix/int-test-image-versions
Browse files Browse the repository at this point in the history
Fix etcd image for tests
  • Loading branch information
shreyas-s-rao authored Nov 4, 2020
2 parents 7f75c53 + 0b46c46 commit a01dcb6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .ci/integration_test
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,10 @@ function run_test_on_cluster() {
setup-aws-infrastructure
fi

export ETCD_VERSION=${ETCD_VERSION:-"v3.3.17"}
export ETCD_VERSION=${ETCD_VERSION:-"v3.4.13"}
echo "Etcd version: ${ETCD_VERSION}"

export ETCDBR_VERSION=${ETCDBR_VERSION:-${ETCDBR_VER:-"v0.9.1"}}
export ETCDBR_VERSION=${ETCDBR_VERSION:-${ETCDBR_VER:-"v0.10.0"}}
echo "Etcd-backup-restore version: ${ETCDBR_VERSION}"

echo "Starting integration tests on k8s cluster."
Expand Down
4 changes: 2 additions & 2 deletions .ci/performance_regression_test
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ if [ "$PERF_TEST_KUBECONFIG" == "" ]; then
PERF_TEST_KUBECONFIG=$TM_KUBECONFIG_PATH/shoot.config
fi

ETCD_VERSION=${ETCD_VERSION:-"v3.3.17"}
ETCD_VERSION=${ETCD_VERSION:-"v3.4.13"}
if [ "$ETCD_VERSION" != "" ]; then
ETCD_IMAGE=${ETCD_IMAGE:-"quay.io/coreos/etcd:$ETCD_VERSION"}
ETCD_IMAGE=${ETCD_IMAGE:-"eu.gcr.io/gardener-project/gardener/etcd:$ETCD_VERSION"}
fi

if [ "$ETCDBR_VERSION" != "" ]; then
Expand Down
5 changes: 2 additions & 3 deletions chart/etcd-backup-restore/values.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
images:
# etcd image to use
etcd:
# repository: quay.io/coreos/etcd
repository: gcr.io/etcd-development/etcd
tag: v3.3.17
repository: eu.gcr.io/gardener-project/gardener/etcd
tag: v3.4.13
pullPolicy: IfNotPresent
# etcd-backup-restore image to use
etcdBackupRestore:
Expand Down

0 comments on commit a01dcb6

Please sign in to comment.