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

Trusty: fix the 'ping' issue and fluentd-gcp issue #26379

Browse Source
This commit is contained in:
Andy Zheng 2016-06-09 10:48:56 -07:00
parent c9c4ada309
commit 5b1ceb5ff0
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cluster/gce/trusty/configure-helper.sh
View File

@ -29,16 +29,18 @@ config_hostname() {
config_ip_firewall() { config_ip_firewall() {
# We have seen that GCE image may have strict host firewall rules which drop # We have seen that GCE image may have strict host firewall rules which drop
# most inbound/forwarded packets. In such a case, add rules to accept all # most inbound/forwarded packets. In such a case, add rules to accept all
# TCP/UDP packets. # TCP/UDP/ICMP packets.
if iptables -L INPUT | grep "Chain INPUT (policy DROP)" > /dev/null; then if iptables -L INPUT | grep "Chain INPUT (policy DROP)" > /dev/null; then
echo "Add rules to accpet all inbound TCP/UDP packets" echo "Add rules to accpet all inbound TCP/UDP/ICMP packets"
iptables -A INPUT -w -p TCP -j ACCEPT iptables -A INPUT -w -p TCP -j ACCEPT
iptables -A INPUT -w -p UDP -j ACCEPT iptables -A INPUT -w -p UDP -j ACCEPT
iptables -A INPUT -w -p ICMP -j ACCEPT
fi fi
if iptables -L FORWARD | grep "Chain FORWARD (policy DROP)" > /dev/null; then if iptables -L FORWARD | grep "Chain FORWARD (policy DROP)" > /dev/null; then
echo "Add rules to accpet all forwarded TCP/UDP packets" echo "Add rules to accpet all forwarded TCP/UDP/ICMP packets"
iptables -A FORWARD -w -p TCP -j ACCEPT iptables -A FORWARD -w -p TCP -j ACCEPT
iptables -A FORWARD -w -p UDP -j ACCEPT iptables -A FORWARD -w -p UDP -j ACCEPT
iptables -A FORWARD -w -p ICMP -j ACCEPT
fi fi
} }
@ -182,6 +184,16 @@ assemble_kubelet_flags() {
echo "KUBELET_OPTS=\"${KUBELET_CMD_FLAGS}\"" > /etc/default/kubelet echo "KUBELET_OPTS=\"${KUBELET_CMD_FLAGS}\"" > /etc/default/kubelet
} }
start_kubelet(){
echo "Start kubelet"
# Delete docker0 to avoid interference
iptables -t nat -F || true
ip link set docker0 down || true
brctl delbr docker0 || true
. /etc/default/kubelet
/usr/bin/kubelet ${KUBELET_OPTS} 1>>/var/log/kubelet.log 2>&1
}
restart_docker_daemon() { restart_docker_daemon() {
DOCKER_OPTS="-p /var/run/docker.pid --bridge=cbr0 --iptables=false --ip-masq=false" DOCKER_OPTS="-p /var/run/docker.pid --bridge=cbr0 --iptables=false --ip-masq=false"
if [ "${TEST_CLUSTER:-}" = "true" ]; then if [ "${TEST_CLUSTER:-}" = "true" ]; then
@ -200,9 +212,6 @@ restart_docker_daemon() {
echo "Sleep 1 second to wait for cbr0" echo "Sleep 1 second to wait for cbr0"
sleep 1 sleep 1
done done
# Remove docker0
ifconfig docker0 down
brctl delbr docker0
# Ensure docker daemon is really functional before exiting. Operations afterwards may # Ensure docker daemon is really functional before exiting. Operations afterwards may
# assume it is running. # assume it is running.
while ! docker version > /dev/null; do while ! docker version > /dev/null; do

5
cluster/gce/trusty/master.yaml
View File

@ -134,9 +134,8 @@ script
set -o errexit set -o errexit
set -o nounset set -o nounset
echo "Start kubelet upstart job" . /etc/kube-configure-helper.sh
. /etc/default/kubelet start_kubelet
/usr/bin/kubelet ${KUBELET_OPTS} 1>>/var/log/kubelet.log 2>&1
} 2>&1 | logger --priority daemon.info -t ${UPSTART_JOB} } 2>&1 | logger --priority daemon.info -t ${UPSTART_JOB}
end script end script

5
cluster/gce/trusty/node.yaml
View File

@ -132,9 +132,8 @@ script
set -o errexit set -o errexit
set -o nounset set -o nounset
echo "Start kubelet upstart job" . /etc/kube-configure-helper.sh
. /etc/default/kubelet start_kubelet
/usr/bin/kubelet ${KUBELET_OPTS} 1>>/var/log/kubelet.log 2>&1
} 2>&1 | logger --priority daemon.info -t ${UPSTART_JOB} } 2>&1 | logger --priority daemon.info -t ${UPSTART_JOB}
end script end script