From 45a92e406df42efd175eb3d2a28c236174865174 Mon Sep 17 00:00:00 2001 From: Helmut Januschka Date: Wed, 31 Mar 2021 09:00:58 +0200 Subject: [PATCH] Update k8s-certs-renew.sh.j2 (#7422) fix undefinedElse (cherry picked from commit cce9d3125d24705fd7298c0864560a8c811195da) --- roles/kubernetes/master/templates/k8s-certs-renew.sh.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kubernetes/master/templates/k8s-certs-renew.sh.j2 b/roles/kubernetes/master/templates/k8s-certs-renew.sh.j2 index 6d5d178a2..89697635b 100644 --- a/roles/kubernetes/master/templates/k8s-certs-renew.sh.j2 +++ b/roles/kubernetes/master/templates/k8s-certs-renew.sh.j2 @@ -1,10 +1,10 @@ #!/bin/bash echo "## Expiration before renewal ##" -{{ bin_dir }}/kubeadm {{ 'alpha ' if kube_version is version('v1.20.0', '<') }}certs check-expiration +{{ bin_dir }}/kubeadm {{ 'alpha ' if kube_version is version('v1.20.0', '<') else '' }}certs check-expiration echo "## Renewing certificates managed by kubeadm ##" -{{ bin_dir }}/kubeadm {{ 'alpha ' if kube_version is version('v1.20.0', '<') }}certs renew all +{{ bin_dir }}/kubeadm {{ 'alpha ' if kube_version is version('v1.20.0', '<') else '' }}certs renew all echo "## Restarting control plane pods managed by kubeadm ##" {% if container_manager == "docker" %} @@ -20,4 +20,4 @@ echo "## Waiting for apiserver to be up again ##" until printf "" 2>>/dev/null >>/dev/tcp/127.0.0.1/6443; do sleep 1; done echo "## Expiration after renewal ##" -{{ bin_dir }}/kubeadm {{ 'alpha ' if kube_version is version('v1.20.0', '<') }}certs check-expiration +{{ bin_dir }}/kubeadm {{ 'alpha ' if kube_version is version('v1.20.0', '<') else '' }}certs check-expiration