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

kubelet: Close health port in kubelet bootstrap pods #173

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ systemd:
--cni-conf-dir=/etc/kubernetes/cni/net.d \
--config=/etc/kubernetes/kubelet.config \
--exit-on-lock-contention \
--healthz-port=0 \
--kubeconfig=/etc/kubernetes/kubeconfig \
--lock-file=/var/run/lock/kubelet.lock \
--network-plugin=cni \
Expand Down
1 change: 1 addition & 0 deletions aws/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ systemd:
--cni-conf-dir=/etc/kubernetes/cni/net.d \
--config=/etc/kubernetes/kubelet.config \
--exit-on-lock-contention \
--healthz-port=0 \
--kubeconfig=/etc/kubernetes/kubeconfig \
--lock-file=/var/run/lock/kubelet.lock \
--network-plugin=cni \
Expand Down
1 change: 1 addition & 0 deletions azure/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ systemd:
--cluster_domain=${cluster_domain_suffix} \
--cni-conf-dir=/etc/kubernetes/cni/net.d \
--exit-on-lock-contention \
--healthz-port=0 \
--kubeconfig=/etc/kubernetes/kubeconfig \
--lock-file=/var/run/lock/kubelet.lock \
--network-plugin=cni \
Expand Down
1 change: 1 addition & 0 deletions azure/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ systemd:
--cluster_domain=${cluster_domain_suffix} \
--cni-conf-dir=/etc/kubernetes/cni/net.d \
--exit-on-lock-contention \
--healthz-port=0 \
--kubeconfig=/etc/kubernetes/kubeconfig \
--lock-file=/var/run/lock/kubelet.lock \
--network-plugin=cni \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ systemd:
--cluster_domain=${cluster_domain_suffix} \
--cni-conf-dir=/etc/kubernetes/cni/net.d \
--exit-on-lock-contention \
--healthz-port=0 \
--hostname-override=${domain_name} \
--kubeconfig=/etc/kubernetes/kubeconfig \
--lock-file=/var/run/lock/kubelet.lock \
Expand Down
1 change: 1 addition & 0 deletions bare-metal/flatcar-linux/kubernetes/cl/worker.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ systemd:
--cluster_domain=${cluster_domain_suffix} \
--cni-conf-dir=/etc/kubernetes/cni/net.d \
--exit-on-lock-contention \
--healthz-port=0 \
--hostname-override=${domain_name} \
--kubeconfig=/etc/kubernetes/kubeconfig \
--lock-file=/var/run/lock/kubelet.lock \
Expand Down
9 changes: 9 additions & 0 deletions bootkube/resources/charts/kubelet/templates/kubelet-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ spec:
--network-plugin=cni \
--pod-manifest-path=/etc/kubernetes/manifests \
--read-only-port=0 \
--healthz-bind-address=$(HOST_IP) \
--volume-plugin-dir=/var/lib/kubelet/volumeplugins \
--node-labels=$(grep NODE_LABELS /etc/kubernetes/kubelet.env | cut -d'"' -f2) \
--register-with-taints=$(grep NODE_TAINTS /etc/kubernetes/kubelet.env | cut -d'"' -f2)
Expand All @@ -56,6 +57,14 @@ spec:
fieldPath: status.hostIP
securityContext:
privileged: true
livenessProbe:
httpGet:
path: /healthz
port: 10248
readinessProbe:
httpGet:
path: /healthz
port: 10248
volumeMounts:
- mountPath: /var/lib/cni
name: coreos-var-lib-cni
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ systemd:
--cluster_domain=${cluster_domain_suffix} \
--cni-conf-dir=/etc/kubernetes/cni/net.d \
--exit-on-lock-contention \
--healthz-port=0 \
--kubeconfig=/etc/kubernetes/kubeconfig \
--lock-file=/var/run/lock/kubelet.lock \
--network-plugin=cni \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ systemd:
--cluster_domain=${cluster_domain_suffix} \
--cni-conf-dir=/etc/kubernetes/cni/net.d \
--exit-on-lock-contention \
--healthz-port=0 \
--kubeconfig=/etc/kubernetes/kubeconfig \
--lock-file=/var/run/lock/kubelet.lock \
--network-plugin=cni \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ systemd:
--cni-conf-dir=/etc/kubernetes/cni/net.d \
--config=/etc/kubernetes/kubelet.config \
--exit-on-lock-contention \
--healthz-port=0 \
--kubeconfig=/etc/kubernetes/kubeconfig \
--lock-file=/var/run/lock/kubelet.lock \
--hostname-override=${etcd_domain} \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ systemd:
--cni-conf-dir=/etc/kubernetes/cni/net.d \
--config=/etc/kubernetes/kubelet.config \
--exit-on-lock-contention \
--healthz-port=0 \
--kubeconfig=/etc/kubernetes/kubeconfig \
--lock-file=/var/run/lock/kubelet.lock \
--network-plugin=cni \
Expand Down
1 change: 1 addition & 0 deletions packet/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ systemd:
--cni-conf-dir=/etc/kubernetes/cni/net.d \
--config=/etc/kubernetes/kubelet.config \
--exit-on-lock-contention \
--healthz-port=0 \
--kubeconfig=/etc/kubernetes/kubeconfig \
--lock-file=/var/run/lock/kubelet.lock \
--network-plugin=cni \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ systemd:
--cni-conf-dir=/etc/kubernetes/cni/net.d \
--config=/etc/kubernetes/kubelet.config \
--exit-on-lock-contention \
--healthz-port=0 \
--kubeconfig=/etc/kubernetes/kubeconfig \
--lock-file=/var/run/lock/kubelet.lock \
--network-plugin=cni \
Expand Down