Skip to content

K
k3s
Commit 11aa1de0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #46992 from mikedanese/restart-fix

Automatic merge from submit-queue (batch tested with PRs 46967, 46992, 43338, 46717, 46672) save kubelet bootstrap certs on GCI Fix https://github.com/kubernetes/kubernetes/issues/46982
parents f1dfda1f ab63017b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
cluster/gce/gci/configure-helper.sh
View file @ 11aa1de0
...@@ -670,6 +670,10 @@ function load-docker-images { ...@@ -670,6 +670,10 @@ function load-docker-images {
# using systemctl. # using systemctl.
function start-kubelet { function start-kubelet {
echo "Start kubelet" echo "Start kubelet"
local -r kubelet_cert_dir="/var/lib/kubelet/pki/"
mkdir -p "${kubelet_cert_dir}"
local kubelet_bin="${KUBE_HOME}/bin/kubelet" local kubelet_bin="${KUBE_HOME}/bin/kubelet"
local -r version="$("${kubelet_bin}" --version=true | cut -f2 -d " ")" local -r version="$("${kubelet_bin}" --version=true | cut -f2 -d " ")"
local -r builtin_kubelet="/usr/bin/kubelet" local -r builtin_kubelet="/usr/bin/kubelet"
...@@ -695,6 +699,7 @@ function start-kubelet { ...@@ -695,6 +699,7 @@ function start-kubelet {
flags+=" --pod-manifest-path=/etc/kubernetes/manifests" flags+=" --pod-manifest-path=/etc/kubernetes/manifests"
flags+=" --experimental-mounter-path=${CONTAINERIZED_MOUNTER_HOME}/mounter" flags+=" --experimental-mounter-path=${CONTAINERIZED_MOUNTER_HOME}/mounter"
flags+=" --experimental-check-node-capabilities-before-mount=true" flags+=" --experimental-check-node-capabilities-before-mount=true"
flags+=" --cert-dir=${kubelet_cert_dir}"
if [[ -n "${KUBELET_PORT:-}" ]]; then if [[ -n "${KUBELET_PORT:-}" ]]; then
flags+=" --port=${KUBELET_PORT}" flags+=" --port=${KUBELET_PORT}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment