Merge pull request kubernetes-sigs#1099 from kahun/fix/node_pool_upda…

…te_version Fix node pool update when MachinePool version is set
salasberryfin · Feb 4, 2024 · 9831d45 · 9831d45
2 parents 0d60ffb + a315128
commit 9831d45
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/cloud/services/container/nodepools/reconcile.go b/cloud/services/container/nodepools/reconcile.go
@@ -355,9 +355,12 @@ func (s *Service) checkDiffAndPrepareUpdateConfig(existingNodePool *containerpb.
 	desiredNodePool := scope.ConvertToSdkNodePool(*s.scope.GCPManagedMachinePool, *s.scope.MachinePool, isRegional, s.scope.GCPManagedControlPlane.Spec.ClusterName)
 
 	// Node version
-	if s.scope.NodePoolVersion() != nil && *s.scope.NodePoolVersion() != infrav1exp.ConvertFromSdkNodeVersion(existingNodePool.Version) {
-		needUpdate = true
-		updateNodePoolRequest.NodeVersion = *s.scope.NodePoolVersion()
+	if s.scope.NodePoolVersion() != nil {
+		desiredNodePoolVersion := infrav1exp.ConvertFromSdkNodeVersion(*s.scope.NodePoolVersion())
+		if desiredNodePoolVersion != infrav1exp.ConvertFromSdkNodeVersion(existingNodePool.Version) {
+			needUpdate = true
+			updateNodePoolRequest.NodeVersion = desiredNodePoolVersion
+		}
 	}
 	// Kubernetes labels
 	if !cmp.Equal(desiredNodePool.Config.GetLabels(), existingNodePool.Config.Labels) {

diff --git a/exp/api/v1beta1/types.go b/exp/api/v1beta1/types.go
@@ -110,7 +110,7 @@ func ConvertToSdkAutoscaling(autoscaling *NodePoolAutoScaling) *containerpb.Node
 // ConvertFromSdkNodeVersion converts GCP SDK node version to k8s version.
 func ConvertFromSdkNodeVersion(sdkNodeVersion string) string {
 	// For example, the node version returned from GCP SDK can be 1.27.2-gke.2100, we want to convert it to 1.27.2
-	return strings.Split(sdkNodeVersion, "-")[0]
+	return strings.Replace(strings.Split(sdkNodeVersion, "-")[0], "v", "", 1)
 }
 
 // ConvertToSdkCgroupMode converts GCP SDK node version to k8s version.