more verbosity

Author: mweibel

azure/services/scalesets/spec.go

@@ -112,7 +112,7 @@ func (s *ScaleSetSpec) existingParameters(ctx context.Context, existing interfac
 	vmss.Properties.VirtualMachineProfile.NetworkProfile = nil
 	vmss.ID = existingVMSS.ID
 
-	hasModelChanges := hasModelModifyingDifferences(&existingInfraVMSS, vmss)
+	hasModelChanges := hasModelModifyingDifferences(ctx, &existingInfraVMSS, vmss)
 	isFlex := s.OrchestrationMode == infrav1.FlexibleOrchestrationMode
 	updated := true
 	if !isFlex {
@@ -280,9 +280,9 @@ func (s *ScaleSetSpec) Parameters(ctx context.Context, existing interface{}) (pa
 	return vmss, nil
 }
 
-func hasModelModifyingDifferences(infraVMSS *azure.VMSS, vmss armcompute.VirtualMachineScaleSet) bool {
+func hasModelModifyingDifferences(ctx context.Context, infraVMSS *azure.VMSS, vmss armcompute.VirtualMachineScaleSet) bool {
 	other := converters.SDKToVMSS(vmss, []armcompute.VirtualMachineScaleSetVM{})
-	return infraVMSS.HasModelChanges(other)
+	return infraVMSS.HasModelChanges(ctx, other)
 }
 
 func (s *ScaleSetSpec) generateExtensions(ctx context.Context) ([]armcompute.VirtualMachineScaleSetExtension, error) {

azure/types.go

@@ -17,9 +17,12 @@ limitations under the License.
 package azure
 
 import (
+	"context"
 	"reflect"
 	"strings"
 
+	"sigs.k8s.io/cluster-api-provider-azure/util/tele"
+
 	"github.com/google/go-cmp/cmp"
 	infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1"
 	azureutil "sigs.k8s.io/cluster-api-provider-azure/util/azure"
@@ -123,11 +126,24 @@ type (
 )
 
 // HasModelChanges returns true if the spec fields which will mutate the Azure VMSS model are different.
-func (vmss VMSS) HasModelChanges(other VMSS) bool {
-	equal := cmp.Equal(vmss.Image, other.Image) &&
-		cmp.Equal(vmss.Identity, other.Identity) &&
-		cmp.Equal(vmss.Zones, other.Zones) &&
-		cmp.Equal(vmss.Sku, other.Sku)
+func (vmss VMSS) HasModelChanges(ctx context.Context, other VMSS) bool {
+	ctx, log, done := tele.StartSpanWithLogger(ctx, "vmss.HasModelChanges")
+	defer done()
+
+	imgEqual := cmp.Equal(vmss.Image, other.Image)
+	identityEqual := cmp.Equal(vmss.Identity, other.Identity)
+	zonesEqual := cmp.Equal(vmss.Zones, other.Zones)
+	skuEqual := cmp.Equal(vmss.Sku, other.Sku)
+
+	equal := imgEqual &&
+		identityEqual &&
+		zonesEqual &&
+		skuEqual
+
+	if !equal {
+		log.Info("VMSS has changed", "vmssName", vmss.Name, "imgEqual", imgEqual, "identityEqual", identityEqual, "zonesEqual", zonesEqual, "skuEqual", skuEqual)
+	}
+
 	return !equal
 }
 

azure/types_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package azure
 
 import (
+	"context"
 	"testing"
 
 	. "github.com/onsi/gomega"
@@ -131,7 +132,7 @@ func TestVMSS_HasModelChanges(t *testing.T) {
 		t.Run(c.Name, func(t *testing.T) {
 			l, r := c.Factory()
 			g := NewWithT(t)
-			g.Expect(l.HasModelChanges(r)).To(Equal(c.HasModelChanges))
+			g.Expect(l.HasModelChanges(context.Background(), r)).To(Equal(c.HasModelChanges))
 		})
 	}
 }