Arcbox 3.0 - Replace CAPI (#2581)

* replace capi * fix az login * update to managed identity * enable system assigned identity * remove debugging * comment resource provider, this will be part of pre-req * update ip address * remove kv extension * add kubevip for service ip * fix kube config * fix nic name * fix nic name * fix kube config * Add role assignment dependency * add kubeconfig * update https * remove kube vip rbac url * remove spn details * update k3s scripts * k3s reset script changes * Fix resource name * update icon names * fix format * fix format * fix inline kubectl format * add retry for k3s gitops * update github account
microsoft · Jun 14, 2024 · fdb5366 · fdb5366
1 parent e269115
commit fdb5366
Show file tree

Hide file tree

Showing 17 changed files with 5,452 additions and 505 deletions.
diff --git a/azure_jumpstart_arcbox/artifacts/BookStoreLaunch.ps1 b/azure_jumpstart_arcbox/artifacts/BookStoreLaunch.ps1
@@ -1,2 +1,2 @@
-Start-Process -FilePath msedge -ArgumentList '--new-window https://arcbox.devops.com/bookbuyer https://arcbox.devops.com/bookstore https://arcbox.devops.com/bookstore-v2'
+Start-Process -FilePath msedge -ArgumentList '--new-window http://arcbox.devops.com/bookbuyer http://arcbox.devops.com/bookstore http://arcbox.devops.com/bookstore-v2'
 [Environment]::Exit(1)
diff --git a/azure_jumpstart_arcbox/artifacts/Bootstrap.ps1 b/azure_jumpstart_arcbox/artifacts/Bootstrap.ps1
@@ -21,7 +21,7 @@ param (
     [string]$POSTGRES_SERVICE_TYPE,
     [string]$stagingStorageAccountName,
     [string]$workspaceName,
-    [string]$capiArcDataClusterName,
+    [string]$k3sArcDataClusterName,
     [string]$k3sArcClusterName,
     [string]$aksArcClusterName,
     [string]$aksdrArcClusterName,
@@ -31,7 +31,8 @@ param (
     [string]$rdpPort,
     [string]$sshPort,
     [string]$vmAutologon,
-    [string]$addsDomainName
+    [string]$addsDomainName,
+    [string]$customLocationRPOID
 )
 
 [System.Environment]::SetEnvironmentVariable('adminUsername', $adminUsername, [System.EnvironmentVariableTarget]::Machine)
@@ -51,7 +52,7 @@ param (
 [System.Environment]::SetEnvironmentVariable('POSTGRES_SERVICE_TYPE', $POSTGRES_SERVICE_TYPE, [System.EnvironmentVariableTarget]::Machine)
 [System.Environment]::SetEnvironmentVariable('stagingStorageAccountName', $stagingStorageAccountName, [System.EnvironmentVariableTarget]::Machine)
 [System.Environment]::SetEnvironmentVariable('workspaceName', $workspaceName, [System.EnvironmentVariableTarget]::Machine)
-[System.Environment]::SetEnvironmentVariable('capiArcDataClusterName', $capiArcDataClusterName, [System.EnvironmentVariableTarget]::Machine)
+[System.Environment]::SetEnvironmentVariable('k3sArcDataClusterName', $k3sArcDataClusterName, [System.EnvironmentVariableTarget]::Machine)
 [System.Environment]::SetEnvironmentVariable('k3sArcClusterName', $k3sArcClusterName, [System.EnvironmentVariableTarget]::Machine)
 [System.Environment]::SetEnvironmentVariable('githubUser', $githubUser, [System.EnvironmentVariableTarget]::Machine)
 [System.Environment]::SetEnvironmentVariable('templateBaseUrl', $templateBaseUrl, [System.EnvironmentVariableTarget]::Machine)
@@ -60,6 +61,7 @@ param (
 [System.Environment]::SetEnvironmentVariable('addsDomainName', $addsDomainName, [System.EnvironmentVariableTarget]::Machine)
 [System.Environment]::SetEnvironmentVariable('aksArcClusterName', $aksArcClusterName, [System.EnvironmentVariableTarget]::Machine)
 [System.Environment]::SetEnvironmentVariable('aksdrArcClusterName', $aksdrArcClusterName, [System.EnvironmentVariableTarget]::Machine)
+[System.Environment]::SetEnvironmentVariable('customLocationRPOID', $customLocationRPOID, [System.EnvironmentVariableTarget]::Machine)
 
 [System.Environment]::SetEnvironmentVariable('ArcBoxDir', "C:\ArcBox", [System.EnvironmentVariableTarget]::Machine)
 
@@ -242,6 +244,7 @@ if ($flavor -eq "DevOps") {
     Invoke-WebRequest ($templateBaseUrl + "artifacts/icons/bookstore.ico") -OutFile $Env:ArcBoxIconDir\bookstore.ico
     Invoke-WebRequest ($templateBaseUrl + "artifacts/tests/devops.tests.ps1") -OutFile $Env:ArcBoxTestsDir\devops.tests.ps1
     Invoke-WebRequest ($templateBaseUrl + "artifacts/dsc/devops.dsc.yml") -OutFile $Env:ArcBoxDscDir\devops.dsc.yml
+    Invoke-WebRequest ($templateBaseUrl + "artifacts/longhorn.yaml") -OutFile $Env:ArcBoxDir\longhorn.yaml
 }
 
 # DataOps
@@ -269,6 +272,7 @@ if ($flavor -eq "DataOps") {
     Invoke-WebRequest ($templateBaseUrl + "artifacts/testDefenderForSQL.ps1") -OutFile $Env:ArcBoxDir\testDefenderForSQL.ps1
     Invoke-WebRequest ($templateBaseUrl + "artifacts/tests/dataops.tests.ps1") -OutFile $Env:ArcBoxTestsDir\dataops.tests.ps1
     Invoke-WebRequest ($templateBaseUrl + "artifacts/dsc/dataops.dsc.yml") -OutFile $Env:ArcBoxDscDir\dataops.dsc.yml
+    Invoke-WebRequest ($templateBaseUrl + "artifacts/longhorn.yaml") -OutFile $Env:ArcBoxDir\longhorn.yaml
 }
 
 # Full

diff --git a/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1 b/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1
@@ -31,7 +31,7 @@ Connect-AzAccount -Identity -Tenant $env:spntenantId -Subscription $env:subscrip
 
 # Required for CLI commands
 Write-Header "Az CLI Login"
-az login --identity --tenant $spnTenantId
+az login --identity
 az account set -s $env:subscriptionId
 
 # Retrieve Azure Key Vault secrets and store as runtime environment variables