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

Revert "Federation e2e supports aws" #28030

Merged
merged 1 commit into from
Jun 24, 2016
Merged

Revert "Federation e2e supports aws" #28030

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster/aws/util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1491,7 +1491,7 @@ function test-build-release {
# Assumed vars:
# Variables from config.sh
function test-setup {
. "${KUBE_ROOT}/cluster/kube-up.sh"
"${KUBE_ROOT}/cluster/kube-up.sh"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this change on this line about?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@erictune See #27791 (comment)


VPC_ID=$(get_vpc_id)
detect-security-groups
Expand Down
24 changes: 0 additions & 24 deletions federation/cluster/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,30 +135,6 @@ function create-federation-api-objects {
fi
sleep 5
done

# Poll until DNS record for federation-apiserver is propagated
# TODO(colhom): REQUIREMENT for any other providers which use a DNS name for routing to loadbalancers
# right now it's just AWS that does this.
which nslookup
set +o errexit
if [[ "$KUBERNETES_PROVIDER" == "aws" ]];then
for i in {1..60};do
echo "attempting to nslookup ${FEDERATION_API_HOST} ($i / 60)"
nslookup "${FEDERATION_API_HOST}"
if [[ $? -eq 0 ]];then
echo "Lookup for ${FEDERATION_API_HOST} successful!"
break
fi
sleep 10
done

if [[ $i -eq 60 ]];then
echo "Failed to resolve A record for ${FEDERATION_API_HOST}. Will exit"
exit 1
fi
fi
set -o errexit

KUBE_MASTER_IP="${FEDERATION_API_HOST}:443"
else
echo "provider ${KUBERNETES_PROVIDER} is not (yet) supported for e2e testing"
Expand Down
4 changes: 0 additions & 4 deletions federation/manifests/federation-apiserver-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ spec:
- --etcd-servers=http://localhost:2379
- --service-cluster-ip-range={{.FEDERATION_SERVICE_CIDR}}
- --secure-port=443
{{if eq .KUBERNETES_PROVIDER "aws"}}
- --external-hostname={{.FEDERATION_API_HOST}}
{{else}}
- --advertise-address={{.FEDERATION_API_HOST}}
{{end}}
# TODO: --admission-control values must be set when support is added for each type of control.
- --token-auth-file=/srv/kubernetes/known-tokens.csv
ports:
Expand Down