fixes

Author: justinsb

cloud/services/compute/instancegroupmanagers/instancegroupmanagers_reconcile.go

@@ -29,7 +29,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
-// Reconcile reconcile machine instance.
+// Reconcile reconciles GCP instanceGroupManager resources.
 func (s *Service) Reconcile(ctx context.Context, instanceTemplateKey *meta.Key) (*compute.InstanceGroupManager, error) {
 	log := log.FromContext(ctx)
 	log.Info("Reconciling instanceGroupManager resources")
@@ -103,6 +103,9 @@ func (s *Service) createOrGet(ctx context.Context, instanceTemplateKey *meta.Key
 			return nil, fmt.Errorf("creating instanceGroupManager %v: %w", selfLink, err)
 		}
 
+		// We fetch the created instanceGroupManager to return the complete object.
+		// Also, we continue to go through the code path below so we have one code path,
+		// although in practice we don't expect to need futher updates.
 		actual, err = s.instanceGroupManagers.Get(ctx, igmKey)
 		if err != nil {
 			return nil, fmt.Errorf("getting instanceGroupManager %v: %w", selfLink, err)
@@ -127,6 +130,8 @@ func (s *Service) createOrGet(ctx context.Context, instanceTemplateKey *meta.Key
 			log.Error(err, "updating instanceTemplate for instanceGroupManager")
 			return nil, fmt.Errorf("updating instanceTemplate for instanceGroupManager %v: %w", selfLink, err)
 		}
+
+		actual.InstanceTemplate = desired.InstanceTemplate
 	}
 
 	return actual, nil

cloud/services/compute/instancetemplates/instancetemplate_reconcile.go

@@ -33,7 +33,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
-// Reconcile reconcile machine instance.
+// Reconcile reconciles GCP instanceTemplates.
 func (s *Service) Reconcile(ctx context.Context) (*meta.Key, error) {
 	log := log.FromContext(ctx)
 	log.Info("Reconciling instanceTemplate resources")
@@ -46,7 +46,7 @@ func (s *Service) Reconcile(ctx context.Context) (*meta.Key, error) {
 	return instanceTemplateKey, nil
 }
 
-// Delete deletes all machine templates for a instance group.
+// Delete deletes the GCP instanceTemplate.
 func (s *Service) Delete(ctx context.Context) error {
 	log := log.FromContext(ctx)