diff --git a/data/ignition/master/systemd/disable-selinux.service b/data/ignition/master/systemd/disable-selinux.service index ed2657b29d202f3119f9a443c35f6a5b3f0668e7..aea27c2df045117886e8939ec72d824b759e6e5f 100644 --- a/data/ignition/master/systemd/disable-selinux.service +++ b/data/ignition/master/systemd/disable-selinux.service @@ -1,14 +1,14 @@ [Unit] Description=disable selinux for kubernetes -ConditionPathExists=!/var/nkd/log/disable-selinux.stamp -ConditionPathExists=/var/nkd/log/node-pivot.stamp +ConditionPathExists=!/var/log/disable-selinux.stamp +ConditionPathExists=/var/log/node-pivot.stamp [Service] Type=oneshot RemainAfterExit=yes ExecStart=bash -c "sed -i 's#SELINUX=enforcing#SELINUX=disabled#g' /etc/selinux/config" ExecStart=setenforce 0 -ExecStart=/bin/touch /var/nkd/log/disable-selinux.stamp +ExecStart=/bin/touch /var/log/disable-selinux.stamp [Install] WantedBy=multi-user.target diff --git a/data/ignition/master/systemd/init-cluster.service b/data/ignition/master/systemd/init-cluster.service index 417b9e82c8c2ca1e31ad7fa864d4f33a19f20451..6066e124d3d9604cfde71612f297b52f9e3d4f43 100644 --- a/data/ignition/master/systemd/init-cluster.service +++ b/data/ignition/master/systemd/init-cluster.service @@ -2,16 +2,16 @@ Description=init kubernetes cluster Requires=set-kernel-para.service disable-selinux.service release-image-pivot.service After=set-kernel-para.service disable-selinux.service release-image-pivot.service -ConditionPathExists=/var/nkd/log/set-kernel-para.stamp -ConditionPathExists=/var/nkd/log/disable-selinux.stamp -ConditionPathExists=/var/nkd/log/node-pivot.stamp -ConditionPathExists=!/var/nkd/log/init-cluster.stamp +ConditionPathExists=/var/log/set-kernel-para.stamp +ConditionPathExists=/var/log/disable-selinux.stamp +ConditionPathExists=/var/log/node-pivot.stamp +ConditionPathExists=!/var/log/init-cluster.stamp [Service] Type=oneshot RemainAfterExit=yes ExecStart=kubeadm init --config=/etc/init-config.yaml --upload-certs -ExecStart=/bin/touch /var/nkd/log/init-cluster.stamp +ExecStart=/bin/touch /var/log/init-cluster.stamp [Install] WantedBy=multi-user.target diff --git a/data/ignition/master/systemd/install-cni-plugin.service.template b/data/ignition/master/systemd/install-cni-plugin.service.template index a6126158c649fee4c804b766d18d73bb747053ce..fc20158a6ca6a506e9af3a348d48def7b7dd204e 100644 --- a/data/ignition/master/systemd/install-cni-plugin.service.template +++ b/data/ignition/master/systemd/install-cni-plugin.service.template @@ -2,7 +2,7 @@ Description=install cni network plugin for kubernetes Requires=init-cluster.service After=init-cluster.service -ConditionPathExists=/var/nkd/log/init-k8s-cluster.stamp +ConditionPathExists=/var/log/init-k8s-cluster.stamp [Service] Type=oneshot diff --git a/data/ignition/master/systemd/kubelet.service b/data/ignition/master/systemd/kubelet.service index a041dd6bebf63e51a4f3b524a3c775c165896237..b8ff7f2b7706dc80e7246ab3c7e5e7ae3ea87ad3 100644 --- a/data/ignition/master/systemd/kubelet.service +++ b/data/ignition/master/systemd/kubelet.service @@ -3,7 +3,7 @@ Description=kubelet: The Kubernetes Node Agent Documentation=https://kubernetes.io/docs/ Wants=network-online.target After=network-online.target -ConditionPathExists=/var/nkd/log/node-pivot.stamp +ConditionPathExists=/var/log/node-pivot.stamp [Service] ExecStart=/usr/bin/kubelet diff --git a/data/ignition/master/systemd/release-image-pivot.service b/data/ignition/master/systemd/release-image-pivot.service index aa8ba3590273caa557bca307214c7dee46b47564..27beef4df06769a76a863920122e3f95680c7ede 100644 --- a/data/ignition/master/systemd/release-image-pivot.service +++ b/data/ignition/master/systemd/release-image-pivot.service @@ -2,13 +2,13 @@ Description=Pivot node to the nkd release image Wants=network-online.target After=network-online.target -ConditionPathExists=!/var/nkd/log/node-pivot.stamp +ConditionPathExists=!/var/log/node-pivot.stamp [Service] Type=oneshot RemainAfterExit=yes ExecStart=sh /etc/nkd/node-pivot.sh -ExecStart=/bin/touch /var/nkd/log/node-pivot.stamp +ExecStart=/bin/touch /var/log/node-pivot.stamp ExecStart=systemctl reboot [Install] diff --git a/data/ignition/master/systemd/set-kernel-para.service b/data/ignition/master/systemd/set-kernel-para.service index 1a9fcd776417a89572ad3097f5d372074753b90e..00c443ebbde2bf8b8521b09435de3c5de86c32e3 100644 --- a/data/ignition/master/systemd/set-kernel-para.service +++ b/data/ignition/master/systemd/set-kernel-para.service @@ -1,14 +1,14 @@ [Unit] Description=set kernel para for Kubernetes -ConditionPathExists=!/var/nkd/log/set-kernel-para.stamp -ConditionPathExists=/var/nkd/log/node-pivot.stamp +ConditionPathExists=!/var/log/set-kernel-para.stamp +ConditionPathExists=/var/log/node-pivot.stamp [Service] Type=oneshot RemainAfterExit=yes ExecStart=modprobe br_netfilter ExecStart=sysctl -p /etc/sysctl.d/kubernetes.conf -ExecStart=/bin/touch /var/nkd/log/set-kernel-para.stamp +ExecStart=/bin/touch /var/log/set-kernel-para.stamp [Install] WantedBy=multi-user.target diff --git a/data/ignition/worker/systemd/disable-selinux.service b/data/ignition/worker/systemd/disable-selinux.service index ed2657b29d202f3119f9a443c35f6a5b3f0668e7..aea27c2df045117886e8939ec72d824b759e6e5f 100644 --- a/data/ignition/worker/systemd/disable-selinux.service +++ b/data/ignition/worker/systemd/disable-selinux.service @@ -1,14 +1,14 @@ [Unit] Description=disable selinux for kubernetes -ConditionPathExists=!/var/nkd/log/disable-selinux.stamp -ConditionPathExists=/var/nkd/log/node-pivot.stamp +ConditionPathExists=!/var/log/disable-selinux.stamp +ConditionPathExists=/var/log/node-pivot.stamp [Service] Type=oneshot RemainAfterExit=yes ExecStart=bash -c "sed -i 's#SELINUX=enforcing#SELINUX=disabled#g' /etc/selinux/config" ExecStart=setenforce 0 -ExecStart=/bin/touch /var/nkd/log/disable-selinux.stamp +ExecStart=/bin/touch /var/log/disable-selinux.stamp [Install] WantedBy=multi-user.target diff --git a/data/ignition/worker/systemd/join-cluster.service b/data/ignition/worker/systemd/join-cluster.service index a8b598c25d6c69d1367f678c9415b731227fce2b..26adb483d121c186aa8eecf899db8266eca2f459 100644 --- a/data/ignition/worker/systemd/join-cluster.service +++ b/data/ignition/worker/systemd/join-cluster.service @@ -2,16 +2,16 @@ Description=init kubernetes cluster Requires=set-kernel-para.service disable-selinux.service release-image-pivot.service After=set-kernel-para.service disable-selinux.service release-image-pivot.service -ConditionPathExists=/var/nkd/log/set-kernel-para.stamp -ConditionPathExists=/var/nkd/log/disable-selinux.stamp -ConditionPathExists=/var/nkd/log/node-pivot.stamp -ConditionPathExists=!/var/nkd/log/join-cluster.stamp +ConditionPathExists=/var/log/set-kernel-para.stamp +ConditionPathExists=/var/log/disable-selinux.stamp +ConditionPathExists=/var/log/node-pivot.stamp +ConditionPathExists=!/var/log/join-cluster.stamp [Service] Type=oneshot RemainAfterExit=yes ExecStart=kubeadm join --config=/etc/nkd/join-config.yaml -ExecStart=/bin/touch /var/nkd/log/join-cluster.stamp +ExecStart=/bin/touch /var/log/join-cluster.stamp [Install] WantedBy=multi-user.target \ No newline at end of file diff --git a/data/ignition/worker/systemd/kubelet.service b/data/ignition/worker/systemd/kubelet.service index a041dd6bebf63e51a4f3b524a3c775c165896237..b8ff7f2b7706dc80e7246ab3c7e5e7ae3ea87ad3 100644 --- a/data/ignition/worker/systemd/kubelet.service +++ b/data/ignition/worker/systemd/kubelet.service @@ -3,7 +3,7 @@ Description=kubelet: The Kubernetes Node Agent Documentation=https://kubernetes.io/docs/ Wants=network-online.target After=network-online.target -ConditionPathExists=/var/nkd/log/node-pivot.stamp +ConditionPathExists=/var/log/node-pivot.stamp [Service] ExecStart=/usr/bin/kubelet diff --git a/data/ignition/worker/systemd/release-image-pivot.service b/data/ignition/worker/systemd/release-image-pivot.service index aa8ba3590273caa557bca307214c7dee46b47564..27beef4df06769a76a863920122e3f95680c7ede 100644 --- a/data/ignition/worker/systemd/release-image-pivot.service +++ b/data/ignition/worker/systemd/release-image-pivot.service @@ -2,13 +2,13 @@ Description=Pivot node to the nkd release image Wants=network-online.target After=network-online.target -ConditionPathExists=!/var/nkd/log/node-pivot.stamp +ConditionPathExists=!/var/log/node-pivot.stamp [Service] Type=oneshot RemainAfterExit=yes ExecStart=sh /etc/nkd/node-pivot.sh -ExecStart=/bin/touch /var/nkd/log/node-pivot.stamp +ExecStart=/bin/touch /var/log/node-pivot.stamp ExecStart=systemctl reboot [Install] diff --git a/data/ignition/worker/systemd/set-kernel-para.service b/data/ignition/worker/systemd/set-kernel-para.service index 1a9fcd776417a89572ad3097f5d372074753b90e..00c443ebbde2bf8b8521b09435de3c5de86c32e3 100644 --- a/data/ignition/worker/systemd/set-kernel-para.service +++ b/data/ignition/worker/systemd/set-kernel-para.service @@ -1,14 +1,14 @@ [Unit] Description=set kernel para for Kubernetes -ConditionPathExists=!/var/nkd/log/set-kernel-para.stamp -ConditionPathExists=/var/nkd/log/node-pivot.stamp +ConditionPathExists=!/var/log/set-kernel-para.stamp +ConditionPathExists=/var/log/node-pivot.stamp [Service] Type=oneshot RemainAfterExit=yes ExecStart=modprobe br_netfilter ExecStart=sysctl -p /etc/sysctl.d/kubernetes.conf -ExecStart=/bin/touch /var/nkd/log/set-kernel-para.stamp +ExecStart=/bin/touch /var/log/set-kernel-para.stamp [Install] WantedBy=multi-user.target