From e69997bf92fd8dd30c3dd85db7773317b1de4a94 Mon Sep 17 00:00:00 2001
From: Jonathan Tong <jt572@cornell.edu>
Date: Mon, 17 Jul 2023 22:48:50 +0000
Subject: [PATCH] Fix error

---
 azure/services/scalesets/scalesets.go | 11 ++++-------
 config/capz/manager_image_patch.yaml  |  2 +-
 config/capz/manager_pull_policy.yaml  |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/azure/services/scalesets/scalesets.go b/azure/services/scalesets/scalesets.go
index 97b706fa272..b5c75346382 100644
--- a/azure/services/scalesets/scalesets.go
+++ b/azure/services/scalesets/scalesets.go
@@ -87,22 +87,19 @@ func (s *Service) Reconcile(ctx context.Context) (retErr error) {
 		return err
 	}
 
-	var err error
-	var resultErr error
-
 	spec := s.Scope.ScaleSetSpec(ctx)
 	scaleSetSpec, ok := spec.(*ScaleSetSpec)
 	if !ok {
 		return errors.Errorf("%T is not of type ScaleSetSpec", spec)
 	}
 
-	_, err = s.Client.Get(ctx, spec)
+	_, err := s.Client.Get(ctx, spec)
 	if err == nil {
 		scaleSetSpec.VMSSInstances, err = s.Client.ListInstances(ctx, spec.ResourceGroupName(), spec.ResourceName())
 		if err != nil {
-			resultErr = errors.Wrapf(err, "failed to get existing instances")
-			s.Scope.UpdatePutStatus(infrav1.BootstrapSucceededCondition, serviceName, resultErr)
-			return resultErr
+			err = errors.Wrapf(err, "failed to get existing instances")
+			s.Scope.UpdatePutStatus(infrav1.BootstrapSucceededCondition, serviceName, err)
+			return err
 		}
 	} else if !azure.ResourceNotFound(err) {
 		return errors.Wrapf(err, "failed to get existing VMSS")
diff --git a/config/capz/manager_image_patch.yaml b/config/capz/manager_image_patch.yaml
index 0876a1db40d..a815a4de752 100644
--- a/config/capz/manager_image_patch.yaml
+++ b/config/capz/manager_image_patch.yaml
@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
       # Change the value of image field below to your controller image URL
-      - image: gcr.io/k8s-staging-cluster-api-azure/cluster-api-azure-controller:latest
+      - image: docker.io/jont828/cluster-api-azure-controller-amd64:20230717220814
         name: manager
diff --git a/config/capz/manager_pull_policy.yaml b/config/capz/manager_pull_policy.yaml
index 74a0879c604..cd7ae12c01e 100644
--- a/config/capz/manager_pull_policy.yaml
+++ b/config/capz/manager_pull_policy.yaml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: manager
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent