github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #40315 from madhusudancs/fed-log-uniq-cluster-names 

Automatic merge from submit-queue (batch tested with PRs 40335, 40320, 40324, 39103, 40315)

Use the e2e zone name as the cluster name.

This needs a revamp, but for now e2e zone name is used as the
unique cluster identifier in our e2e tests and we will continue
to use that pattern.

This is a follow up to PR #38638.

cc @kubernetes/sig-federation-pr-reviews @nikhiljindal
pull/6/head
Kubernetes Submit Queue 2017-01-24 17:30:10 -08:00 committed by GitHub
parent e6ed110705 63dfa129f4
commit 84e98251ed
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/kube-util.sh
View File

@ -52,8 +52,12 @@ function set-federation-zone-vars {
export OVERRIDE_CONTEXT="${CLUSTER_CONTEXT}" export OVERRIDE_CONTEXT="${CLUSTER_CONTEXT}"
echo "Setting zone vars to: $OVERRIDE_CONTEXT" echo "Setting zone vars to: $OVERRIDE_CONTEXT"
if [[ "$KUBERNETES_PROVIDER" == "gce" ]];then if [[ "$KUBERNETES_PROVIDER" == "gce" ]];then
# This needs a revamp, but for now e2e zone name is used as the unique
# cluster identifier in our e2e tests and we will continue to use that
# pattern.
export CLUSTER_NAME="${zone}"
export KUBE_GCE_ZONE="$zone" export KUBE_GCE_ZONE="${zone}"
# gcloud has a 61 character limit, and for firewall rules this # gcloud has a 61 character limit, and for firewall rules this
# prefix gets appended to itself, with some extra information # prefix gets appended to itself, with some extra information
# need tot keep it short # need tot keep it short