Skip to content

Commit

Permalink
Update etcd config items for region-based etcd DNS
Browse files Browse the repository at this point in the history
  • Loading branch information
zaklawrencea committed Sep 18, 2024
1 parent af2a04c commit 839eae5
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 6 deletions.
3 changes: 2 additions & 1 deletion test/e2e/cluster_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ clusters:
apiserver_business_partner_ids: ${APISERVER_BUSINESS_PARTNER_IDS}
etcd_s3_backup_bucket: zalando-kubernetes-etcd-${AWS_ACCOUNT}-${REGION}
etcd_endpoints: "${ETCD_ENDPOINTS}"
etcd_additional_endpoints: "https://etcd-server.eu-central-1.teapot-e2e.zalan.do:2479"
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"
docker_meta_url: https://docker-meta.stups-test.zalan.do
vpa_enabled: "true"
lightstep_token: "${LIGHTSTEP_TOKEN}"
Expand Down
21 changes: 16 additions & 5 deletions test/e2e/run_e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,15 @@ if [ "$create_cluster" = true ]; then
"./cluster_config.sh" "${CDP_TARGET_COMMIT_ID}" "requested" > base_cluster.yaml
fi

echo "cat base_cluster..."
cat base_cluster.yaml

# generate the cluster certificates
aws-account-creator refresh-certificates --registry-file base_cluster.yaml --create-ca

echo "cat base_cluster 2..."
cat base_cluster.yaml

# Create cluster
clm provision \
--token="${CLUSTER_ADMIN_TOKEN}" \
Expand All @@ -125,11 +131,16 @@ 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
# if [ -f base_cluster.yaml ]; then
# echo "copy certs"
# ./copy-certificates.py base_cluster.yaml head_cluster.yaml
# else
echo "refresh certs"
aws-account-creator refresh-certificates --registry-file head_cluster.yaml --create-ca
# fi

echo "cat head_cluster..."
cat head_cluster.yaml

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

0 comments on commit 839eae5

Please sign in to comment.