Merge pull request #3071 from k8s-infra-cherrypick-robot/cherry-pick-3063-to-release-1.7

k8s-ci-robot · web-flow · commit 14ffafa4d560 · 2023-01-20T22:32:01.000-08:00
[release-1.7] Fixing panic on AzureMachinePool creation with auto-scale
diff --git a/azure/scope/managedmachinepool.go b/azure/scope/managedmachinepool.go
@@ -310,6 +310,9 @@ func (s *ManagedMachinePoolScope) SetCAPIMachinePoolReplicas(replicas *int32) {
 
 // SetCAPIMachinePoolAnnotation sets the specified annotation on the associated MachinePool.
 func (s *ManagedMachinePoolScope) SetCAPIMachinePoolAnnotation(key, value string) {
+	if s.MachinePool.Annotations == nil {
+		s.MachinePool.Annotations = make(map[string]string)
+	}
 	s.MachinePool.Annotations[key] = value
 }
 

Original file line number	Diff line number	Diff line change
`@@ -310,6 +310,9 @@ func (s ManagedMachinePoolScope) SetCAPIMachinePoolReplicas(replicas int32) {`
`310`	`310`
`311`	`311`	`// SetCAPIMachinePoolAnnotation sets the specified annotation on the associated MachinePool.`
`312`	`312`	`func (s *ManagedMachinePoolScope) SetCAPIMachinePoolAnnotation(key, value string) {`
	`313`	`+ if s.MachinePool.Annotations == nil {`
	`314`	`+ s.MachinePool.Annotations = make(map[string]string)`
	`315`	`+ }`
`313`	`316`	`s.MachinePool.Annotations[key] = value`
`314`	`317`	`}`
`315`	`318`