starlingx/integ
Code Issues Proposed changes

Update kubelet.kubeconfig environment variable

Browse Source 
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 <rameshkumar.sivanandam@windriver.com>
This commit is contained in:
Ramesh Kumar Sivanandam 2023-07-10 08:40:01 -04:00
parent 602ca46e94
commit 3b934036cf
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
kubernetes/kubernetes-unversioned/debian/deb_folder/patches/Update-kubelet-kube-config-environment-variable.patch Normal file
View File

@ -0,0 +1,33 @@
From 44e59ca86c4d5f69a6f0505bfbe7f607c8dd1193 Mon Sep 17 00:00:00 2001
From: Ramesh Kumar Sivanandam <rameshkumar.sivanandam@windriver.com>
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 <rameshkumar.sivanandam@windriver.com>
---
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

1
kubernetes/kubernetes-unversioned/debian/deb_folder/patches/series
View File

@ -1,2 +1,3 @@
kubelet-service-remove-docker-dependency.patch kubelet-service-remove-docker-dependency.patch
Remove-KUBE_ALLOW_PRIV-from-kubelet-service.patch Remove-KUBE_ALLOW_PRIV-from-kubelet-service.patch
Update-kubelet-kube-config-environment-variable.patch