github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20642 from justinsb/aws_sync_kubeup_gce_step2

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-06 11:56:47 -08:00
parent d1b7fb3025 ba415c1f39
commit 9d981b696c
3 changed files with 73 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/aws/util.sh
View File

@@ -926,11 +926,7 @@ function start-master() {
# Get or create master elastic IP
ensure-master-ip
# Determine extra certificate names for master
octets=($(echo "$SERVICE_CLUSTER_IP_RANGE" | sed -e 's|/.*||' -e 's/\./ /g'))
((octets[3]+=1))
service_ip=$(echo "${octets[*]}" | sed 's/ /./g')
MASTER_EXTRA_SANS="IP:${service_ip},DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.${DNS_DOMAIN},DNS:${MASTER_NAME}"
create-certs "" # TODO: Should we pass ELB name / elastic IP ?
write-master-env