Fix node pool update when version is set

kubernetes-sigs · Dec 12, 2023 · b8ac10c · b8ac10c
1 parent 15c6f8f
commit b8ac10c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/cloud/services/container/nodepools/reconcile.go b/cloud/services/container/nodepools/reconcile.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"reflect"
+	"strings"
 
 	"sigs.k8s.io/cluster-api-provider-gcp/cloud"
 	"sigs.k8s.io/cluster-api-provider-gcp/util/resourceurl"
@@ -335,9 +336,12 @@ func (s *Service) checkDiffAndPrepareUpdateNodePool(existingNodePool *containerp
 		Name: s.scope.NodePoolFullName(),
 	}
 	// Node version
-	if s.scope.NodePoolVersion() != nil && *s.scope.NodePoolVersion() != existingNodePool.Version {
-		needUpdate = true
-		updateNodePoolRequest.NodeVersion = *s.scope.NodePoolVersion()
+	if s.scope.NodePoolVersion() != nil {
+		desiredNodePoolVersion := strings.Replace(*s.scope.NodePoolVersion(), "v", "", 1)
+		if desiredNodePoolVersion != existingNodePool.Version {
+			needUpdate = true
+			updateNodePoolRequest.NodeVersion = desiredNodePoolVersion
+		}
 	}
 	// Kubernetes labels
 	if !cmp.Equal(map[string]string(s.scope.GCPManagedMachinePool.Spec.KubernetesLabels), existingNodePool.Config.Labels) {