From b49ae8c21d71bbb656491ee52e984d2c6b8b092f Mon Sep 17 00:00:00 2001 From: Kenichi Omichi Date: Mon, 20 Dec 2021 12:53:33 -0800 Subject: [PATCH] Delete "kubeadm alpha certs" code (#8322) "kubeadm alpha certs" command has been promoted to "kubeadm certs" command, and "kubeadm alpha certs" has been deprecated since Kubernetes v1.20 as [1]. In addition, Kubespray supports Kubernetes v1.20+. This delete the deprecated command for cleanup. [1]: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.20.md#deprecation --- .../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 7e5b4aaa1..53bb825c6 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 {{ 'alpha ' if kube_version is version('v1.20.0', '<') else '' }}certs check-expiration +{{ bin_dir }}/kubeadm certs check-expiration echo "## Renewing certificates managed by kubeadm ##" -{{ bin_dir }}/kubeadm {{ 'alpha ' if kube_version is version('v1.20.0', '<') else '' }}certs renew all +{{ bin_dir }}/kubeadm 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', '<') else '' }}certs check-expiration +{{ bin_dir }}/kubeadm certs check-expiration