remove docker dependency from kubelet.service
It's incorrect for kubelet.service to depend on docker as we no longer use docker as our container runtime. Instead, just wait for networking to be up. The %patch directive is a little odd, as we're patching the "contrib" directory which is actually unpacked from a separate tarball. Change-Id: I16a1aed98b15ac3d1fe3870ce01cc9237bdb3426 Closes-Bug: 1882604 Signed-off-by: Chris Friesen <chris.friesen@windriver.com>
This commit is contained in:
parent
8ceb938222
commit
88f29d0b98
@ -0,0 +1,15 @@
|
||||
diff --git a/contrib/init/systemd/kubelet.service b/contrib/init/systemd/kubelet.service
|
||||
index 1082bba..1fae395 100644
|
||||
--- a/contrib/init/systemd/kubelet.service
|
||||
+++ b/contrib/init/systemd/kubelet.service
|
||||
@@ -1,8 +1,8 @@
|
||||
[Unit]
|
||||
Description=Kubernetes Kubelet Server
|
||||
Documentation=https://kubernetes.io/docs/concepts/overview/components/#kubelet https://kubernetes.io/docs/reference/generated/kubelet/
|
||||
-After=docker.service
|
||||
-Requires=docker.service
|
||||
+Wants=network-online.target
|
||||
+After=network-online.target
|
||||
|
||||
[Service]
|
||||
WorkingDirectory=/var/lib/kubelet
|
@ -56,6 +56,7 @@ Source5: kubelet-cgroup-setup.sh
|
||||
Source33: genmanpages.sh
|
||||
|
||||
Patch1: 0001-Fix-pagesize-check-to-allow-for-options-already-endi.patch
|
||||
Patch2: kubelet-service-remove-docker-dependency.patch
|
||||
|
||||
# It obsoletes cadvisor but needs its source code (literally integrated)
|
||||
Obsoletes: cadvisor
|
||||
@ -841,6 +842,7 @@ Kubernetes client tools like kubectl
|
||||
# copy contrib folder
|
||||
mkdir contrib
|
||||
cp -r ../%{con_repo}-%{con_commit}/init contrib/.
|
||||
%patch2 -p1
|
||||
|
||||
#src/k8s.io/kubernetes/pkg/util/certificates
|
||||
# Patch the code to remove eliptic.P224 support
|
||||
|
Loading…
x
Reference in New Issue
Block a user