From 8e26283965a364746c22fa72d2ab412e6b4ee307 Mon Sep 17 00:00:00 2001 From: mfanjie Date: Tue, 14 Jun 2016 15:40:07 +0800 Subject: [PATCH] add federation-name and zone-name flags to e2e test --- federation/cluster/common.sh | 1 + .../manifests/federation-controller-manager-deployment.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/federation/cluster/common.sh b/federation/cluster/common.sh index 90acaeb462b..933ad41633e 100644 --- a/federation/cluster/common.sh +++ b/federation/cluster/common.sh @@ -94,6 +94,7 @@ function create-federation-api-objects { export FEDERATION_API_NODEPORT=32111 export FEDERATION_NAMESPACE export FEDERATION_NAME="${FEDERATION_NAME:-federation}" + export DNS_ZONE_NAME="${DNS_ZONE_NAME:-example.com}" template="go run ${KUBE_ROOT}/federation/cluster/template.go" diff --git a/federation/manifests/federation-controller-manager-deployment.yaml b/federation/manifests/federation-controller-manager-deployment.yaml index 82b973e481c..438e7bf90a0 100644 --- a/federation/manifests/federation-controller-manager-deployment.yaml +++ b/federation/manifests/federation-controller-manager-deployment.yaml @@ -21,6 +21,8 @@ spec: - --master=https://{{.FEDERATION_APISERVER_DEPLOYMENT_NAME}}:443 - --dns-provider={{.FEDERATION_DNS_PROVIDER}} - --dns-provider-config={{.FEDERATION_DNS_PROVIDER_CONFIG}} + - --federation-name={{.FEDERATION_NAME}} + - --zone-name={{.DNS_ZONE_NAME}} ports: - containerPort: 443 name: https