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

Output VMSS cloud config settings. #3610

Merged
merged 2 commits into from
Aug 7, 2018
Merged

Output VMSS cloud config settings. #3610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da758a9
Output VMSS cloud config settings.
JunSun17 Aug 3, 2018
f5b3c85
Remove vmType from output.
JunSun17 Aug 6, 2018
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
5 changes: 5 additions & 0 deletions parts/iaasoutputs.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,9 @@
"primaryAvailabilitySetName": {
"type": "string",
"value": "[variables('primaryAvailabilitySetName')]"
},
"primaryScaleSetName": {
"type": "string",
"value": "[variables('primaryScaleSetName')]"
}

4 changes: 2 additions & 2 deletions parts/k8s/kubernetesmastervars.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,11 +359,11 @@
"nsgID": "[resourceId('Microsoft.Network/networkSecurityGroups',variables('nsgName'))]",
{{if not AnyAgentUsesVirtualMachineScaleSets}}
"primaryAvailabilitySetName": "[concat('{{ (index .AgentPoolProfiles 0).Name }}-availabilitySet-',variables('nameSuffix'))]",
"primaryScaleSetName": "''",
"primaryScaleSetName": "",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of these changes (from literal '' to empty string)?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it is set to "''", it will not be an empty string in the output. the output will be ''. We need an empty string as the result.

"vmType": "standard",
{{else}}
"primaryScaleSetName": "[concat(variables('orchestratorName'), '-{{ (index .AgentPoolProfiles 0).Name }}-',variables('nameSuffix'), '-vmss')]",
"primaryAvailabilitySetName": "''",
"primaryAvailabilitySetName": "",
"vmType": "vmss",
{{end}}
{{if not IsHostedMaster }}
Expand Down