From 2d1597bf103a1b892b237fbae9dccffdca3ad374 Mon Sep 17 00:00:00 2001
From: Etienne Champetier <e.champetier@ateme.com>
Date: Fri, 26 Mar 2021 11:44:44 -0400
Subject: [PATCH] Fix k8s-certs-renew for k8s < 1.20 (#7410)
Signed-off-by: Etienne Champetier <e.champetier@ateme.com>
---
.../control-plane/templates/k8s-certs-renew.sh.j2 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/kubernetes/control-plane/templates/k8s-certs-renew.sh.j2 b/roles/kubernetes/control-plane/templates/k8s-certs-renew.sh.j2
index 41656e3bb..6d5d178a2 100644
--- a/roles/kubernetes/control-plane/templates/k8s-certs-renew.sh.j2
+++ b/roles/kubernetes/control-plane/templates/k8s-certs-renew.sh.j2
@@ -1,10 +1,10 @@
#!/bin/bash
echo "## Expiration before renewal ##"
-{{ bin_dir }}/kubeadm certs check-expiration
+{{ bin_dir }}/kubeadm {{ 'alpha ' if kube_version is version('v1.20.0', '<') }}certs check-expiration
echo "## Renewing certificates managed by kubeadm ##"
-{{ bin_dir }}/kubeadm certs renew all
+{{ bin_dir }}/kubeadm {{ 'alpha ' if kube_version is version('v1.20.0', '<') }}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 certs check-expiration
+{{ bin_dir }}/kubeadm {{ 'alpha ' if kube_version is version('v1.20.0', '<') }}certs check-expiration
--
GitLab