From 7002d48ef94e6a7c729a96409bc82f46b5ef082e Mon Sep 17 00:00:00 2001
From: Dario Tranchitella <dario@tranchitella.eu>
Date: Thu, 8 Sep 2022 11:48:20 +0200
Subject: [PATCH] fix(upgrade): minor release upgrades are allowed

---
 go.mod                                | 4 ++--
 internal/resources/kubeadm_upgrade.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 3bcd03f..8843b5c 100644
--- a/go.mod
+++ b/go.mod
@@ -21,8 +21,6 @@ require (
 	k8s.io/apiserver v0.25.0
 	k8s.io/client-go v0.25.0
 	k8s.io/cluster-bootstrap v0.0.0
-	k8s.io/component-base v0.25.0
-	k8s.io/kube-proxy v0.0.0
 	k8s.io/kubelet v0.0.0
 	k8s.io/kubernetes v1.25.0
 	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
@@ -154,8 +152,10 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.25.0 // indirect
 	k8s.io/cli-runtime v0.25.0 // indirect
+	k8s.io/component-base v0.25.0 // indirect
 	k8s.io/klog/v2 v2.70.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
+	k8s.io/kube-proxy v0.0.0 // indirect
 	k8s.io/system-validators v1.7.0 // indirect
 	mellium.im/sasl v0.3.0 // indirect
 	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
diff --git a/internal/resources/kubeadm_upgrade.go b/internal/resources/kubeadm_upgrade.go
index 3034ae4..41931fb 100644
--- a/internal/resources/kubeadm_upgrade.go
+++ b/internal/resources/kubeadm_upgrade.go
@@ -124,7 +124,7 @@ func (k *KubernetesUpgrade) isUpgradable() error {
 		return nil
 	}
 	// Following minor release upgrades are allowed
-	if newK8sVersion.Minor() > oldK8sVersion.WithMinor(oldK8sVersion.Minor()+1).Minor() {
+	if newK8sVersion.Minor() == oldK8sVersion.Minor()+1 {
 		return nil
 	}