From 88f29d0b98c943b13bf52e6c47b2025b49a8300a Mon Sep 17 00:00:00 2001 From: Chris Friesen Date: Sun, 14 Jun 2020 19:16:40 -0400 Subject: [PATCH] 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 --- ...kubelet-service-remove-docker-dependency.patch | 15 +++++++++++++++ kubernetes/kubernetes/centos/kubernetes.spec | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 kubernetes/kubernetes/centos/files/kubelet-service-remove-docker-dependency.patch diff --git a/kubernetes/kubernetes/centos/files/kubelet-service-remove-docker-dependency.patch b/kubernetes/kubernetes/centos/files/kubelet-service-remove-docker-dependency.patch new file mode 100644 index 000000000..466fab6ef --- /dev/null +++ b/kubernetes/kubernetes/centos/files/kubelet-service-remove-docker-dependency.patch @@ -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 diff --git a/kubernetes/kubernetes/centos/kubernetes.spec b/kubernetes/kubernetes/centos/kubernetes.spec index 63325e596..dd91b17e0 100644 --- a/kubernetes/kubernetes/centos/kubernetes.spec +++ b/kubernetes/kubernetes/centos/kubernetes.spec @@ -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