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

Merge pull request #10698 from justinsb/aws_master_sans

Browse Source 
AWS: Configure SSL certificate alternate-names
This commit is contained in:
Yu-Ju Hong
2015-07-06 09:57:44 -07:00
parent dad97b6224 c676c11189
commit 83fbcba97b
4 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/aws/templates/salt-master.sh
View File

@@ -44,6 +44,12 @@ if [[ -n "${KUBELET_ROOT}" ]]; then
EOF
fi
if [[ -n "${MASTER_EXTRA_SANS}" ]]; then
cat <<EOF >>/etc/salt/minion.d/grains.conf
master_extra_sans: '$(echo "$MASTER_EXTRA_SANS" | sed -e "s/'/''/g")'
EOF
fi
# Auto accept all keys from minions that try to join
mkdir -p /etc/salt/master.d
cat <<EOF >/etc/salt/master.d/auto-accept.conf

8
cluster/aws/util.sh
View File

@@ -770,6 +770,13 @@ function kube-up {
# Get or create master persistent volume
ensure-master-pd
# 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}"
(
# We pipe this to the ami as a startup script in the user-data field. Requires a compatible ami
echo "#! /bin/bash"
@@ -800,6 +807,7 @@ function kube-up {
echo "readonly KUBELET_TOKEN='${KUBELET_TOKEN}'"
echo "readonly KUBE_PROXY_TOKEN='${KUBE_PROXY_TOKEN}'"
echo "readonly DOCKER_STORAGE='${DOCKER_STORAGE:-}'"
echo "readonly MASTER_EXTRA_SANS='${MASTER_EXTRA_SANS:-}'"
grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/common.sh"
grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/format-disks.sh"
grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/setup-master-pd.sh"