From 7549b4184f19791305cba88dab10a37e07c00e7d Mon Sep 17 00:00:00 2001 From: xiangpengzhao Date: Wed, 22 Nov 2017 02:23:07 +0800 Subject: [PATCH] Make expired cert check more clear. --- cmd/kubeadm/app/phases/upgrade/postupgrade_v18_19.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade_v18_19.go b/cmd/kubeadm/app/phases/upgrade/postupgrade_v18_19.go index e8d9b30cde0..efdd1095fe3 100644 --- a/cmd/kubeadm/app/phases/upgrade/postupgrade_v18_19.go +++ b/cmd/kubeadm/app/phases/upgrade/postupgrade_v18_19.go @@ -70,7 +70,7 @@ func rollbackFiles(files map[string]string, originalErr error) error { // shouldBackupAPIServerCertAndKey check if the new k8s version is at least 1.9.0 // and kube-apiserver will be expired in 60 days. func shouldBackupAPIServerCertAndKey(newK8sVer *version.Version) (bool, error) { - if !newK8sVer.LessThan(v190) { + if newK8sVer.LessThan(v190) { return false, nil } @@ -93,7 +93,7 @@ func shouldBackupAPIServerCertAndKey(newK8sVer *version.Version) (bool, error) { return false, fmt.Errorf("no certificate data found") } - if certs[0].NotAfter.Sub(time.Now()) < 60*24*time.Hour { + if time.Now().Sub(certs[0].NotBefore) > 180*24*time.Hour { return true, nil }