Skip to content
This repository has been archived by the owner on Sep 30, 2020. It is now read-only.

Commit

Permalink
Fix kube-proxy startup race condition when metric server is enabled. (#…
Browse files Browse the repository at this point in the history
…1426)

The fix is to move the installation of kube-proxy up in the install-kube-system script, so it gets
a chance to start before the installation checks for it and goes into a loop.

Fixes #1424
  • Loading branch information
omar-nahhas authored and mumoshu committed Aug 3, 2018
1 parent c6d72bc commit f40a82e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions core/controlplane/config/templates/cloud-config-controller
Original file line number Diff line number Diff line change
Expand Up @@ -987,6 +987,12 @@ write_files:

applyall "/srv/kubernetes/manifests/kube-system-ns.yaml"

# Daemonsets
applyall \
"${mfdir}/kube-proxy-ds.yaml" \
{{ if .Experimental.NodeDrainer.Enabled }}"${mfdir}/kube-node-drainer-ds.yaml"{{ end }} \
{{ if .KubeDns.NodeLocalResolver }}"${mfdir}/dnsmasq-node-ds.yaml"{{ end }}

# See https://github.com/kubernetes-incubator/kube-aws/issues/1039#issuecomment-348978375
if ks get apiservice v1beta1.metrics.k8s.io && ! ps ax | grep '[h]yperkube proxy'; then
echo "apiserver is up but kube-proxy isn't up. We have likely encountered #1039."
Expand Down Expand Up @@ -1077,12 +1083,6 @@ write_files:
{{ if .KubeResourcesAutosave.Enabled }}"${mfdir}/kube-resources-autosave-de.yaml"{{ end }} \
{{ if .KubernetesDashboard.Enabled }}"${mfdir}/kubernetes-dashboard-de.yaml"{{ end }}

# Daemonsets
applyall \
"${mfdir}/kube-proxy-ds.yaml" \
{{ if .Experimental.NodeDrainer.Enabled }}"${mfdir}/kube-node-drainer-ds.yaml"{{ end }} \
{{ if .KubeDns.NodeLocalResolver }}"${mfdir}/dnsmasq-node-ds.yaml"{{ end }}

# Services
applyall \
"${mfdir}/heapster-svc.yaml" \
Expand Down

0 comments on commit f40a82e

Please sign in to comment.