Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated GitOps repo for ArcBox #2768

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Updated GitOps repo for ArcBox #2768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53dd02b
Updated GitOps repo
janegilring Oct 15, 2024
ef7497a
Update repository URL for appClonedRepo variable
janegilring Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions azure_jumpstart_arcbox/ARM/azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@
},
"githubUser": {
"type": "string",
"defaultValue": "microsoft",
"defaultValue": "Azure",
"metadata": {
"description": "User github account where they have forked https://github.com/microsoft/azure-arc-jumpstart-apps"
"description": "User github account where they have forked https://github.com/Azure/jumpstart-apps"
}
},
"addsDomainName": {
Expand Down Expand Up @@ -1406,13 +1406,13 @@
"githubUser": {
"type": "string",
"metadata": {
"description": "User github account where they have forked https://github.com/microsoft/azure-arc-jumpstart-apps"
"description": "User github account where they have forked https://github.com/Azure/jumpstart-apps"
}
},
"githubBranch": {
"type": "string",
"metadata": {
"description": "Git branch to use from the forked repo https://github.com/microsoft/azure-arc-jumpstart-apps"
"description": "Git branch to use from the forked repo https://github.com/Azure/jumpstart-apps"
}
},
"k3sArcClusterName": {
Expand Down
4 changes: 2 additions & 2 deletions azure_jumpstart_arcbox/ARM/azuredeploywithroleassignments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
"githubUser": {
"type": "string",
"metadata": {
"description": "User's github account where they have forked https://github.com/microsoft/azure-arc-jumpstart-apps"
"description": "User's github account where they have forked https://github.com/Azure/jumpstart-apps"
},
"defaultValue": "microsoft"
"defaultValue": "Azure"
},
"principalId": {
"type": "string",
Expand Down
4 changes: 2 additions & 2 deletions azure_jumpstart_arcbox/ARM/clientVm/clientVm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
"githubUser": {
"type": "string",
"metadata": {
"description": "User's github account where they have forked https://github.com/microsoft/azure-arc-jumpstart-apps"
"description": "User's github account where they have forked https://github.com/Azure/jumpstart-apps"
}
},
"k3sArcClusterName": {
Expand Down Expand Up @@ -234,7 +234,7 @@
"Enterprise"
]
}

},
"variables": {
"vmName": "[concat(parameters('vmName'))]",
Expand Down
2 changes: 1 addition & 1 deletion azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ $Env:AZCOPY_AUTO_LOGIN_TYPE = "MSI"

$certdns = "arcbox.devops.com"

$appClonedRepo = "https://github.com/$Env:githubUser/azure-arc-jumpstart-apps"
$appClonedRepo = "https://github.com/$Env:githubUser/jumpstart-apps"

$clusters = @(
[pscustomobject]@{clusterName = $Env:k3sArcDataClusterName; context = "$namingPrefix-k3s-data" ; kubeConfig = "C:\Users\$Env:adminUsername\.kube\config" }
Expand Down
6 changes: 3 additions & 3 deletions azure_jumpstart_arcbox/artifacts/gitops_scripts/K3sGitOps.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $ingressNamespace = "ingress-nginx"

$certdns = "arcbox.k3sdevops.com"

$appClonedRepo = "https://github.com/$Env:githubUser/azure-arc-jumpstart-apps"
$appClonedRepo = "https://github.com/$Env:githubUser/jumpstart-apps"

Start-Transcript -Path $Env:ArcBoxLogsDir\K3sGitOps.log

Expand Down Expand Up @@ -43,7 +43,7 @@ az k8s-configuration flux create `
--scope cluster `
--url $appClonedRepo `
--branch $Env:githubBranch --sync-interval 3s `
--kustomization name=nginx path=./nginx/release
--kustomization name=nginx path=./arcbox/nginx/release

# Create GitOps config for Hello-Arc application
Write-Host "Creating GitOps config for Hello-Arc application"
Expand All @@ -56,7 +56,7 @@ az k8s-configuration flux create `
--scope namespace `
--url $appClonedRepo `
--branch $env:githubBranch --sync-interval 3s `
--kustomization name=helloarc path=./hello-arc/yaml
--kustomization name=helloarc path=./arcbox/hello_arc/yaml

$configs = $(az k8s-configuration flux list --cluster-name $Env:k3sArcClusterName --cluster-type connectedClusters --resource-group $Env:resourceGroup --query "[].name" -otsv)

Expand Down
2 changes: 1 addition & 1 deletion azure_jumpstart_arcbox/artifacts/gitops_scripts/K3sRBAC.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $Env:k3sArcClusterName=(Get-AzResource -ResourceGroupName $Env:resourceGroup -Re
$Env:k3sArcClusterName=$Env:k3sArcClusterName -replace "`n",""

$namingPrefix = $Env:namingPrefix
$appClonedRepo = "https://github.com/$Env:githubUser/azure-arc-jumpstart-apps"
$appClonedRepo = "https://github.com/$Env:githubUser/jumpstart-apps"

Start-Transcript -Path $Env:ArcBoxLogsDir\K3sRBAC.log

Expand Down
4 changes: 2 additions & 2 deletions azure_jumpstart_arcbox/bicep/clientVm/clientVm.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ param sqlServerEdition string = 'Developer'
@description('Choice to deploy Bastion to connect to the client VM')
param deployBastion bool = false

@description('User github account where they have forked https://github.com/microsoft/azure-arc-jumpstart-apps')
@description('User github account where they have forked https://github.com/Azure/jumpstart-apps')
param githubUser string

@description('Git branch to use from the forked repo https://github.com/microsoft/azure-arc-jumpstart-apps')
@description('Git branch to use from the forked repo https://github.com/Azure/jumpstart-apps')
param githubBranch string

@description('The name of the K3s cluster')
Expand Down
4 changes: 2 additions & 2 deletions azure_jumpstart_arcbox/bicep/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ param deployBastion bool = false
])
param bastionSku string = 'Basic'

@description('User github account where they have forked https://github.com/microsoft/azure-arc-jumpstart-apps')
param githubUser string = 'microsoft'
@description('User github account where they have forked https://github.com/Azure/jumpstart-apps')
param githubUser string = 'Azure'

@description('Active directory domain services domain name')
param addsDomainName string = 'jumpstart.local'
Expand Down
2 changes: 1 addition & 1 deletion azure_jumpstart_arcbox/bicep/mgmt/mgmtArtifacts.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ module keyVault 'br/public:avm/res/key-vault/vault:0.5.1' = {
params: {
name: toLower(keyVaultName)
enablePurgeProtection: false
enableSoftDelete: false
enableSoftDelete: true
location: location
}
}
Expand Down