-
Notifications
You must be signed in to change notification settings - Fork 558
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pkg/acsengine/azureconst.go
is an auto-generated file, so we can't manually update it. It gets its values from one of the scripts under pkg/acsengine/Get-AzureConstants.*
It may be feasible to update those scripts with the programmatic way to add these new government regions. @anhowe might be able to help figure out why we aren't auto-generating usgovarizona
and usgovtexas
.
@jackfrancis , someone is running those commands PS/CLI commands and semi-manually dumping that into the azureconst.go no? I have a hard time imagining this is fully automated because there is no way those commands would return regions from the different sovereign clouds in one single run. Depending on which account you sign in with, these commands will return different regions. So someone needs to be stitching together the results from running these commands across clouds. If you run these commands yourself, you won't get usgovvirginia nor usgoviowa either, whatever mechanism was used to add those two should be used again. |
Can confirm that the command (for my az account at least) does indeed generate the file you see in
|
@@ -85,6 +85,8 @@ def getFileContents(dcosMasterMap, masterAgentMap, kubernetesAgentMap, sizeMap, | |||
"germanynortheast", | |||
"usgovvirginia", | |||
"usgoviowa", | |||
"usgovarizona", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jackfrancis , turns out the generator scripts have those regions hardcoded, so I just added them there.
Feel free to run the script and include an updated version of |
(I see that |
@jackfrancis , done, almost seemed to perfect, came out exactly the same except for the modified header. |
@@ -115,6 +115,8 @@ Get-Locations() { | |||
$locationList += "germanynortheast" | |||
$locationList += "usgoviowa" | |||
$locationList += "usgovvirginia" | |||
$locationList += "usgovarizona" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can undo these changes, this file should actually be deleted, since we only use the python file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
@gsacavdm I'll delete the powershell script in a follow-up commit, so no worries there on your account. Kicking off E2E now. |
@gsacavdm could you kindly rebase? We inadvertently moved an unrelated change to azureconst.go and broke this branch :( Will merge forthwith after things are clean, thanks for your patience. |
There you go @jackfrancis , rebased :) |
Thanks again for the contribution @gsacavdm ! |
What this PR does / why we need it:
Which issue this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close that issue when PR gets merged): fixes #Special notes for your reviewer:
Release note: