зеркало из https://github.com/Azure/aks-engine.git
feat: add "coming soon" regions to allow list (#5107)
This commit is contained in:
Родитель
35373277dc
Коммит
7b61192b1f
|
@ -46,6 +46,12 @@ var (
|
||||||
germanyCentralName = "germanycentral"
|
germanyCentralName = "germanycentral"
|
||||||
germanyNortheastDisplayName = "Germany Northeast"
|
germanyNortheastDisplayName = "Germany Northeast"
|
||||||
germanyNortheastName = "germanynortheast"
|
germanyNortheastName = "germanynortheast"
|
||||||
|
israelCentralDisplayName = "Israel Central"
|
||||||
|
israelCentralName = "israelcentral"
|
||||||
|
italyNorthDisplayName = "Italy North"
|
||||||
|
italyNorthName = "italynorth"
|
||||||
|
spainCentralDisplayName = "Spain Central"
|
||||||
|
spainCentralName = "spaincentral"
|
||||||
usDodCentralDisplayName = "US DoD Central"
|
usDodCentralDisplayName = "US DoD Central"
|
||||||
usDodCentralName = "usdodcentral"
|
usDodCentralName = "usdodcentral"
|
||||||
usDodEastDisplayName = "US Dod East"
|
usDodEastDisplayName = "US Dod East"
|
||||||
|
@ -247,6 +253,28 @@ func (glc *LocationsCmd) run(cmd *cobra.Command, args []string) error {
|
||||||
Latitude: ¬Available,
|
Latitude: ¬Available,
|
||||||
Longitude: ¬Available,
|
Longitude: ¬Available,
|
||||||
},
|
},
|
||||||
|
// Coming soon regions
|
||||||
|
{
|
||||||
|
ID: ¬Available,
|
||||||
|
Name: &israelCentralName,
|
||||||
|
DisplayName: &israelCentralDisplayName,
|
||||||
|
Latitude: ¬Available,
|
||||||
|
Longitude: ¬Available,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ID: ¬Available,
|
||||||
|
Name: &italyNorthName,
|
||||||
|
DisplayName: &italyNorthDisplayName,
|
||||||
|
Latitude: ¬Available,
|
||||||
|
Longitude: ¬Available,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ID: ¬Available,
|
||||||
|
Name: &spainCentralName,
|
||||||
|
DisplayName: &spainCentralDisplayName,
|
||||||
|
Latitude: ¬Available,
|
||||||
|
Longitude: ¬Available,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
// Add special locations if they aren't already in the list
|
// Add special locations if they aren't already in the list
|
||||||
for _, s := range specialLocations {
|
for _, s := range specialLocations {
|
||||||
|
|
|
@ -108,6 +108,9 @@ func ExampleLocationsCmd_run_humanOutput() {
|
||||||
// eastus2euap East US 2 EUAP (Canary) N/A N/A
|
// eastus2euap East US 2 EUAP (Canary) N/A N/A
|
||||||
// germanycentral Germany Central N/A N/A
|
// germanycentral Germany Central N/A N/A
|
||||||
// germanynortheast Germany Northeast N/A N/A
|
// germanynortheast Germany Northeast N/A N/A
|
||||||
|
// israelcentral Israel Central N/A N/A
|
||||||
|
// italynorth Italy North N/A N/A
|
||||||
|
// spaincentral Spain Central N/A N/A
|
||||||
// usdodcentral US DoD Central N/A N/A
|
// usdodcentral US DoD Central N/A N/A
|
||||||
// usdodeast US Dod East N/A N/A
|
// usdodeast US Dod East N/A N/A
|
||||||
// usgovarizona US Gov Arizona N/A N/A
|
// usgovarizona US Gov Arizona N/A N/A
|
||||||
|
@ -221,6 +224,27 @@ func ExampleLocationsCmd_run_jsonOutput() {
|
||||||
// },
|
// },
|
||||||
// {
|
// {
|
||||||
// "id": "N/A",
|
// "id": "N/A",
|
||||||
|
// "name": "israelcentral",
|
||||||
|
// "displayName": "Israel Central",
|
||||||
|
// "latitude": "N/A",
|
||||||
|
// "longitude": "N/A"
|
||||||
|
// },
|
||||||
|
// {
|
||||||
|
// "id": "N/A",
|
||||||
|
// "name": "italynorth",
|
||||||
|
// "displayName": "Italy North",
|
||||||
|
// "latitude": "N/A",
|
||||||
|
// "longitude": "N/A"
|
||||||
|
// },
|
||||||
|
// {
|
||||||
|
// "id": "N/A",
|
||||||
|
// "name": "spaincentral",
|
||||||
|
// "displayName": "Spain Central",
|
||||||
|
// "latitude": "N/A",
|
||||||
|
// "longitude": "N/A"
|
||||||
|
// },
|
||||||
|
// {
|
||||||
|
// "id": "N/A",
|
||||||
// "name": "usdodcentral",
|
// "name": "usdodcentral",
|
||||||
// "displayName": "US DoD Central",
|
// "displayName": "US DoD Central",
|
||||||
// "latitude": "N/A",
|
// "latitude": "N/A",
|
||||||
|
|
|
@ -17,6 +17,7 @@ func GetAzureLocations() []string {
|
||||||
"australiasoutheast",
|
"australiasoutheast",
|
||||||
"brazilsouth",
|
"brazilsouth",
|
||||||
"brazilsoutheast",
|
"brazilsoutheast",
|
||||||
|
"brazilus",
|
||||||
"canadacentral",
|
"canadacentral",
|
||||||
"canadaeast",
|
"canadaeast",
|
||||||
"centralindia",
|
"centralindia",
|
||||||
|
@ -38,6 +39,8 @@ func GetAzureLocations() []string {
|
||||||
"germanynorth",
|
"germanynorth",
|
||||||
"germanynortheast",
|
"germanynortheast",
|
||||||
"germanywestcentral",
|
"germanywestcentral",
|
||||||
|
"israelcentral",
|
||||||
|
"italynorth",
|
||||||
"japaneast",
|
"japaneast",
|
||||||
"japanwest",
|
"japanwest",
|
||||||
"jioindiacentral",
|
"jioindiacentral",
|
||||||
|
@ -48,12 +51,14 @@ func GetAzureLocations() []string {
|
||||||
"northeurope",
|
"northeurope",
|
||||||
"norwayeast",
|
"norwayeast",
|
||||||
"norwaywest",
|
"norwaywest",
|
||||||
|
"polandcentral",
|
||||||
"qatarcentral",
|
"qatarcentral",
|
||||||
"southafricanorth",
|
"southafricanorth",
|
||||||
"southafricawest",
|
"southafricawest",
|
||||||
"southcentralus",
|
"southcentralus",
|
||||||
"southeastasia",
|
"southeastasia",
|
||||||
"southindia",
|
"southindia",
|
||||||
|
"spaincentral",
|
||||||
"swedencentral",
|
"swedencentral",
|
||||||
"switzerlandnorth",
|
"switzerlandnorth",
|
||||||
"switzerlandwest",
|
"switzerlandwest",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче