Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Merge AADProfile during update #3147

Merged
merged 1 commit into from
Jun 1, 2018
Merged

Merge AADProfile during update #3147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/api/agentPoolOnlyApi/v20180331/merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,9 @@ func (mc *ManagedCluster) Merge(emc *ManagedCluster) error {
// For update scenario, the default behavior is to use existing behavior
mc.Properties.NetworkProfile = emc.Properties.NetworkProfile
}
if mc.Properties.AADProfile == nil {
// For update scenario, the default behavior is to use existing behavior
mc.Properties.AADProfile = emc.Properties.AADProfile
}
return nil
}