Skip to content

fix: Detect runtime for RKE2 deployments via kubelet config file #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
malmor wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Detect runtime for RKE2 deployments via kubelet config file #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions k8s/scripts/kubelet-config-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,13 +1255,24 @@ function stop_rke2() {

function get_runtime_kubelet_rke2() {
set +e
runtime=$(ps -e -o command | egrep kubelet | egrep -o "container-runtime-endpoint=\S*" | cut -d '=' -f2)
set -e

# Try RKE2 v1.32+ config file first
local rke2_config="/var/lib/rancher/rke2/agent/etc/kubelet.conf.d/00-rke2-defaults.conf"
if [[ -f "$rke2_config" ]]; then
runtime=$(grep "^containerRuntimeEndpoint:" "$rke2_config" | awk '{print $2}')
fi

# Fallback to legacy kubelet command line parameter for older versions
if [[ -z "$runtime" ]]; then
runtime=$(ps -e -o command | grep kubelet | grep -o "container-runtime-endpoint=\S*" | cut -d '=' -f2)
fi

# If runtime is unknown, assume it's Docker
if [[ ${runtime} == "" ]]; then
runtime="unix:///var/run/dockershim.sock"
fi

set -e
}

function config_kubelet_rke2() {
Expand Down
17 changes: 14 additions & 3 deletions k8s/scripts/kubelet-unconfig-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,13 +345,24 @@ function revert_kubelet_config_rke2() {

function get_runtime_kubelet_rke2() {
set +e
runtime=$(ps -e -o command | egrep kubelet | egrep -o "container-runtime-endpoint=\S*" | cut -d '=' -f2)
set -e

# If runtime is unknown, assume it's Docker.
# Try RKE2 v1.32+ config file first
local rke2_config="/var/lib/rancher/rke2/agent/etc/kubelet.conf.d/00-rke2-defaults.conf"
if [[ -f "$rke2_config" ]]; then
runtime=$(grep "^containerRuntimeEndpoint:" "$rke2_config" | awk '{print $2}')
fi

# Fallback to legacy kubelet command line parameter for older versions
if [[ -z "$runtime" ]]; then
runtime=$(ps -e -o command | grep kubelet | grep -o "container-runtime-endpoint=\S*" | cut -d '=' -f2)
fi

# If runtime is unknown, assume it's Docker
if [[ ${runtime} == "" ]]; then
runtime="unix:///var/run/dockershim.sock"
fi

set -e
}

function do_unconfig_kubelet_rke2() {
Expand Down