From eb9809ee866d4737981f9fe8d1816ebaf7af70b3 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Tue, 13 Dec 2016 14:16:24 -0800 Subject: [PATCH] examples/ignition: Remove old kubelet by uuid-file * Fix typo, --uuid should be --uuid-file --- examples/ignition/bootkube-controller.yaml | 4 ++-- examples/ignition/bootkube-worker.yaml | 4 ++-- examples/ignition/k8s-controller.yaml | 4 ++-- examples/ignition/k8s-worker.yaml | 4 ++-- examples/ignition/rktnetes-controller.yaml | 4 ++-- examples/ignition/rktnetes-worker.yaml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/ignition/bootkube-controller.yaml b/examples/ignition/bootkube-controller.yaml index 5c89a5c9..0470a669 100644 --- a/examples/ignition/bootkube-controller.yaml +++ b/examples/ignition/bootkube-controller.yaml @@ -60,7 +60,7 @@ systemd: ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets - ExecStartPre=-/usr/bin/rkt rm --uuid=/var/run/kubelet-pod.uuid + ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid ExecStart=/usr/lib/coreos/kubelet-wrapper \ --api-servers={{.k8s_controller_endpoint}} \ --kubeconfig=/etc/kubernetes/kubeconfig \ @@ -73,7 +73,7 @@ systemd: --minimum-container-ttl-duration=6m0s \ --cluster_dns={{.k8s_dns_service_ip}} \ --cluster_domain=cluster.local - ExecStop=-/usr/bin/rkt stop --uuid=/var/run/kubelet-pod.uuid + ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid Restart=always RestartSec=10 [Install] diff --git a/examples/ignition/bootkube-worker.yaml b/examples/ignition/bootkube-worker.yaml index db8b7106..f0fbfe5a 100644 --- a/examples/ignition/bootkube-worker.yaml +++ b/examples/ignition/bootkube-worker.yaml @@ -51,7 +51,7 @@ systemd: ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets - ExecStartPre=-/usr/bin/rkt rm --uuid=/var/run/kubelet-pod.uuid + ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid ExecStart=/usr/lib/coreos/kubelet-wrapper \ --api-servers={{.k8s_controller_endpoint}} \ --kubeconfig=/etc/kubernetes/kubeconfig \ @@ -63,7 +63,7 @@ systemd: --minimum-container-ttl-duration=6m0s \ --cluster_dns={{.k8s_dns_service_ip}} \ --cluster_domain=cluster.local - ExecStop=-/usr/bin/rkt stop --uuid=/var/run/kubelet-pod.uuid + ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid Restart=always RestartSec=5 [Install] diff --git a/examples/ignition/k8s-controller.yaml b/examples/ignition/k8s-controller.yaml index 64ebd662..075d6c16 100644 --- a/examples/ignition/k8s-controller.yaml +++ b/examples/ignition/k8s-controller.yaml @@ -73,7 +73,7 @@ systemd: ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/usr/bin/mkdir -p /var/log/containers ExecStartPre=/usr/bin/systemctl is-active flanneld.service - ExecStartPre=-/usr/bin/rkt rm --uuid=/var/run/kubelet-pod.uuid + ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid ExecStart=/usr/lib/coreos/kubelet-wrapper \ --api-servers=http://127.0.0.1:8080 \ --register-schedulable=true \ @@ -84,7 +84,7 @@ systemd: --hostname-override={{.domain_name}} \ --cluster_dns={{.k8s_dns_service_ip}} \ --cluster_domain=cluster.local - ExecStop=-/usr/bin/rkt stop --uuid=/var/run/kubelet-pod.uuid + ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid Restart=always RestartSec=10 [Install] diff --git a/examples/ignition/k8s-worker.yaml b/examples/ignition/k8s-worker.yaml index 2537e38f..202d53e7 100644 --- a/examples/ignition/k8s-worker.yaml +++ b/examples/ignition/k8s-worker.yaml @@ -66,7 +66,7 @@ systemd: --mount volume=var-log,target=/var/log" ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/usr/bin/mkdir -p /var/log/containers - ExecStartPre=-/usr/bin/rkt rm --uuid=/var/run/kubelet-pod.uuid + ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid ExecStart=/usr/lib/coreos/kubelet-wrapper \ --api-servers={{.k8s_controller_endpoint}} \ --register-node=true \ @@ -80,7 +80,7 @@ systemd: --kubeconfig=/etc/kubernetes/worker-kubeconfig.yaml \ --tls-cert-file=/etc/kubernetes/ssl/worker.pem \ --tls-private-key-file=/etc/kubernetes/ssl/worker-key.pem - ExecStop=-/usr/bin/rkt stop --uuid=/var/run/kubelet-pod.uuid + ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid Restart=always RestartSec=10 [Install] diff --git a/examples/ignition/rktnetes-controller.yaml b/examples/ignition/rktnetes-controller.yaml index 07109f70..21772e68 100644 --- a/examples/ignition/rktnetes-controller.yaml +++ b/examples/ignition/rktnetes-controller.yaml @@ -79,7 +79,7 @@ systemd: ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/usr/bin/mkdir -p /var/log/containers ExecStartPre=/usr/bin/systemctl is-active flanneld.service - ExecStartPre=-/usr/bin/rkt rm --uuid=/var/run/kubelet-pod.uuid + ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid ExecStart=/usr/lib/coreos/kubelet-wrapper \ --api-servers=http://127.0.0.1:8080 \ --register-schedulable=true \ @@ -93,7 +93,7 @@ systemd: --hostname-override={{.domain_name}} \ --cluster_dns={{.k8s_dns_service_ip}} \ --cluster_domain=cluster.local - ExecStop=-/usr/bin/rkt stop --uuid=/var/run/kubelet-pod.uuid + ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid Restart=always RestartSec=10 [Install] diff --git a/examples/ignition/rktnetes-worker.yaml b/examples/ignition/rktnetes-worker.yaml index 87cb54b9..2e2c2298 100644 --- a/examples/ignition/rktnetes-worker.yaml +++ b/examples/ignition/rktnetes-worker.yaml @@ -71,7 +71,7 @@ systemd: --volume var-log,kind=host,source=/var/log \ --mount volume=var-log,target=/var/log" ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests - ExecStartPre=-/usr/bin/rkt rm --uuid=/var/run/kubelet-pod.uuid + ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid ExecStart=/usr/lib/coreos/kubelet-wrapper \ --api-servers={{.k8s_controller_endpoint}} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ @@ -88,7 +88,7 @@ systemd: --kubeconfig=/etc/kubernetes/worker-kubeconfig.yaml \ --tls-cert-file=/etc/kubernetes/ssl/worker.pem \ --tls-private-key-file=/etc/kubernetes/ssl/worker-key.pem - ExecStop=-/usr/bin/rkt stop --uuid=/var/run/kubelet-pod.uuid + ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid Restart=always RestartSec=10 [Install]