From 3b934036cfd141c7419f663d40ddd6bc206bc2f1 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Sivanandam Date: Mon, 10 Jul 2023 08:40:01 -0400 Subject: [PATCH] Update kubelet.kubeconfig environment variable The incorrect specification of the KUBELET_KUBECONFIG environment variable made it so that default parameters were not present. Update the KUBELET_KUBECONFIG environment variable as KUBELET_KUBECONFIG="--kubeconfig=/etc/kubernetes/kubelet.kubeconfig". So that kubelet have the correct default parameters. Partial-Bug: 2026597 Test-plan: PASS - Install AIO-SX and verified that /etc/kubernetes/kubelet contains the modified value of KUBELET_KUBECONFIG. Change-Id: I38dae1b69b24b6a487d35e3f789e1b0d8171eef8 Signed-off-by: Ramesh Kumar Sivanandam --- ...let-kube-config-environment-variable.patch | 33 +++++++++++++++++++ .../debian/deb_folder/patches/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 kubernetes/kubernetes-unversioned/debian/deb_folder/patches/Update-kubelet-kube-config-environment-variable.patch diff --git a/kubernetes/kubernetes-unversioned/debian/deb_folder/patches/Update-kubelet-kube-config-environment-variable.patch b/kubernetes/kubernetes-unversioned/debian/deb_folder/patches/Update-kubelet-kube-config-environment-variable.patch new file mode 100644 index 000000000..52cda6b5e --- /dev/null +++ b/kubernetes/kubernetes-unversioned/debian/deb_folder/patches/Update-kubelet-kube-config-environment-variable.patch @@ -0,0 +1,33 @@ +From 44e59ca86c4d5f69a6f0505bfbe7f607c8dd1193 Mon Sep 17 00:00:00 2001 +From: Ramesh Kumar Sivanandam +Date: Fri, 7 Jul 2023 13:22:27 +0530 +Subject: [PATCH] Update kubelet.kubeconfig environment variable + +The incorrect specification of the KUBELET_KUBECONFIG environment +variable made it so that default parameters were not present. + +Update the KUBELET_KUBECONFIG environment variable as +KUBELET_KUBECONFIG="--kubeconfig=/etc/kubernetes/kubelet.kubeconfig". +So that kubelet have the correct default parameters. + +Signed-off-by: Ramesh Kumar Sivanandam +--- + init/systemd/environ/kubelet | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/init/systemd/environ/kubelet b/init/systemd/environ/kubelet +index a623673..405aabf 100644 +--- a/init/systemd/environ/kubelet ++++ b/init/systemd/environ/kubelet +@@ -11,7 +11,7 @@ KUBELET_ADDRESS="--address=127.0.0.1" + KUBELET_HOSTNAME="--hostname-override=127.0.0.1" + + # Edit the kubelet.kubeconfig to have correct cluster server address +-KUBELET_KUBECONFIG=/etc/kubernetes/kubelet.kubeconfig ++KUBELET_KUBECONFIG="--kubeconfig=/etc/kubernetes/kubelet.kubeconfig" + + # Add your own! + KUBELET_ARGS="--cgroup-driver=systemd --fail-swap-on=false" +-- +2.17.1 + diff --git a/kubernetes/kubernetes-unversioned/debian/deb_folder/patches/series b/kubernetes/kubernetes-unversioned/debian/deb_folder/patches/series index 6e5f0e3a7..7edccd686 100644 --- a/kubernetes/kubernetes-unversioned/debian/deb_folder/patches/series +++ b/kubernetes/kubernetes-unversioned/debian/deb_folder/patches/series @@ -1,2 +1,3 @@ kubelet-service-remove-docker-dependency.patch Remove-KUBE_ALLOW_PRIV-from-kubelet-service.patch +Update-kubelet-kube-config-environment-variable.patch