github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix broken cluster/centos and enhance the style

Browse Source 
run hack/verify-boilerplate.sh, fix the Copyright
This commit is contained in:
xiaoping378
2016-10-04 16:47:47 +08:00
parent 3be5706830
commit ae1c0e6d38
13 changed files with 191 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/centos/node/scripts/docker.sh
View File

@@ -20,7 +20,7 @@ DOCKER_OPTS=${1:-""}
DOCKER_CONFIG=/opt/kubernetes/cfg/docker
cat <<EOF >$DOCKER_CONFIG
DOCKER_OPTS="-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock -s devicemapper --selinux-enabled=false ${DOCKER_OPTS}"
DOCKER_OPTS="-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock -s overlay --selinux-enabled=false ${DOCKER_OPTS}"
EOF
cat <<EOF >/usr/lib/systemd/system/docker.service
@@ -45,4 +45,4 @@ EOF
systemctl daemon-reload
systemctl enable docker
systemctl start docker
systemctl restart docker

12
cluster/centos/node/scripts/kubelet.sh
View File

@@ -17,6 +17,8 @@
MASTER_ADDRESS=${1:-"8.8.8.18"}
NODE_ADDRESS=${2:-"8.8.8.20"}
DNS_SERVER_IP=${3:-"192.168.3.100"}
DNS_DOMAIN=${4:-"cluster.local"}
cat <<EOF >/opt/kubernetes/cfg/kubelet
@@ -35,13 +37,17 @@ NODE_PORT="--port=10250"
# --hostname-override="": If non-empty, will use this string as identification instead of the actual hostname.
NODE_HOSTNAME="--hostname-override=${NODE_ADDRESS}"
# --api-servers=[]: List of Kubernetes API servers for publishing events,
# --api-servers=[]: List of Kubernetes API servers for publishing events,
# and reading pods and services. (ip:port), comma separated.
KUBELET_API_SERVER="--api-servers=${MASTER_ADDRESS}:8080"
# --allow-privileged=false: If true, allow containers to request privileged mode. [default=false]
KUBE_ALLOW_PRIV="--allow-privileged=false"
# DNS info
KUBELET__DNS_IP="--cluster-dns=${DNS_SERVER_IP}"
KUBELET_DNS_DOMAIN="--cluster-domain=${DNS_DOMAIN}"
# Add your own!
KUBELET_ARGS=""
EOF
@@ -53,6 +59,8 @@ KUBE_PROXY_OPTS=" \${KUBE_LOGTOSTDERR} \\
\${NODE_HOSTNAME} \\
\${KUBELET_API_SERVER} \\
\${KUBE_ALLOW_PRIV} \\
\${KUBELET__DNS_IP} \\
\${KUBELET_DNS_DOMAIN} \\
\${KUBELET_ARGS}"
cat <<EOF >/usr/lib/systemd/system/kubelet.service
@@ -73,4 +81,4 @@ EOF
systemctl daemon-reload
systemctl enable kubelet
systemctl start kubelet
systemctl restart kubelet

2
cluster/centos/node/scripts/proxy.sh
View File

@@ -53,4 +53,4 @@ EOF
systemctl daemon-reload
systemctl enable kube-proxy
systemctl start kube-proxy
systemctl restart kube-proxy