From c30862dbad736f21f06c786efd7569067895fb79 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Mon, 18 Apr 2016 14:35:41 -0700 Subject: [PATCH] examples/ignition: Fix k8s-certs@.service file check * In the k8s-install example, the k8s-certs@.service checks for the wrong file and always attempts to curl TLS assets from bootcfg. After restarts or auto-updates, if bootcfg is not running, the certs are present on disk so the kubelet and k8s cluster operate normally, while k8s-certs services fail (mostly harmless). * Fixes k8s-certs@service failures after restarts when bootcfg is unavailable. Provisioned nodes should not have a hard dependency on bootcfg service. --- examples/ignition/k8s-master.yaml | 2 +- examples/ignition/k8s-worker.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/ignition/k8s-master.yaml b/examples/ignition/k8s-master.yaml index 385f8f25..055e21d6 100644 --- a/examples/ignition/k8s-master.yaml +++ b/examples/ignition/k8s-master.yaml @@ -43,7 +43,7 @@ systemd: After=network-online.target [Service] ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/ssl - ExecStart=/usr/bin/bash -c "[ -f {{.k8s_cert_endpoint}}/tls/%i ] || curl {{.k8s_cert_endpoint}}/tls/%i -o /etc/kubernetes/ssl/%i" + ExecStart=/usr/bin/bash -c "[ -f /etc/kubernetes/ssl/%i ] || curl {{.k8s_cert_endpoint}}/tls/%i -o /etc/kubernetes/ssl/%i" - name: k8s-assets.target contents: | [Unit] diff --git a/examples/ignition/k8s-worker.yaml b/examples/ignition/k8s-worker.yaml index 95262d8c..0a4f2476 100644 --- a/examples/ignition/k8s-worker.yaml +++ b/examples/ignition/k8s-worker.yaml @@ -42,7 +42,7 @@ systemd: After=network-online.target [Service] ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/ssl - ExecStart=/usr/bin/bash -c "[ -f {{.k8s_cert_endpoint}}/tls/%i ] || curl {{.k8s_cert_endpoint}}/tls/%i -o /etc/kubernetes/ssl/%i" + ExecStart=/usr/bin/bash -c "[ -f /etc/kubernetes/ssl/%i ] || curl {{.k8s_cert_endpoint}}/tls/%i -o /etc/kubernetes/ssl/%i" - name: k8s-assets.target contents: | [Unit]