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

Merge pull request #4351 from rajatchopra/master

Browse Source 
democratize restart-apiserver method across clouds
This commit is contained in:
roberthbailey 2015-02-11 15:23:06 -08:00
commit 2ed888592b
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/azure/util.sh
View File

@ -555,6 +555,11 @@ function restart-kube-proxy {
ssh-to-node "$1" "sudo /etc/init.d/kube-proxy restart" ssh-to-node "$1" "sudo /etc/init.d/kube-proxy restart"
} }
# Restart the kube-proxy on the master ($1)
function restart-apiserver {
ssh-to-node "$1" "sudo /etc/init.d/kube-apiserver restart"
}
# Setup monitoring using heapster and InfluxDB # Setup monitoring using heapster and InfluxDB
function setup-monitoring-firewall { function setup-monitoring-firewall {
echo "not implemented" >/dev/null echo "not implemented" >/dev/null

5
cluster/gce/util.sh
View File

@ -748,6 +748,11 @@ function restart-kube-proxy {
ssh-to-node "$1" "sudo /etc/init.d/kube-proxy restart" ssh-to-node "$1" "sudo /etc/init.d/kube-proxy restart"
} }
# Restart the kube-proxy on a node ($1)
function restart-apiserver {
ssh-to-node "$1" "sudo /etc/init.d/kube-apiserver restart"
}
# Setup monitoring firewalls using heapster and InfluxDB # Setup monitoring firewalls using heapster and InfluxDB
function setup-monitoring-firewall { function setup-monitoring-firewall {
if [[ "${ENABLE_CLUSTER_MONITORING}" != "true" ]]; then if [[ "${ENABLE_CLUSTER_MONITORING}" != "true" ]]; then

6
cluster/gke/util.sh
View File

@ -214,6 +214,12 @@ function restart-kube-proxy() {
ssh-to-node "$1" "sudo /etc/init.d/kube-proxy restart" ssh-to-node "$1" "sudo /etc/init.d/kube-proxy restart"
} }
# Restart the kube-proxy on master ($1)
function restart-apiserver() {
echo "... in restart-kube-apiserver()" >&2
ssh-to-node "$1" "sudo /etc/init.d/kube-apiserver restart"
}
# Execute after running tests to perform any required clean-up. This is called # Execute after running tests to perform any required clean-up. This is called
# from hack/e2e-test.sh. This calls kube-down, so the cluster still exists when # from hack/e2e-test.sh. This calls kube-down, so the cluster still exists when
# this is called. # this is called.

2
cluster/vagrant/util.sh
View File

@ -306,7 +306,7 @@ function restart-kube-proxy {
# Restart the apiserver # Restart the apiserver
function restart-apiserver { function restart-apiserver {
ssh-to-node "${master}" "sudo systemctl restart kube-apiserver" ssh-to-node "$1" "sudo systemctl restart kube-apiserver"
} }
function setup-monitoring-firewall { function setup-monitoring-firewall {

6
hack/e2e-suite/services.sh
View File

@ -415,11 +415,7 @@ verify_from_container "${svc3_name}" "${svc3_ip}" "${svc3_port}" \
# #
echo "Test 6: Restart the master, make sure portals come back." echo "Test 6: Restart the master, make sure portals come back."
echo "Restarting the master" echo "Restarting the master"
if [[ "$KUBERNETES_PROVIDER" == "vagrant" ]]; then restart-apiserver "${master}"
restart-apiserver "${master}"
else
ssh-to-node "${master}" "sudo /etc/init.d/kube-apiserver restart"
fi
sleep 5 sleep 5
echo "Verifying the portals from the host" echo "Verifying the portals from the host"
wait_for_service_up "${svc3_name}" "${svc3_ip}" "${svc3_port}" \ wait_for_service_up "${svc3_name}" "${svc3_ip}" "${svc3_port}" \