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