8e7ce96e0e
This packages kubernetes in versioned subdirectories to be able to
support upgrading multiple versions of kubernetes without collisions.
Common configuration/environment files are moved to the new
kubernetes-unversioned package.
This creates directories:
/usr/local/kubernetes/<version>/stage1
/usr/local/kubernetes/<version>/stage2
The binaries and configuration or kubernetes-node, kubernetes-kubeadm,
and kube-client are placed in new locations, e.g.,
/usr/local/kubernetes/1.18/stage1/usr/bin/kubeadm
/usr/local/kubernetes/1.18/stage2/usr/bin/{kubelet,kubectl}
A new package kubernetes-unversioned contains directories:
/usr/local/kubernetes/current/stage1
/usr/local/kubernetes/current/stage2
This package contains symlinks of all the expected binaries and
configuration needed to run kubernetes. For example, /usr/bin/kubelet
is a symlink to /usr/local/kubernetes/current/stage2/user/bin/kubelet.
At ansible install time and during subsequent boots, there is code in
place to bind-mount /usr/local/kubernetes/<version>/stageX onto
/usr/local/kubernetes/current/stageX .
This removes redundant doc and man pages from the production rpms.
Story: 2008972
Task: 43002
Depends-On: https://review.opendev.org/c/starlingx/ansible-playbooks/+/802898
Signed-off-by: Jim Gauld <james.gauld@windriver.com>
Change-Id: I74dc867faea6759906a687cef0b0ebf9555829ee
16 lines
557 B
Diff
16 lines
557 B
Diff
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
|