github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

fixup! set advertise address if not ip address

Browse Source
This commit is contained in:
Colin Hom 2016-10-07 14:18:07 -07:00
parent 5039d93c60
commit c7ee1a0749
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
federation/cluster/common.sh
View File

@ -109,7 +109,7 @@ function create-federation-api-objects {
export FEDERATION_API_HOST="" export FEDERATION_API_HOST=""
export KUBE_MASTER_IP="" export KUBE_MASTER_IP=""
local is_dns_name="false" export IS_DNS_NAME="false"
if [[ "$KUBERNETES_PROVIDER" == "vagrant" ]];then if [[ "$KUBERNETES_PROVIDER" == "vagrant" ]];then
# The vagrant approach is to use a nodeport service, and point kubectl at one of the nodes # The vagrant approach is to use a nodeport service, and point kubectl at one of the nodes
$template "${manifests_root}/federation-apiserver-nodeport-service.yaml" | $host_kubectl create -f - $template "${manifests_root}/federation-apiserver-nodeport-service.yaml" | $host_kubectl create -f -
@ -121,7 +121,7 @@ function create-federation-api-objects {
# Any providers where ingress is a DNS name should tick this box. # Any providers where ingress is a DNS name should tick this box.
# TODO(chom): attempt to do this automatically # TODO(chom): attempt to do this automatically
if [[ "$KUBERNETES_PROVIDER" == "aws" ]];then if [[ "$KUBERNETES_PROVIDER" == "aws" ]];then
is_dns_name="true" IS_DNS_NAME="true"
fi fi
# any capable providers should use a loadbalancer service # any capable providers should use a loadbalancer service
# we check for ingress.ip and ingress.hostname, so should work for any loadbalancer-providing provider # we check for ingress.ip and ingress.hostname, so should work for any loadbalancer-providing provider
@ -186,8 +186,8 @@ function create-federation-api-objects {
# Create server certificates. # Create server certificates.
ensure-temp-dir ensure-temp-dir
echo "Creating federation apiserver certs for federation api host: ${FEDERATION_API_HOST} ( is this a dns name?: ${is_dns_name} )" echo "Creating federation apiserver certs for federation api host: ${FEDERATION_API_HOST} ( is this a dns name?: ${IS_DNS_NAME} )"
MASTER_NAME="federation-apiserver" IS_DNS_NAME="${is_dns_name}" create-federation-apiserver-certs ${FEDERATION_API_HOST} MASTER_NAME="federation-apiserver" create-federation-apiserver-certs ${FEDERATION_API_HOST}
export FEDERATION_APISERVER_CA_CERT_BASE64="${FEDERATION_APISERVER_CA_CERT_BASE64}" export FEDERATION_APISERVER_CA_CERT_BASE64="${FEDERATION_APISERVER_CA_CERT_BASE64}"
export FEDERATION_APISERVER_CERT_BASE64="${FEDERATION_APISERVER_CERT_BASE64}" export FEDERATION_APISERVER_CERT_BASE64="${FEDERATION_APISERVER_CERT_BASE64}"
export FEDERATION_APISERVER_KEY_BASE64="${FEDERATION_APISERVER_KEY_BASE64}" export FEDERATION_APISERVER_KEY_BASE64="${FEDERATION_APISERVER_KEY_BASE64}"

3
federation/manifests/federation-apiserver-deployment.yaml
View File

@ -23,6 +23,9 @@ spec:
- --etcd-servers=http://localhost:2379 - --etcd-servers=http://localhost:2379
- --service-cluster-ip-range={{.FEDERATION_SERVICE_CIDR}} - --service-cluster-ip-range={{.FEDERATION_SERVICE_CIDR}}
- --secure-port=443 - --secure-port=443
{{if eq .IS_DNS_NAME "false"}}
- --advertise-address={{.FEDERATION_API_HOST}}
{{end}}
- --client-ca-file=/srv/kubernetes/ca.crt - --client-ca-file=/srv/kubernetes/ca.crt
- --basic-auth-file=/srv/kubernetes/basic-auth.csv - --basic-auth-file=/srv/kubernetes/basic-auth.csv
- --tls-cert-file=/srv/kubernetes/server.cert - --tls-cert-file=/srv/kubernetes/server.cert