From 7a24b0da8ab7c459067b0382df7ddf1de2d9100d Mon Sep 17 00:00:00 2001
From: xiadanni <xiadanni1@huawei.com>
Date: Fri, 18 Sep 2020 17:21:35 +0800
Subject: [PATCH] kubernetes: add kubelet package

Signed-off-by: xiadanni <xiadanni1@huawei.com>
---
 kubeadm.conf    | 16 +++++-----------
 kubelet.service | 25 ++++++++-----------------
 kubernetes.spec | 20 ++++++++++++++++----
 3 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/kubeadm.conf b/kubeadm.conf
index 6875e97..2647631 100644
--- a/kubeadm.conf
+++ b/kubeadm.conf
@@ -1,14 +1,8 @@
 [Service]
-Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf --fail-swap-on=false"
-Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manifests"
-Environment="KUBELET_NETWORK_ARGS=--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/usr/libexec/cni"
-Environment="KUBELET_DNS_ARGS=--cluster-dns=10.96.0.10 --cluster-domain=cluster.local"
-Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt"
-Environment="KUBELET_EXTRA_ARGS=--cgroup-driver=systemd"
-
+Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf"
+Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml"
+EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env
+EnvironmentFile=-/etc/sysconfig/kubelet
 ExecStart=
-ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_EXTRA_ARGS
+ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS $KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS
 
-Restart=always
-StartLimitInterval=0
-RestartSec=10
diff --git a/kubelet.service b/kubelet.service
index 53d8281..f25b709 100644
--- a/kubelet.service
+++ b/kubelet.service
@@ -1,23 +1,14 @@
 [Unit]
-Description=Kubernetes Kubelet Server
-Documentation=https://kubernetes.io/docs/reference/generated/kubelet/
-After=docker.service crio.service
+Description=kubelet: The Kubernetes Node Agent
+Documentation=https://kubernetes.io/docs/
+Wants=network-online.target
+After=network-online.target
 
 [Service]
-WorkingDirectory=/var/lib/kubelet
-EnvironmentFile=-/etc/kubernetes/config
-EnvironmentFile=-/etc/kubernetes/kubelet
-ExecStart=/usr/bin/kubelet \
-	    $KUBE_LOGTOSTDERR \
-	    $KUBE_LOG_LEVEL \
-	    $KUBELET_KUBECONFIG \
-	    $KUBELET_ADDRESS \
-	    $KUBELET_PORT \
-	    $KUBELET_HOSTNAME \
-	    $KUBE_ALLOW_PRIV \
-	    $KUBELET_ARGS
-Restart=on-failure
-KillMode=process
+ExecStart=/usr/bin/kubelet
+Restart=always
+StartLimitInterval=0
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target
diff --git a/kubernetes.spec b/kubernetes.spec
index e9bd0ca..39c7695 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -3,7 +3,7 @@
 
 Name:         kubernetes
 Version:      1.18.6
-Release:      2
+Release:      3
 Summary:      Container cluster management
 License:      ASL 2.0
 URL:          https://k8s.io/kubernetes
@@ -59,9 +59,6 @@ Kubernetes services for node host.
 %package  kubeadm
 Summary:  Kubernetes tool for standing up clusters
 
-Requires: kubernetes-node = %{version}-%{release}
-Requires: containernetworking-plugins
-
 %description kubeadm
 Kubernetes tool for standing up clusters.
 
@@ -73,6 +70,12 @@ BuildRequires: golang
 %description client
 Kubernetes client tools.
 
+%package kubelet
+Summary: Kubernetes node agent
+
+%description kubelet
+Kubernetes node agent.
+
 %package help
 Summary: Help documents for kubernetes
 
@@ -214,6 +217,12 @@ mv src/k8s.io/kubernetes/LICENSE .
 %{_bindir}/kubectl
 %{_datadir}/bash-completion/completions/kubectl
 
+%files kubelet
+%license LICENSE
+%doc *.md
+%{_bindir}/kubelet
+%{_unitdir}/kubelet.service
+
 %pre master
 getent group kube >/dev/null || groupadd -r kube
 getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
@@ -243,5 +252,8 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun kubelet kube-proxy
 
 %changelog
+* Fri Sep 18 2020 xiadanni <xiadanni1@huawei.com> - 1.18.6-3
+- Add kubelet package
+
 * Sat Jul 25 2020 xiadanni <xiadanni1@huawei.com> - 1.18.6-1
 - Package init
-- 
Gitee