Skip to content

Commit 42a1e5e

Browse files
Merge pull request #8131 from sdodson/remove-hyperkube
OCPBUGS-30547,OCPBUGS-29437: Run kubelet directly
2 parents 55ff2a0 + 8a4b677 commit 42a1e5e

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

data/data/bootstrap/files/usr/local/bin/kubelet.sh.template

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
# shellcheck disable=SC1091 # using path on bootstrap machine
44
. /usr/local/bin/bootstrap-service-record.sh
55

6-
/usr/bin/hyperkube \
7-
kubelet \
6+
/usr/bin/kubelet \
87
--anonymous-auth=false \
98
--container-runtime-endpoint=/var/run/crio/crio.sock \
109
--runtime-request-timeout="${KUBELET_RUNTIME_REQUEST_TIMEOUT}" \

docs/user/customization.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,7 @@ For example:
350350
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
351351
EnvironmentFile=-/etc/kubernetes/kubelet-env
352352
353-
ExecStart=/usr/bin/hyperkube \
354-
kubelet \
353+
ExecStart=/usr/bin/kubelet \
355354
--config=/etc/kubernetes/kubelet.conf \
356355
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
357356
--rotate-certificates \

0 commit comments

Comments
 (0)