From 6b08b76b685b770026df03872ecda84b70c82ce6 Mon Sep 17 00:00:00 2001 From: chlau-az Date: Thu, 20 Aug 2020 22:56:43 -0700 Subject: [PATCH] Make azure stack template consistent with doc example --- templates/cluster-template-azure-stack.yaml | 38 +++++++++--------- .../flavors/azure-stack/cluster-template.yaml | 40 ++++++++++--------- .../cluster-template-prow-azure-stack.yaml | 38 +++++++++--------- 3 files changed, 61 insertions(+), 55 deletions(-) diff --git a/templates/cluster-template-azure-stack.yaml b/templates/cluster-template-azure-stack.yaml index 17ee6d37d8b..fc974b756b2 100644 --- a/templates/cluster-template-azure-stack.yaml +++ b/templates/cluster-template-azure-stack.yaml @@ -139,22 +139,23 @@ spec: - content: | { "name":"${AZURE_ENVIRONMENT}", - "managementPortalURL":"https://portal.redmond.ext-n25r1306.masd.stbtest.microsoft.com/", + "managementPortalURL":"https://portal.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", "publishSettingsURL":"", - "serviceManagementEndpoint":"https://management.azurestackci02.onmicrosoft.com/6bbece7e-df47-402c-bf11-101f74fdf525", - "resourceManagerEndpoint":"https://management.redmond.ext-n25r1306.masd.stbtest.microsoft.com/", - "activeDirectoryEndpoint":"https://login.microsoftonline.com/", - "galleryEndpoint":"https://providers.n25r1306.masd.stbtest.microsoft.com:30016/", - "keyVaultEndpoint":"","graphEndpoint":"https://graph.windows.net/", + "serviceManagementEndpoint":"https://management.adfs.n31r1203.masd.stbtest.microsoft.com/f4a7aab6-6167-41a9-abc0-1c925284411d", + "resourceManagerEndpoint":"https://management.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", + "activeDirectoryEndpoint":"https://adfs.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", + "galleryEndpoint":"https://providers.n31r1203.masd.stbtest.microsoft.com:30016/", + "keyVaultEndpoint":"", + "graphEndpoint":"https://graph.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", "serviceBusEndpoint":"", "batchManagementEndpoint":"", - "storageEndpointSuffix":"redmond.ext-n25r1306.masd.stbtest.microsoft.com", + "storageEndpointSuffix":"redmond.ext-n31r1203.masd.stbtest.microsoft.com", "sqlDatabaseDNSSuffix":"", "trafficManagerDNSSuffix":"", - "keyVaultDNSSuffix":"vault.redmond.ext-n25r1306.masd.stbtest.microsoft.com", + "keyVaultDNSSuffix":"vault.redmond.ext-n31r1203.masd.stbtest.microsoft.com", "serviceBusEndpointSuffix":"", "serviceManagementVMDNSSuffix":"", - "resourceManagerVMDNSSuffix":"cloudapp.ext-n25r1306.masd.stbtest.microsoft.com", + "resourceManagerVMDNSSuffix":"cloudapp.ext-n31r1203.masd.stbtest.microsoft.com", "containerRegistryDNSSuffix":"", "cosmosDBDNSSuffix":"", "tokenAudience":"", @@ -311,22 +312,23 @@ spec: - content: | { "name":"${AZURE_ENVIRONMENT}", - "managementPortalURL":"https://portal.redmond.ext-n25r1306.masd.stbtest.microsoft.com/", + "managementPortalURL":"https://portal.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", "publishSettingsURL":"", - "serviceManagementEndpoint":"https://management.azurestackci02.onmicrosoft.com/6bbece7e-df47-402c-bf11-101f74fdf525", - "resourceManagerEndpoint":"https://management.redmond.ext-n25r1306.masd.stbtest.microsoft.com/", - "activeDirectoryEndpoint":"https://login.microsoftonline.com/", - "galleryEndpoint":"https://providers.n25r1306.masd.stbtest.microsoft.com:30016/", - "keyVaultEndpoint":"","graphEndpoint":"https://graph.windows.net/", + "serviceManagementEndpoint":"https://management.adfs.n31r1203.masd.stbtest.microsoft.com/f4a7aab6-6167-41a9-abc0-1c925284411d", + "resourceManagerEndpoint":"https://management.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", + "activeDirectoryEndpoint":"https://adfs.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", + "galleryEndpoint":"https://providers.n31r1203.masd.stbtest.microsoft.com:30016/", + "keyVaultEndpoint":"", + "graphEndpoint":"https://graph.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", "serviceBusEndpoint":"", "batchManagementEndpoint":"", - "storageEndpointSuffix":"redmond.ext-n25r1306.masd.stbtest.microsoft.com", + "storageEndpointSuffix":"redmond.ext-n31r1203.masd.stbtest.microsoft.com", "sqlDatabaseDNSSuffix":"", "trafficManagerDNSSuffix":"", - "keyVaultDNSSuffix":"vault.redmond.ext-n25r1306.masd.stbtest.microsoft.com", + "keyVaultDNSSuffix":"vault.redmond.ext-n31r1203.masd.stbtest.microsoft.com", "serviceBusEndpointSuffix":"", "serviceManagementVMDNSSuffix":"", - "resourceManagerVMDNSSuffix":"cloudapp.ext-n25r1306.masd.stbtest.microsoft.com", + "resourceManagerVMDNSSuffix":"cloudapp.ext-n31r1203.masd.stbtest.microsoft.com", "containerRegistryDNSSuffix":"", "cosmosDBDNSSuffix":"", "tokenAudience":"", diff --git a/templates/flavors/azure-stack/cluster-template.yaml b/templates/flavors/azure-stack/cluster-template.yaml index ad20f559c5b..06158aa43e7 100644 --- a/templates/flavors/azure-stack/cluster-template.yaml +++ b/templates/flavors/azure-stack/cluster-template.yaml @@ -136,22 +136,23 @@ spec: - content: | { "name":"${AZURE_ENVIRONMENT}", - "managementPortalURL":"https://portal.redmond.ext-n25r1306.masd.stbtest.microsoft.com/", + "managementPortalURL":"https://portal.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", "publishSettingsURL":"", - "serviceManagementEndpoint":"https://management.azurestackci02.onmicrosoft.com/6bbece7e-df47-402c-bf11-101f74fdf525", - "resourceManagerEndpoint":"https://management.redmond.ext-n25r1306.masd.stbtest.microsoft.com/", - "activeDirectoryEndpoint":"https://login.microsoftonline.com/", - "galleryEndpoint":"https://providers.n25r1306.masd.stbtest.microsoft.com:30016/", - "keyVaultEndpoint":"","graphEndpoint":"https://graph.windows.net/", + "serviceManagementEndpoint":"https://management.adfs.n31r1203.masd.stbtest.microsoft.com/f4a7aab6-6167-41a9-abc0-1c925284411d", + "resourceManagerEndpoint":"https://management.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", + "activeDirectoryEndpoint":"https://adfs.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", + "galleryEndpoint":"https://providers.n31r1203.masd.stbtest.microsoft.com:30016/", + "keyVaultEndpoint":"", + "graphEndpoint":"https://graph.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", "serviceBusEndpoint":"", "batchManagementEndpoint":"", - "storageEndpointSuffix":"redmond.ext-n25r1306.masd.stbtest.microsoft.com", + "storageEndpointSuffix":"redmond.ext-n31r1203.masd.stbtest.microsoft.com", "sqlDatabaseDNSSuffix":"", "trafficManagerDNSSuffix":"", - "keyVaultDNSSuffix":"vault.redmond.ext-n25r1306.masd.stbtest.microsoft.com", + "keyVaultDNSSuffix":"vault.redmond.ext-n31r1203.masd.stbtest.microsoft.com", "serviceBusEndpointSuffix":"", "serviceManagementVMDNSSuffix":"", - "resourceManagerVMDNSSuffix":"cloudapp.ext-n25r1306.masd.stbtest.microsoft.com", + "resourceManagerVMDNSSuffix":"cloudapp.ext-n31r1203.masd.stbtest.microsoft.com", "containerRegistryDNSSuffix":"", "cosmosDBDNSSuffix":"", "tokenAudience":"", @@ -304,22 +305,23 @@ spec: - content: | { "name":"${AZURE_ENVIRONMENT}", - "managementPortalURL":"https://portal.redmond.ext-n25r1306.masd.stbtest.microsoft.com/", + "managementPortalURL":"https://portal.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", "publishSettingsURL":"", - "serviceManagementEndpoint":"https://management.azurestackci02.onmicrosoft.com/6bbece7e-df47-402c-bf11-101f74fdf525", - "resourceManagerEndpoint":"https://management.redmond.ext-n25r1306.masd.stbtest.microsoft.com/", - "activeDirectoryEndpoint":"https://login.microsoftonline.com/", - "galleryEndpoint":"https://providers.n25r1306.masd.stbtest.microsoft.com:30016/", - "keyVaultEndpoint":"","graphEndpoint":"https://graph.windows.net/", + "serviceManagementEndpoint":"https://management.adfs.n31r1203.masd.stbtest.microsoft.com/f4a7aab6-6167-41a9-abc0-1c925284411d", + "resourceManagerEndpoint":"https://management.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", + "activeDirectoryEndpoint":"https://adfs.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", + "galleryEndpoint":"https://providers.n31r1203.masd.stbtest.microsoft.com:30016/", + "keyVaultEndpoint":"", + "graphEndpoint":"https://graph.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", "serviceBusEndpoint":"", "batchManagementEndpoint":"", - "storageEndpointSuffix":"redmond.ext-n25r1306.masd.stbtest.microsoft.com", + "storageEndpointSuffix":"redmond.ext-n31r1203.masd.stbtest.microsoft.com", "sqlDatabaseDNSSuffix":"", "trafficManagerDNSSuffix":"", - "keyVaultDNSSuffix":"vault.redmond.ext-n25r1306.masd.stbtest.microsoft.com", + "keyVaultDNSSuffix":"vault.redmond.ext-n31r1203.masd.stbtest.microsoft.com", "serviceBusEndpointSuffix":"", "serviceManagementVMDNSSuffix":"", - "resourceManagerVMDNSSuffix":"cloudapp.ext-n25r1306.masd.stbtest.microsoft.com", + "resourceManagerVMDNSSuffix":"cloudapp.ext-n31r1203.masd.stbtest.microsoft.com", "containerRegistryDNSSuffix":"", "cosmosDBDNSSuffix":"", "tokenAudience":"", @@ -342,4 +344,4 @@ spec: - echo 'loading pre script' - sudo bash /etc/kubernetes/prekubeadmcommands.sh - echo 'finished loading pre script' - useExperimentalRetryJoin: true + useExperimentalRetryJoin: true \ No newline at end of file diff --git a/templates/test/cluster-template-prow-azure-stack.yaml b/templates/test/cluster-template-prow-azure-stack.yaml index e4a0be9b253..0b9c4b1c5de 100644 --- a/templates/test/cluster-template-prow-azure-stack.yaml +++ b/templates/test/cluster-template-prow-azure-stack.yaml @@ -142,22 +142,23 @@ spec: - content: | { "name":"${AZURE_ENVIRONMENT}", - "managementPortalURL":"https://portal.redmond.ext-n25r1306.masd.stbtest.microsoft.com/", + "managementPortalURL":"https://portal.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", "publishSettingsURL":"", - "serviceManagementEndpoint":"https://management.azurestackci02.onmicrosoft.com/6bbece7e-df47-402c-bf11-101f74fdf525", - "resourceManagerEndpoint":"https://management.redmond.ext-n25r1306.masd.stbtest.microsoft.com/", - "activeDirectoryEndpoint":"https://login.microsoftonline.com/", - "galleryEndpoint":"https://providers.n25r1306.masd.stbtest.microsoft.com:30016/", - "keyVaultEndpoint":"","graphEndpoint":"https://graph.windows.net/", + "serviceManagementEndpoint":"https://management.adfs.n31r1203.masd.stbtest.microsoft.com/f4a7aab6-6167-41a9-abc0-1c925284411d", + "resourceManagerEndpoint":"https://management.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", + "activeDirectoryEndpoint":"https://adfs.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", + "galleryEndpoint":"https://providers.n31r1203.masd.stbtest.microsoft.com:30016/", + "keyVaultEndpoint":"", + "graphEndpoint":"https://graph.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", "serviceBusEndpoint":"", "batchManagementEndpoint":"", - "storageEndpointSuffix":"redmond.ext-n25r1306.masd.stbtest.microsoft.com", + "storageEndpointSuffix":"redmond.ext-n31r1203.masd.stbtest.microsoft.com", "sqlDatabaseDNSSuffix":"", "trafficManagerDNSSuffix":"", - "keyVaultDNSSuffix":"vault.redmond.ext-n25r1306.masd.stbtest.microsoft.com", + "keyVaultDNSSuffix":"vault.redmond.ext-n31r1203.masd.stbtest.microsoft.com", "serviceBusEndpointSuffix":"", "serviceManagementVMDNSSuffix":"", - "resourceManagerVMDNSSuffix":"cloudapp.ext-n25r1306.masd.stbtest.microsoft.com", + "resourceManagerVMDNSSuffix":"cloudapp.ext-n31r1203.masd.stbtest.microsoft.com", "containerRegistryDNSSuffix":"", "cosmosDBDNSSuffix":"", "tokenAudience":"", @@ -314,22 +315,23 @@ spec: - content: | { "name":"${AZURE_ENVIRONMENT}", - "managementPortalURL":"https://portal.redmond.ext-n25r1306.masd.stbtest.microsoft.com/", + "managementPortalURL":"https://portal.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", "publishSettingsURL":"", - "serviceManagementEndpoint":"https://management.azurestackci02.onmicrosoft.com/6bbece7e-df47-402c-bf11-101f74fdf525", - "resourceManagerEndpoint":"https://management.redmond.ext-n25r1306.masd.stbtest.microsoft.com/", - "activeDirectoryEndpoint":"https://login.microsoftonline.com/", - "galleryEndpoint":"https://providers.n25r1306.masd.stbtest.microsoft.com:30016/", - "keyVaultEndpoint":"","graphEndpoint":"https://graph.windows.net/", + "serviceManagementEndpoint":"https://management.adfs.n31r1203.masd.stbtest.microsoft.com/f4a7aab6-6167-41a9-abc0-1c925284411d", + "resourceManagerEndpoint":"https://management.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", + "activeDirectoryEndpoint":"https://adfs.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", + "galleryEndpoint":"https://providers.n31r1203.masd.stbtest.microsoft.com:30016/", + "keyVaultEndpoint":"", + "graphEndpoint":"https://graph.redmond.ext-n31r1203.masd.stbtest.microsoft.com/", "serviceBusEndpoint":"", "batchManagementEndpoint":"", - "storageEndpointSuffix":"redmond.ext-n25r1306.masd.stbtest.microsoft.com", + "storageEndpointSuffix":"redmond.ext-n31r1203.masd.stbtest.microsoft.com", "sqlDatabaseDNSSuffix":"", "trafficManagerDNSSuffix":"", - "keyVaultDNSSuffix":"vault.redmond.ext-n25r1306.masd.stbtest.microsoft.com", + "keyVaultDNSSuffix":"vault.redmond.ext-n31r1203.masd.stbtest.microsoft.com", "serviceBusEndpointSuffix":"", "serviceManagementVMDNSSuffix":"", - "resourceManagerVMDNSSuffix":"cloudapp.ext-n25r1306.masd.stbtest.microsoft.com", + "resourceManagerVMDNSSuffix":"cloudapp.ext-n31r1203.masd.stbtest.microsoft.com", "containerRegistryDNSSuffix":"", "cosmosDBDNSSuffix":"", "tokenAudience":"",