[Release-1.24] - prefer-bundled-bin flag cannot be set via config.yaml.d

[dereknola]

Backport fix for prefer-bundled-bin flag cannot be set via config.yaml.d

• prefer-bundled-bin flag cannot be set via config.yaml.d #7316

[fmoral2]

Validated on Version:

• [k3s version v1.24.13+k3s-b865512f (b865512)] COMMIT ID= (b865512)

Environment Details

Infrastructure
Cloud EC2 instance

Node(s) CPU architecture, OS, and Version:
Ubuntu 22.04
CENTOS 7
SLES 15 SP4

Cluster Configuration:
1 node

Config.yaml 1 server node :

write-kubeconfig-mode: 644
token: test
selinux: true
protect-kernel-defaults: true
cluster-init: true

Config.yaml.d/test.yaml :

prefer-bundled-bin: true

Steps to validate the fix:

1. Create 1 node cluster
2. Add prefer-bundled-bin: true config on .d file => Config.yaml.d/test.yaml
3. Get ID for k3s var envs process
   • $ ID=$(pgrep k3s-server)
   • $ sudo cat /proc/${ID}/environ | xargs -n1 -0 echo | grep PATH
4. Check the path order

Validation Results:

• [k3s version v1.24.13+k3s-b865512f (b865512)] COMMIT ID= (b865512)

             
~$ cat /etc/os-release
PRETTY_NAME="Ubuntu 22.04.1 LTS"
NAME="Ubuntu"

$ ID=$(pgrep k3s-server)
$ sudo cat /proc/${ID}/environ | xargs -n1 -0 echo | grep PATH

PATH=/var/lib/rancher/k3s/data/62e3fbd13be6245acd26ffc79e121a32c4aa56bd23a02f76c67c8e9e5a5ec7df/bin:/var/lib/rancher/k3s/data/62e3fbd13be6245acd26ffc79e121a32c4aa56bd23a02f76c67c8e9e5a5ec7df/bin/aux:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin