Skip to content

Commit aa4b5d6

Browse files
committed
fix bug revise kubelet working directory
1 parent 00beb97 commit aa4b5d6

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

generator.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ function INIT_CLIENT(){
622622
function InitKubelet(){
623623
echo -n -e "\nLet's configure some parameters below to prepare to
624624
generate the \033[41;37mkubelet\033[0m config file.\n\n"
625-
625+
626626
read -p "Please enter the \"kubelet\" service name [kubelet]: " LET_NAME
627627
export LET_NAME=${LET_NAME:-kubelet}
628628

@@ -632,6 +632,9 @@ function InitKubelet(){
632632
read -p "Please enter port for the kubelet [10250]: " LET_PORT
633633
export LET_PORT=${LET_PORT:-10250}
634634

635+
read -p "Please enter the \"kubelet\" working directory [/var/lib/kubelet]: " LET_CONF_DIR
636+
export LET_CONF_DIR=${LET_CONF_DIR:-/var/lib/kubelet}
637+
635638
read -p "Please enter kubeconfig path for the kubelet [/etc/kubernetes/auth]: " LET_KUBECONF_DIR
636639
export LET_KUBECONF_DIR=${LET_KUBECONF_DIR:-/etc/kubernetes/auth}
637640

@@ -663,7 +666,6 @@ After=docker.service
663666
Requires=docker.service
664667
665668
[Service]
666-
User=kube
667669
WorkingDirectory=${LET_CONF_DIR}
668670
EnvironmentFile=-/etc/kubernetes/${LET_NAME}
669671
ExecStart=${CLIENT_BIN_DIR}/${LET_NAME} \\
@@ -713,7 +715,6 @@ Documentation=https://github.com/kubernetes
713715
After=network.target
714716
715717
[Service]
716-
User=kube
717718
EnvironmentFile=-/etc/kubernetes/${PROXY_NAME}
718719
ExecStart=${CLIENT_BIN_DIR}/${PROXY_NAME} \\
719720
\$KUBE_MASTER \\
@@ -1013,15 +1014,15 @@ id kube || useradd kube -s /sbin/nologin -M
10131014
echo -e "\033[32m Don't forget exec [systemctl restart rsyslog]. \033[0m"
10141015
10151016
%post client
1016-
[ -d /var/lib/kubelet ] || mkdir -pv /var/lib/kubelet
1017-
echo -e "\033[32m Don't forget to modify the kubelet and kube-proxy configuration file. \033[0m"
1017+
[ -d ${LET_CONF_DIR} ] || mkdir -pv ${LET_CONF_DIR}
1018+
echo -e "\033[42;37mDon't forget to modify the kubelet and kube-proxy configuration file.\033[0m"
10181019
10191020
%postun server
10201021
id kube && userdel -r kube
10211022
10221023
%postun client
1023-
echo -e "\033[32m Automatically clean up working directory [/var/lib/kubelet]. \033[0m"
1024-
[ -d /var/lib/kubelet ] || rm -fr /var/lib/kubelet
1024+
echo -e "\033[42;37mAutomatically clean up working directory [${LET_CONF_DIR}].\033[0m"
1025+
[ -d ${LET_CONF_DIR} ] || rm -fr ${LET_CONF_DIR}
10251026
10261027
%changelog log-collection
10271028
* $(date +"%a %b %d %Y") $(id|awk -F '(' '{print $2}'|awk -F ')' '{print $1}')

0 commit comments

Comments
 (0)