Merge upstream main commits into agora_2.0 dev branch

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,7 +8,10 @@ assignees: ''
 ---
 <!--- 🛑 Please check existing issues first before continuing: https://github.com/microsoft/azure_arc/issues --->
 
-<!---  Disclaimer: The intent of this "Bug report" template is to address issues related to the Azure Arc Jumpstart scenarios, ArcBox, HCIBox, Agora, and all other project ares. The Azure Arc Jumpstart team does not handle Azure Arc core product issues, bugs and feature requests and will try to assist on a best effort basis. For a core product issue or feature request/feedback, please create an official [Azure support ticket](https://azure.microsoft.com/support/create-ticket/) or [general feedback request](https://feedback.azure.com). --->
+<!--- Disclaimer: The intent of this "Bug report" template is to address feature requests related to the various Arc Jumpstart solution. The Arc Jumpstart team does not handle and/or support Azure Arc upstream core product related issues, bugs and feature requests and will try to assist on a best effort basis. For a core product issue or feature request/feedback, please create an official [Azure support ticket](https://azure.microsoft.com/support/create-ticket/) or [general feedback request](https://feedback.azure.com). --->
+
+> **Note:** For ease of issues and pull requests management and tracking, we kindly ask you to provide a meaningful and concise title to this issue and answer all questions to the best of your ability.
+
 
 **Is your issue related to a Jumpstart scenario, ArcBox, HCIBox, or Agora?**
 <!--- A link to the Jumpstart scenario you are working on. --->
@@ -31,12 +34,12 @@ assignees: ''
 
 **Have you looked at the Troubleshooting and Logs section?**
 <!---Relevant logs retrieval instructions can be found in the Troubleshooting section.
-- [Jumpstart ArcBox "Full" troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_arcbox/Full#basic-troubleshooting)
 - [Jumpstart ArcBox for IT Pros troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_arcbox/ITPro#basic-troubleshooting)
 - [Jumpstart ArcBox for DevOps troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_arcbox/DevOps#basic-troubleshooting)
 - [Jumpstart ArcBox for DataOps troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_arcbox/DataOps#basic-troubleshooting)
 - [HCIBox troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_hcibox/getting_started#basic-troubleshooting)
 - [Agora - Contoso Supermarket troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_ag/retail/contoso_supermarket/troubleshooting)
+- [Agora - Contoso Motors troubleshooting](https://arcjumpstart.com/azure_jumpstart_ag/manufacturing/contoso_motors/troubleshooting)
 --->
 
 **Screenshots**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -6,10 +6,12 @@ labels: ''
 assignees: ''
 
 ---
-<!--- Disclaimer: The intent of this "Feature request" template is to address feature requests related to the Azure Arc Jumpstart scenarios, ArcBox, HCIBox, Agora, and all other project ares. The Azure Arc Jumpstart team does not handle Azure Arc core product issues, bugs and feature requests and will try to assist on a best effort basis. For a core product issue or feature request/feedback, please create an official [Azure support ticket](https://azure.microsoft.com/support/create-ticket/) or [general feedback request](https://feedback.azure.com). --->
+<!--- Disclaimer: The intent of this "Feature request" template is to address feature requests related to the various Arc Jumpstart solution. The Arc Jumpstart team does not handle and/or support Azure Arc upstream core product related issues, bugs and feature requests and will try to assist on a best effort basis. For a core product issue or feature request/feedback, please create an official [Azure support ticket](https://azure.microsoft.com/support/create-ticket/) or [general feedback request](https://feedback.azure.com). --->
+
+> **Note:** For ease of issues and pull requests management and tracking, we kindly ask you to provide a meaningful and concise title to this feature request and answer all questions to the best of your ability.
 
 **Is your feature request related to a new Jumpstart scenario you would like to contribute?**
-<!--- That's great! Use our [Jumpstart Scenario Write-up Guidelines](https://aka.ms/JumpstartContribution) --->
+<!--- That's great! Use our [Jumpstart contribution guidelines](https://aka.ms/JumpstartContribution) --->
 
 **Is your feature request related to a problem? Please describe.**
 <!--- A clear and concise description of what the problem is. Ex. As a user of ... I would like to have [...] --->

.github/policies/issues.yml

@@ -1,5 +1,5 @@
 name:  Housekeeping - Issues management
-description: Azure Arc Jumpstart management of issues using GitHub Policies
+description: Arc Jumpstart management of issues using GitHub Policies
 owner: 
 resource: repository
 disabled: false
@@ -61,7 +61,7 @@ configuration:
           action: Opened
       then:
       - addReply:
-          reply: 'Hi ${issueAuthor}! Thank you for opening this issue. We appreciate your contribution and welcome you to our community! We are glad to have you here and to have your input on the Azure Arc Jumpstart.'
+          reply: 'Hi ${issueAuthor}! Thank you for opening this issue. We appreciate your contribution and welcome you to our community! We are glad to have you here and to have your input on the Arc Jumpstart.'
       description: 
     - if:
       - payloadType: Issue_Comment

.github/policies/pullrequests.yml

@@ -1,5 +1,5 @@
 name:  Housekeeping - PRs management
-description: Azure Arc Jumpstart management of PRs using GitHub Policies
+description: Arc Jumpstart management of PRs using GitHub Policies
 owner: 
 resource: repository
 disabled: false
@@ -60,7 +60,7 @@ configuration:
           action: Opened
       then:
       - addReply:
-          reply: 'Hi ${issueAuthor}! Thank you for opening this Pull Request. Someone will review it soon. Thank you for committing to making the Azure Arc Jumpstart better.'
+          reply: 'Hi ${issueAuthor}! Thank you for opening this Pull Request. Someone will review it soon. Thank you for committing to making the Arc Jumpstart better.'
       description: 
     - if:
       - payloadType: Pull_Request_Review

README.md

@@ -1,4 +1,4 @@
-# Azure Arc Jumpstart source code
+# Arc Jumpstart source code
 
 Welcome to the Arc Jumpstart source code repository! This repository is your go-to resource for working with and contributing to the Arc Jumpstart automation scripts and tools and acts as the backend source code repository which complements our [documentation repository](https://github.com/Azure/arc_jumpstart_docs) that eventually populates the [Arc Jumpstart](https://aka.ms/arcjumpstart) website.
 

azure-pipelines.yml

@@ -0,0 +1,147 @@
+trigger:
+  branches:
+    include:
+      - arcbox_3.0
+  paths:
+    include:
+      - azure_jumpstart_arcbox/*
+
+parameters:
+- name: ResourceGroupName
+  displayName: 'Resource Group Name'
+  type: string
+  default: 'arcbox-itpro-integration-tests'
+- name: AzureSubscription
+  displayName: 'Azure Subscription'
+  type: string
+  default: 'Azure Arc Jumpstart Develop(98a19988-5c3d-4824-a685-f5cf12ae5c19)'
+- name: githubAccount
+  displayName: 'githubAccount'
+  type: string
+  default: 'microsoft'
+- name: githubBranch
+  displayName: 'githubBranch'
+  type: string
+  default: 'arcbox_3.0'
+- name: flavor
+  displayName: 'flavor'
+  type: string
+  default: 'ITPro'
+
+variables:
+- group: 'integration-tests'
+- name: ResourceGroupName
+  value: ${{parameters.ResourceGroupName}}
+- name: githubAccount
+  value: ${{parameters.githubAccount}}
+- name: githubBranch
+  value: ${{parameters.githubBranch}}
+- name: flavor
+  value: ${{parameters.flavor}}
+
+stages:
+- stage: 'ArcBox_deployment'
+  jobs:
+  - job: Deploy
+    timeoutInMinutes: 235 # 5 minutes before the ACA self-hosted runner in order for the runner to gracefully shutdown
+    pool:
+      name: arc-jumpstart-container-apps-pool
+      #vmImage: 'ubuntu-latest'
+    continueOnError: 'true'
+    steps:
+
+    - task: BicepInstall@0
+      displayName: 'Install Bicep'
+      inputs:
+       version: 0.24.24
+
+    - task: AzurePowerShell@5
+      displayName: 'Deploy resource group'
+      inputs:
+        azureSubscription: ${{parameters.AzureSubscription}}
+        ScriptType: 'InlineScript'
+        azurePowerShellVersion: 'LatestVersion'
+        Inline: |
+          Write-Host "Running deployment from machine $(hostname) and public IP $(irm ifconfig.me/ip)"
+          $RGname = "$(ResourceGroupName)"
+          New-AzResourceGroup -Name $RGname -Location "eastus"
+
+    - task: AzurePowerShell@5
+      displayName: 'Deploy Bicep template'
+      inputs:
+        azureSubscription: ${{parameters.AzureSubscription}}
+        ScriptType: 'InlineScript'
+        azurePowerShellVersion: 'LatestVersion'
+        Inline: |
+          Write-Host "Deploying to $(ResourceGroupName)"
+          $githubAccount = "$(githubAccount)"
+          $githubBranch = "$(githubBranch)"
+          $flavor = "$(flavor)"
+          if ($githubAccount -ne "microsoft") {
+            Write-Host "Checking out $githubAccount/$githubBranch"
+            git remote add upstream https://github.com/$($githubAccount)/azure_arc.git
+            git fetch upstream
+            git checkout -b $githubBranch upstream/$githubBranch
+          }
+          New-AzResourceGroupDeployment -Name ArcBox `
+          -ResourceGroupName $(ResourceGroupName) `
+          -TemplateFile azure_jumpstart_arcbox/bicep/main.bicep `
+          -TemplateParameterObject @{ `
+              spnClientId = "$(spnClientId)" ; `
+              spnClientSecret = "$(spnClientSecret)" ; `
+              spnTenantId = "$(spnTenantId)" ; `
+              windowsAdminUsername = "arcdemo" ; `
+              windowsAdminPassword = "$(windowsAdminPassword)" ; `
+              sshRSAPublicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCsdlSaF10Uw0fFysiIV0VYeJGE1CaV0ZjZcakcKgafiqZ04sAzf7KnoIjPVyx6LXoDTKGtv1e5eFjRZA7Z0Bu+a3JqY252/yr/B2R3Mu5qZHbKFncpVEXn7sUmYk4rDG5vToFxbhpKX5EGyvM1M0quoUv3Uv9reBsSDdjk7n7oA2Q+89rj4nfRuTEMQRwvNBaLeNRSlWuzPq4EkpwxSWRzIC2auC5K0rxGiTMPTXMOQ3l0DvzKRoEsygHA4c3uw0PTntSlgSSTgtGdQfuX63hAD4QPTVfeQdsW5+Nq3clr+6SHgeGdwHhKjUVTF+E2olfSYtuV4CqPW8dZdDBOZg7pXLMSVumZVKCZiUV6uBJkvLBRMzMiFsfXOVrgyThMqq+8y4tg/V3l/3S8z5Lngy4WoCAQMHQ1SloPmy9s4QnbjCFEQx/cIq9H+Uw6HAYhdQFh/w/tuIP+KIqOpMOrltZuaoqx3AOOL3BPXJMbv3opiZxCEZQFf68n+Zn6uRc9u1EENA9s1DrjG1j/CHWzbX/t63Ig/xQLgKLu9T+evua3dcWsYc3j1Gvk8R+ioXV7x0/fi6twrhSQxBIIL0D2Pxm8TBfJ3mVXk0kYGGq1mBsoxAzjoBhcbdwUMXHbAksj4/UuuAK5VfH278hlXo/BHSgDLZ98fdS63nq7rIr6qWmBrQ==" ; `
+              logAnalyticsWorkspaceName = "arcbox-la" ; `
+              flavor = $flavor ; `
+              deployBastion = $false ; `
+              githubAccount = $githubAccount ; `
+              githubBranch = $githubBranch ; `
+              vmAutologon = $true ; `
+              rdpPort = "3389" `
+          }
+
+
+    - task: AzurePowerShell@5
+      displayName: 'Upload Pester test-results from ArcBox VM'
+      inputs:
+        azureSubscription: ${{parameters.AzureSubscription}}
+        ScriptType: FilePath
+        azurePowerShellVersion: 'LatestVersion'
+        ScriptPath: 'azure_jumpstart_arcbox/artifacts/integration_tests/scripts/Wait-ArcBoxDeployment.ps1'
+        ScriptArguments: -ResourceGroupName $(ResourceGroupName) -githubAccount $(githubAccount) -githubBranch $(githubBranch)
+
+    - task: AzurePowerShell@5
+      displayName: 'Download Pester test-results from storage account to pipeline agent'
+      inputs:
+        azureSubscription: ${{parameters.AzureSubscription}}
+        ScriptType: FilePath
+        azurePowerShellVersion: 'LatestVersion'
+        ScriptPath: 'azure_jumpstart_arcbox/artifacts/integration_tests/scripts/Get-PesterResult.ps1'
+        ScriptArguments: -ResourceGroupName $(ResourceGroupName)
+
+    - task: PublishTestResults@2
+      displayName: 'Publish Test Results'
+      inputs:
+        testResultsFormat: NUnit
+        testResultsFiles: '$(System.DefaultWorkingDirectory)/testresults/*.xml'
+
+- stage: destroy
+  displayName: 'ArcBox_teardown'
+  #condition: succeeded('deploy')
+  jobs:
+  - deployment:
+    displayName: "Get approval"
+    environment: 'teardown_approval'
+  - job: Delete
+    steps:
+    - task: AzurePowerShell@5
+      displayName: 'Delete resource group'
+      inputs:
+        azureSubscription: ${{parameters.AzureSubscription}}
+        ScriptType: 'InlineScript'
+        azurePowerShellVersion: 'LatestVersion'
+        Inline: |
+          Write-Host "Deleting resource group $(ResourceGroupName)"
+          Remove-AzResourceGroup -Name $(ResourceGroupName) -Force -WhatIf

azure_arc_app_services_jumpstart/aks/ARM/artifacts/deployAppService.ps1

@@ -7,7 +7,7 @@ $customLocationId = $(az customlocation show --name "jumpstart-cl" --resource-gr
 az appservice plan create --resource-group $Env:resourceGroup --name Jumpstart --custom-location $customLocationId --per-site-scaling --is-linux --sku K1
 
 Write-Host "`n"
-Write-Host "Deploy a sample Azure Arc Jumpstart web application"
+Write-Host "Deploy a sample Arc Jumpstart web application"
 Write-Host "`n"
 az webapp create --plan Jumpstart --resource-group $Env:resourceGroup --name jumpstart-app --custom-location $customLocationId --deployment-container-image-name azurearcjumpstart.azurecr.io/hello-arc:latest
 az webapp config appsettings set --resource-group $Env:resourceGroup --name jumpstart-app --settings WEBSITES_PORT=8080

azure_arc_app_services_jumpstart/aks/ARM/artifacts/logicAppCode/CreateBlobFromQueueMessage/workflow.json

@@ -11,7 +11,7 @@
                         }
                     },
                     "method": "post",
-                    "body": "Azure Arc Jumpstart is amazing!",
+                    "body": "Arc Jumpstart is amazing!",
                     "headers": {
                         "ReadFileMetadataFromServer": true
                     },

azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/deployAppService.ps1

@@ -7,7 +7,7 @@ $customLocationId = $(az customlocation show --name "$Env:capiArcAppClusterName-
 az appservice plan create --resource-group $Env:resourceGroup --name Jumpstart --custom-location $customLocationId --per-site-scaling --is-linux --sku K1
 
 Write-Host "`n"
-Write-Host "Deploy a sample Azure Arc Jumpstart web application"
+Write-Host "Deploy a sample Arc Jumpstart web application"
 Write-Host "`n"
 az webapp create --plan Jumpstart --resource-group $Env:resourceGroup --name jumpstart-app --custom-location $customLocationId --deployment-container-image-name azurearcjumpstart.azurecr.io/hello-arc:latest
 az webapp config appsettings set --resource-group $Env:resourceGroup --name jumpstart-app --settings WEBSITES_PORT=8080

azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/logicAppCode/CreateBlobFromQueueMessage/workflow.json

@@ -11,7 +11,7 @@
                         }
                     },
                     "method": "post",
-                    "body": "Azure Arc Jumpstart is amazing!",
+                    "body": "Arc Jumpstart is amazing!",
                     "headers": {
                         "ReadFileMetadataFromServer": true
                     },

azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json

@@ -118,12 +118,10 @@
   },
   "variables": {
     "templateBaseUrl": "[concat('https://raw.githubusercontent.com/', parameters('githubAccount'), '/azure_arc/', parameters('githubBranch'), '/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/')]",
-    "capiTemplateUrl": "[uri(variables('templateBaseUrl'), 'ubuntuCapi.json')]",
     "clientVmTemplateUrl": "[uri(variables('templateBaseUrl'), 'clientVm.json')]",
     "mgmtStagingStorageUrl": "[uri(variables('templateBaseUrl'), 'mgmtStagingStorage.json')]",
     "logAnalyticsUrl": "[uri(variables('templateBaseUrl'), 'logAnalytics.json')]",
     "VNETUrl": "[uri(variables('templateBaseUrl'), 'VNET.json')]",
-    "capiArcAppClusterName": "[concat('ArcBox-CAPI-Data','-',parameters('guid'))]",
     // Virtual Network configuration
     "virtualNetworkName": "Arc-App-CAPI-VNet",
     "subnetName": "Arc-App-CAPI-Subnet",
@@ -167,68 +165,6 @@
         }
       }
     },
-    {
-      "type": "Microsoft.Resources/deployments",
-      "comments": "Deploy the CAPI environment",
-      "apiVersion": "2021-04-01",
-      "name": "ubuntuCAPIDeployment",
-      "dependsOn": [ "stagingStorageAccountDeployment", "VNETDeployment" ],
-      "properties": {
-        "mode": "Incremental",
-        "templateLink": {
-          "uri": "[variables('capiTemplateUrl')]",
-          "contentVersion": "1.0.0.0"
-        },
-        "parameters": {
-          "sshRSAPublicKey": {
-            "value": "[parameters('sshRSAPublicKey')]"
-          },
-          "spnClientId": {
-            "value": "[parameters('spnClientId')]"
-          },
-          "spnClientSecret": {
-            "value": "[parameters('spnClientSecret')]"
-          },
-          "spnTenantId": {
-            "value": "[parameters('spnTenantId')]"
-          },
-          "stagingStorageAccountName": {
-            "value": "[reference('stagingStorageAccountDeployment').outputs.storageAccountName.value]"
-          },
-          "logAnalyticsWorkspaceName": {
-            "value": "[parameters('logAnalyticsWorkspaceName')]"
-          },
-          "templateBaseUrl": {
-            "value": "[variables('templateBaseUrl')]"
-          },
-          "virtualNetworkName": {
-            "value": "[variables('virtualNetworkName')]"
-          },
-          "subnetName": {
-            "value": "[variables('subnetName')]"
-          },
-          "subnetAddressPrefix": {
-            "value": "[variables('subnetAddressPrefix')]"
-          },
-          "deployBastion": {
-            "value": "[parameters('deployBastion')]"
-          },
-          "bastionHostName": {
-            "value": "[parameters('bastionHostName')]"
-          },
-          "bastionSubnetRef": {
-            "value": "[variables('bastionSubnetRef')]"
-          },
-          "bastionSubnetPrefix": {
-            "value": "[variables('bastionSubnetPrefix')]"
-          },
-          "capiArcAppClusterName" : {
-            "value": "[variables('capiArcAppClusterName')]"
-          }
-
-        }
-      }
-    },
     {
       "type": "Microsoft.Resources/deployments",
       "comments": "Deploys the Client Windows VM",
@@ -298,9 +234,6 @@
           },
           "bastionSubnetPrefix": {
             "value": "[variables('bastionSubnetPrefix')]"
-          },
-          "capiArcAppClusterName" : {
-            "value": "[variables('capiArcAppClusterName')]"
           }
         }
       }

azure_arc_k8s_jumpstart/aks/gitops/basic/az_k8sconfig_aks.sh

@@ -8,7 +8,7 @@ export password='<Your Azure service principal password>'
 export tenantId='<Your Azure tenant ID>'
 export resourceGroup='<Azure resource group name>'
 export arcClusterName='<The name of your k8s cluster as it will be shown in Azure Arc>'
-export appClonedRepo='<The URL for the "Azure Arc Jumpstart" forked GitHub repository>'
+export appClonedRepo='<The URL for the "Arc Jumpstart" forked GitHub repository>'
 export namespace='hello-arc'
 
 # Getting AKS credentials

azure_arc_k8s_jumpstart/aks/gitops/helm/az_k8sconfig_helm_aks.sh

@@ -8,7 +8,7 @@ export password='<Your Azure service principal password>'
 export tenantId='<Your Azure tenant ID>'
 export resourceGroup='<Azure resource group name>'
 export arcClusterName='<The name of your k8s cluster as it will be shown in Azure Arc>'
-export appClonedRepo='<The URL for the "Azure Arc Jumpstart" forked GitHub repository>'
+export appClonedRepo='<The URL for the "Arc Jumpstart" forked GitHub repository>'
 export ingressNamespace='ingress-nginx'
 export namespace='hello-arc'
 

azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full/bicep_template/artifacts/Bootstrap.ps1

@@ -12,7 +12,8 @@ param (
     [string]$rdpPort,
     [string]$githubAccount,
     [string]$githubBranch,
-    [string]$kubernetesDistribution
+    [string]$kubernetesDistribution,
+    [string]$AKSEEPinnedSchemaVersion
 )
 
 # Inject ARM template parameters as environment variables
@@ -30,6 +31,7 @@ param (
 [System.Environment]::SetEnvironmentVariable('githubAccount', $githubAccount, [System.EnvironmentVariableTarget]::Machine)
 [System.Environment]::SetEnvironmentVariable('githubBranch', $githubBranch, [System.EnvironmentVariableTarget]::Machine)
 [System.Environment]::SetEnvironmentVariable('kubernetesDistribution', $kubernetesDistribution, [System.EnvironmentVariableTarget]::Machine)
+[System.Environment]::SetEnvironmentVariable('AKSEEPinnedSchemaVersion', $AKSEEPinnedSchemaVersion, [System.EnvironmentVariableTarget]::Machine)
 
 # Create path
 Write-Output "Create deployment path"