Merge pull request #6 from pluralsh/fix/machinepool

fix: machine pool version field format

Author: floreks

cloud/scope/managedmachinepool.go

@@ -151,7 +151,7 @@ func (s *ManagedMachinePoolScope) InstanceGroupManagersClient() *compute.Instanc
 
 // NodePoolVersion returns the k8s version of the node pool.
 func (s *ManagedMachinePoolScope) NodePoolVersion() *string {
-	return s.MachinePool.Spec.Template.Spec.Version
+	return infrav1exp.NormalizeMachineVersion(s.MachinePool.Spec.Template.Spec.Version)
 }
 
 // ConvertToSdkNodePool converts a node pool to format that is used by GCP SDK.
@@ -184,7 +184,7 @@ func ConvertToSdkNodePool(nodePool infrav1exp.GCPManagedMachinePool, machinePool
 	}
 
 	if machinePool.Spec.Template.Spec.Version != nil {
-		sdkNodePool.Version = *machinePool.Spec.Template.Spec.Version
+		sdkNodePool.Version = *infrav1exp.NormalizeMachineVersion(machinePool.Spec.Template.Spec.Version)
 	}
 
 	return &sdkNodePool

exp/api/v1beta1/types.go

@@ -16,7 +16,12 @@ limitations under the License.
 
 package v1beta1
 
-import "cloud.google.com/go/container/apiv1/containerpb"
+import (
+	"strings"
+
+	"cloud.google.com/go/container/apiv1/containerpb"
+	"k8s.io/utils/pointer"
+)
 
 // TaintEffect is the effect for a Kubernetes taint.
 type TaintEffect string
@@ -63,3 +68,22 @@ func ConvertToSdkTaint(taints Taints) []*containerpb.NodeTaint {
 	}
 	return res
 }
+
+// NormalizeMachineVersion removes "v" prefix from the machine/node pool version string.
+// It is being added automatically by one of the mutating webhooks installed
+// by the CAPI core.
+//
+// GKE expects version string to match below scheme:
+//
+// - "latest": picks the highest valid Kubernetes version
+// - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+// - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+// - "1.X.Y-gke.N": picks an explicit Kubernetes version
+// - "-": picks the Kubernetes master version.
+func NormalizeMachineVersion(version *string) *string {
+	if version == nil {
+		return nil
+	}
+
+	return pointer.String(strings.TrimPrefix(*version, "v"))
+}