Merge pull request #12 from newrelic-forks/fix-mig-creates-vs-update

Fix MIG Creation
newrelic-forks · Apr 18, 2024 · b07170a · b07170a
2 parents 6f01599 + 993437b
commit b07170a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/cloud/scope/machinepool.go b/cloud/scope/machinepool.go
@@ -551,6 +551,16 @@ func (m *MachinePoolScope) InstanceServiceAccountsSpec() *compute.ServiceAccount
 
 // InstanceGroupBuilder returns an instance group manager spec.
 func (m *MachinePoolScope) InstanceGroupBuilder(instanceTemplateName string) *compute.InstanceGroupManager {
+	return &compute.InstanceGroupManager{
+		Name:             m.GCPMachinePool.Name,
+		BaseInstanceName: m.GCPMachinePool.Name,
+		InstanceTemplate: path.Join("projects", m.ClusterGetter.Project(), "global", "instanceTemplates", instanceTemplateName),
+		TargetSize:       int64(m.DesiredReplicas()),
+	}
+}
+
+// InstanceGroupUpdate returns an instance group manager spec.
+func (m *MachinePoolScope) InstanceGroupUpdate(instanceTemplateName string) *compute.InstanceGroupManager {
 	return &compute.InstanceGroupManager{
 		Name:             m.GCPMachinePool.Name,
 		BaseInstanceName: m.GCPMachinePool.Name,

diff --git a/cloud/services/compute/instancegroups/instancegroups.go b/cloud/services/compute/instancegroups/instancegroups.go
@@ -204,7 +204,7 @@ func (s *Service) patchInstanceGroup(ctx context.Context, instanceTemplateName s
 	if fetchedInstanceTemplateName != instanceTemplateName {
 		log.Info("Instance group is not using the latest instance template, setting instance template", "instance group", instanceGroup.InstanceTemplate, "instance template", instanceTemplateName)
 		// Set instance template.
-		setInstanceTemplateOperation, err := s.Client.SetInstanceGroupTemplate(ctx, s.scope.Project(), s.scope.GCPMachinePool.Spec.Zone, s.scope.InstanceGroupBuilder(instanceTemplateName))
+		setInstanceTemplateOperation, err := s.Client.SetInstanceGroupTemplate(ctx, s.scope.Project(), s.scope.GCPMachinePool.Spec.Zone, s.scope.InstanceGroupUpdate(instanceTemplateName))
 		if err != nil {
 			log.Error(err, "Error setting instance group template")
 			return false, err