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

Jump to bottom

Update e2es to use region-based DNS for etcd [1/2] #8106

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Update e2es to use region-based DNS for etcd [1/2] #8106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion test/e2e/cluster_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ clusters:
etcd_client_ca_cert: "${ETCD_CLIENT_CA_CERT}"
etcd_client_ca_key: "${ETCD_CLIENT_CA_KEY}"
etcd_scalyr_key: "${ETCD_SCALYR_KEY}"
etcd_dns_record_prefixes: "etcd-server.etcd"
etcd_dns_record_prefixes: "etcd-server.etcd,etcd-server.eu-central-1"
etcd_additional_endpoints: "https://etcd-server.eu-central-1.teapot-e2e.zalan.do:2479"
docker_meta_url: https://docker-meta.stups-test.zalan.do
vpa_enabled: "true"
lightstep_token: "${LIGHTSTEP_TOKEN}"
Expand Down
14 changes: 9 additions & 5 deletions test/e2e/run_e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,15 @@ if [ "$create_cluster" = true ]; then
"./cluster_config.sh" "${CDP_HEAD_COMMIT_ID}" "ready" > head_cluster.yaml

# either copy the certificates from the already created cluster or regenerate them from scratch
if [ -f base_cluster.yaml ]; then
./copy-certificates.py base_cluster.yaml head_cluster.yaml
else
aws-account-creator refresh-certificates --registry-file head_cluster.yaml --create-ca
fi
# NOTE: while migrating to region-based etcd, ensure certiciates are refreshed
# if [ -f base_cluster.yaml ]; then
# ./copy-certificates.py base_cluster.yaml head_cluster.yaml
# else
aws-account-creator refresh-certificates --registry-file head_cluster.yaml --create-ca
# fi

echo "head_cluster.yaml:"
cat head_cluster.yaml

# Update cluster
echo "Updating cluster ${CLUSTER_ID}: ${API_SERVER_URL}"
Expand Down