github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 06:15:45 +00:00
Code Issues Projects Releases Wiki Activity

leverage $public_ip4 for apiserver communication

Browse Source
This commit is contained in:
Ryan Richard 2015-05-04 23:44:27 -07:00
parent 936f9cc95d
commit 75dac16c34
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/rackspace/cloud-config/master-cloud-config.yaml
View File

@ -89,7 +89,7 @@ coreos:
Requires=etcd.service Requires=etcd.service
After=master-apiserver.service After=master-apiserver.service
[Service] [Service]
ExecStart=/bin/sh -c 'etcdctl set /corekube/apiservers/$private_ipv4 $private_ipv4' ExecStart=/bin/sh -c 'etcdctl set /corekube/apiservers/$public_ipv4 $public_ipv4'
Restart=always Restart=always
RestartSec=120 RestartSec=120
- name: master-controller-manager.service - name: master-controller-manager.service

10
cluster/rackspace/cloud-config/minion-cloud-config.yaml
View File

@ -19,7 +19,7 @@ write_files:
m=$(echo $(etcdctl ls --recursive /corekube/apiservers | cut -d/ -f4 | sort) | tr ' ' ,) m=$(echo $(etcdctl ls --recursive /corekube/apiservers | cut -d/ -f4 | sort) | tr ' ' ,)
mkdir -p /run/kubelet mkdir -p /run/kubelet
echo "APISERVER_IPS=$m" > /run/kubelet/apiservers.env echo "APISERVER_IPS=$m" > /run/kubelet/apiservers.env
echo "FIRST_APISERVER_URL=http://${m%%\,*}:7080" >> /run/kubelet/apiservers.env echo "FIRST_APISERVER_URL=http://${m%%\,*}:6443" >> /run/kubelet/apiservers.env
- path: /opt/bin/download-release.sh - path: /opt/bin/download-release.sh
permissions: 0755 permissions: 0755
content: | content: |
@ -75,9 +75,9 @@ coreos:
After=download-release.service After=download-release.service
Requires=download-release.service Requires=download-release.service
[Service] [Service]
EnvironmentFile=/run/kubelet/apiserver.env EnvironmentFile=/run/kubelet/apiservers.env
ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kubelet /opt/bin/kubelet ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kubelet /opt/bin/kubelet
ExecStart=/opt/bin/kubelet --address=$private_ipv4 --hostname_override=$private_ipv4 --api_servers=$FIRST_APISERVER_URL --logtostderr=true --config=/opt/kubernetes-manifests --cluster_dns=DNS_SERVER_IP --cluster_domain=DNS_DOMAIN ExecStart=/opt/bin/kubelet --address=$private_ipv4 --hostname_override=$private_ipv4 --api_servers=${FIRST_APISERVER_URL} --logtostderr=true --config=/opt/kubernetes-manifests --cluster_dns=DNS_SERVER_IP --cluster_domain=DNS_DOMAIN
Restart=always Restart=always
RestartSec=2 RestartSec=2
- name: minion-proxy.service - name: minion-proxy.service
@ -93,9 +93,9 @@ coreos:
After=download-release.service After=download-release.service
Requires=download-release.service Requires=download-release.service
[Service] [Service]
EnvironmentFile=/run/kubelet/apiserver.env EnvironmentFile=/run/kubelet/apiservers.env
ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kube-proxy /opt/bin/kube-proxy ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kube-proxy /opt/bin/kube-proxy
ExecStart=/opt/bin/kube-proxy --bind_address=$private_ipv4 --master=$FIRST_APISERVER_URL --logtostderr=true ExecStart=/opt/bin/kube-proxy --bind_address=$private_ipv4 --master=${FIRST_APISERVER_URL} --logtostderr=true
Restart=always Restart=always
RestartSec=2 RestartSec=2
- name: kubelet-sighup.path - name: kubelet-sighup.path

4
cluster/rackspace/util.sh
View File

@ -60,7 +60,7 @@ get-password() {
get-kubeconfig-basicauth get-kubeconfig-basicauth
if [[ -z "${KUBE_USER}" || -z "${KUBE_PASSWORD}" ]]; then if [[ -z "${KUBE_USER}" || -z "${KUBE_PASSWORD}" ]]; then
KUBE_USER=admin KUBE_USER=admin
KUBE_PASSWORD=$(python -c 'import string,random; print "".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(16))') KUBE_PASSWORD=$(python2.7 -c 'import string,random; print "".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(16))')
fi fi
} }
@ -276,7 +276,7 @@ kube-up() {
trap "rm -rf ${KUBE_TEMP}" EXIT trap "rm -rf ${KUBE_TEMP}" EXIT
get-password get-password
python $(dirname $0)/../third_party/htpasswd/htpasswd.py -b -c ${KUBE_TEMP}/htpasswd $KUBE_USER $KUBE_PASSWORD python2.7 $(dirname $0)/../third_party/htpasswd/htpasswd.py -b -c ${KUBE_TEMP}/htpasswd $KUBE_USER $KUBE_PASSWORD
HTPASSWD=$(cat ${KUBE_TEMP}/htpasswd) HTPASSWD=$(cat ${KUBE_TEMP}/htpasswd)
rax-nova-network rax-nova-network