Merge pull request #1197 from devigned/customdata-hash

do not include customData in AzureMachinePool hash calculation

Author: k8s-ci-robot

azure/services/scalesets/scalesets.go

@@ -210,9 +210,12 @@ func (s *Service) patchVMSSIfNeeded(ctx context.Context, infraVMSS *infrav1exp.V
 		//
 		// Note: if a user were to mutate the VMSS in Azure rather than through CAPZ, this hash match may match, but not
 		// reflect the state of the specification in K8s.
+		s.Scope.V(2).Info("found matching spec hash no need to PATCH")
 		return nil, nil
 	}
 
+	s.Scope.V(2).Info("hashes don't match PATCHING VMSS", "oldHash", infraVMSS.Tags[infrav1.SpecVersionHashTagKey()], "newHash", result.Hash)
+	s.Scope.V(4).Info("diff", "oldVMSS", infraVMSS, "newVMSS", result)
 	vmss := result.VMSSWithoutHash
 	vmss.Tags = converters.TagsToMap(result.Tags.AddSpecVersionHashTag(result.Hash))
 	patch, err := getVMSSUpdateFromVMSS(vmss)
@@ -655,9 +658,13 @@ func base64EncodedHash(vmss compute.VirtualMachineScaleSet) (string, error) {
 	// Setting Admin Password is not supported but an initial password is required for Windows
 	// Don't include it in the hash since it is generated and won't be the same each the spec is created (#1182)
 	tmpPass := vmss.VirtualMachineProfile.OsProfile.AdminPassword
+	// Don't include customData in the hash since it will change due to the kubeadm bootstrap token being regenerated.
+	tmpCustomData := vmss.VirtualMachineProfile.OsProfile.CustomData
 	vmss.VirtualMachineProfile.OsProfile.AdminPassword = nil
+	vmss.VirtualMachineProfile.OsProfile.CustomData = nil
 	defer func() {
 		vmss.VirtualMachineProfile.OsProfile.AdminPassword = tmpPass
+		vmss.VirtualMachineProfile.OsProfile.CustomData = tmpCustomData
 	}()
 
 	jsonData, err := vmss.MarshalJSON()

config/manager/manager.yaml

@@ -24,6 +24,7 @@ spec:
             - --leader-elect
             - "--metrics-bind-addr=127.0.0.1:8080"
             - "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=false},AKS=${EXP_AKS:=false}"
+            - "--v=0"
           image: controller:latest
           imagePullPolicy: Always
           name: manager

test/e2e/config/azure-dev.yaml

@@ -75,6 +75,9 @@ providers:
       targetName: "cluster-template-windows.yaml"
     - sourcePath: "${PWD}/templates/test/cluster-template-prow-machine-pool-windows.yaml"
       targetName: "cluster-template-machine-pool-windows.yaml"
+    replacements:
+    - old: "--v=0"
+      new: "--v=4"
 
 variables:
   KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.19.7}"