diff --git a/doc/source/configuration/host-system.rst b/doc/source/configuration/host-system.rst index 3438b5e8..c1c551a5 100644 --- a/doc/source/configuration/host-system.rst +++ b/doc/source/configuration/host-system.rst @@ -15,7 +15,7 @@ Sample Document to run containers in Docker runtime layer: site data: files: - - path: /opt/kubernetes/bin/kubelet + - path: /usr/local/bin/kubelet tar_url: https://dl.k8s.io/v1.32.1/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 @@ -114,7 +114,7 @@ Sample Document to run containers in Containerd runtime layer: site data: files: - - path: /opt/kubernetes/bin/kubelet + - path: /usr/local/bin/kubelet tar_url: https://dl.k8s.io/v1.32.1/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 diff --git a/examples/basic/HostSystem.yaml b/examples/basic/HostSystem.yaml index 784102ed..2413a398 100644 --- a/examples/basic/HostSystem.yaml +++ b/examples/basic/HostSystem.yaml @@ -12,7 +12,7 @@ data: kube-cgroup: enable: true files: - - path: /opt/kubernetes/bin/kubelet + - path: /usr/local/bin/kubelet tar_url: https://dl.k8s.io/v1.32.1/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 diff --git a/examples/complete/HostSystem.yaml b/examples/complete/HostSystem.yaml index f880fef3..08e65faa 100644 --- a/examples/complete/HostSystem.yaml +++ b/examples/complete/HostSystem.yaml @@ -12,7 +12,7 @@ data: kube-cgroup: enable: true files: - - path: /opt/kubernetes/bin/kubelet + - path: /usr/local/bin/kubelet tar_url: https://dl.k8s.io/v1.32.1/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 diff --git a/examples/containerd/HostSystem.yaml b/examples/containerd/HostSystem.yaml index 34e2c6a5..d43541bd 100644 --- a/examples/containerd/HostSystem.yaml +++ b/examples/containerd/HostSystem.yaml @@ -12,7 +12,7 @@ data: kube-cgroup: enable: true files: - - path: /opt/kubernetes/bin/kubelet + - path: /usr/local/bin/kubelet tar_url: https://dl.k8s.io/v1.32.1/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 diff --git a/examples/gate/HostSystem.yaml b/examples/gate/HostSystem.yaml index 7a3633ee..0038d2b6 100644 --- a/examples/gate/HostSystem.yaml +++ b/examples/gate/HostSystem.yaml @@ -12,7 +12,7 @@ data: kube-cgroup: enable: true files: - - path: /opt/kubernetes/bin/kubelet + - path: /usr/local/bin/kubelet tar_url: https://dl.k8s.io/v1.32.1/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 diff --git a/promenade/templates/roles/common/etc/systemd/system/kubelet.service b/promenade/templates/roles/common/etc/systemd/system/kubelet.service index cf931c87..4f7e3399 100644 --- a/promenade/templates/roles/common/etc/systemd/system/kubelet.service +++ b/promenade/templates/roles/common/etc/systemd/system/kubelet.service @@ -16,7 +16,7 @@ EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env # This is a file that the user can use for overrides of the kubelet args as a last resort. Preferably, the user should use # the .NodeRegistration.KubeletExtraArgs object in the configuration files instead. KUBELET_EXTRA_ARGS should be sourced from this file. EnvironmentFile=-/etc/default/kubelet -ExecStart=/opt/kubernetes/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS $KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS +ExecStart=/usr/local/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS $KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS Restart=always StartLimitInterval=0 RestartSec=10 diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index 9b78eaf3..9370c3cf 100644 --- a/tests/unit/api/test_validatedesign.py +++ b/tests/unit/api/test_validatedesign.py @@ -139,7 +139,7 @@ VALID_DOCS = [ 'mode': 365, 'path': - '/opt/kubernetes/bin/kubelet', + '/usr/local/bin/kubelet', 'tar_path': 'kubernetes/node/bin/kubelet', 'tar_url': diff --git a/tests/unit/builder_data/simple/HostSystem.yaml b/tests/unit/builder_data/simple/HostSystem.yaml index e2aa4d32..72cc19ad 100644 --- a/tests/unit/builder_data/simple/HostSystem.yaml +++ b/tests/unit/builder_data/simple/HostSystem.yaml @@ -13,7 +13,7 @@ data: # (either here or via debian package; however, these unit tests don't # attempt to actually run Kubernetes, only to construct the genesis and # join scripts. - # - path: /opt/kubernetes/bin/kubelet + # - path: /usr/local/bin/kubelet # tar_url: https://dl.k8s.io/v1.32.1/kubernetes-node-linux-amd64.tar.gz # tar_path: kubernetes/node/bin/kubelet # mode: 0555 diff --git a/tools/gate/config-templates/site-config.yaml b/tools/gate/config-templates/site-config.yaml index e0856b39..221edcfb 100644 --- a/tools/gate/config-templates/site-config.yaml +++ b/tools/gate/config-templates/site-config.yaml @@ -65,7 +65,7 @@ metadata: storagePolicy: cleartext data: files: - - path: /opt/kubernetes/bin/kubelet + - path: /usr/local/bin/kubelet tar_url: ${KUBELET_URL} tar_path: kubernetes/node/bin/kubelet mode: 0555