Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
525f83e
Contoso Motors - define InfluxDB Admin password & comment deployGPUNodes
mikaseitsonen Apr 23, 2025
3a5c7e9
Merge pull request #1 from mikaseitsonen/mikaseitsonen-patch-1
mikaseitsonen Apr 23, 2025
d389999
update issue form
likamrat Apr 25, 2025
2659e59
Merge pull request #3183 from likamrat/policy
likamrat Apr 25, 2025
9e4244a
update issue form
likamrat Apr 25, 2025
7f1c3d7
Merge pull request #3184 from likamrat/policy
likamrat Apr 25, 2025
9f4edc7
vBumps for April Release (#3182)
jkleinschnitz-msft Apr 25, 2025
4b9eaa1
testing preprod images
sebassem Apr 26, 2025
135cc20
update policy
likamrat Apr 26, 2025
62563db
Merge pull request #3185 from likamrat/policy
likamrat Apr 26, 2025
674ebc2
update policy
likamrat Apr 26, 2025
f9951ec
Merge pull request #3186 from likamrat/policy
likamrat Apr 26, 2025
cda802b
refactor: improve function structure and readability in common.psm1
sebassem Apr 27, 2025
22faad6
fix: toggle between preprod and prod VM image fetching in Deploy-Virt…
sebassem Apr 27, 2025
b1a2aa9
update policy
likamrat Apr 27, 2025
86a472b
Merge pull request #3187 from likamrat/policy
likamrat Apr 27, 2025
277c2be
update policy
likamrat Apr 27, 2025
ced2f38
Merge pull request #3189 from likamrat/policy
likamrat Apr 27, 2025
a2e85c5
update policy
likamrat Apr 27, 2025
48b2fd9
Merge pull request #3190 from likamrat/policy
likamrat Apr 27, 2025
c8a709c
fix: update L1Password for consistency across configuration files
sebassem Apr 28, 2025
35836b1
fix: update VM image fetching logic in Deploy-VirtualizationInfrastru…
sebassem Apr 28, 2025
65837a2
fix: update VM image fetching logic in Deploy-VirtualizationInfrastru…
sebassem Apr 28, 2025
33b98f7
Merge branch 'microsoft:main' into main
sebassem Apr 28, 2025
7413bcf
fix: update hardcoded passwords in Deploy-VirtualizationInfrastructur…
sebassem Apr 28, 2025
6793404
Merge branch 'main' of https://github.com/sebassem/azure_arc
sebassem Apr 28, 2025
ccaf6d7
fix: improve function structure and readability in common.psm1
sebassem Apr 28, 2025
313a2f7
Merge pull request #3192 from sebassem/main
sebassem Apr 28, 2025
ebc201c
update policy
likamrat Apr 28, 2025
f9c17b9
Merge pull request #3193 from likamrat/policy
likamrat Apr 28, 2025
c37e659
update policy
likamrat Apr 28, 2025
f09ff1e
Merge pull request #3194 from likamrat/policy
likamrat Apr 28, 2025
fdba6dd
Merge pull request #3180 from mikaseitsonen/main
likamrat Apr 29, 2025
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
197 changes: 147 additions & 50 deletions .github/policies/issueManagement.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/policies/pullRequestManagement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# ===========================================================================
# GitHub Repository Pull Request Management Policy
# ===========================================================================
# Purpose: Automate PR workflow management for the Arc Jumpstart repository
# Purpose: Automate PR workflow management for for this repository
# This policy handles PR creation, validation, and provides appropriate guidance to contributors
id:
name: GitOps.PullRequestIssueManagement
Expand Down
3 changes: 2 additions & 1 deletion REPO_POLICIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ This document summarizes the automated policies for managing Pull Requests (PRs)
| Policy | What Happens | Why? | Contributor Experience |
|-------------------------------|----------------------------------------------------------------------------------------------|-----------------------------------------------------------|---------------------------------------------------------|
| **New Issue Triage** | New issues are labeled for triage and categorized by keywords in the title. | Improves visibility and routing. | Issues with "bug" or "feature" get a tailored reply. |
| **Auto-Close Unlabeled Issues**| Issues opened without "Bug-Issue" or "Feature-Request" labels are closed with guidance. | Enforces use of issue forms for proper categorization. | Author receives a message and issue is closed. |
| **Auto-Close Unlabeled Issues**| Issues opened without "Bug-Issue" or "Feature-Request" labels are closed with guidance and labeled **Abandoned**. | Enforces use of issue forms for proper categorization. | Author receives a message, issue is closed and labeled. |
| **Issue Lifecycle Management**| Labels are updated when issues are closed, reopened, or marked as duplicates. Authors can comment `/unresolve` to reopen. | Keeps issue status and labels accurate. | Clear communication and ability to reopen issues. |
| **Assignment Handling** | Labels are managed automatically when issues are assigned or unassigned. | Ensures issues needing attention are visible. | Maintainers and contributors see up-to-date labels. |
| **Duplicate Issue Handling** | Issues/PRs identified as duplicates (via comments) are closed and labeled. | Prevents duplicate tracking and consolidates discussion. | PR/issue is closed with a comment and label. |
| **Issue Milestone Check** | Assigned or closed issues without a milestone are given the "Missing-Milestone" label. Maintainers are expected to add a milestone to any assigned or closed issue with this label. Once a milestone is set, the label is automatically removed. | Ensures all assigned and closed issues are tracked with milestones. | Maintainers are prompted to add a milestone to any assigned or closed issue with the "Missing-Milestone" label, and the label is cleared once a milestone is set. |
| **Stale Issue Management** | Issues needing author feedback and inactive for 7 days are labeled "No-Recent-Activity". If still inactive after another 7 days, the issue is closed. Resolved issues are auto-closed after 7 days of inactivity. | Keeps the issue tracker clean and focused. | Reminders and auto-closure with clear communication. |

---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ rules:
- patch
- update
- watch
- delete
- apiGroups:
- rbac.authorization.k8s.io
resources:
Expand Down
2 changes: 1 addition & 1 deletion arc_data_services/charts/arcdataservices/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Azure:
InstallerServiceAccount: ""
RuntimeServiceAccount: ""
systemDefaultValues:
image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.37.0_2025-03-11
image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.38.0_2025-04-08
imagePullPolicy: Always
imagePullSecret: arc-private-registry
installerServiceAccount: ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ def execute_cmd(cmd):
if os.getenv("SOURCE_DOCKER_TAG") is None:
SOURCE_DOCKER_TAG = (
input(
"Provide container image tag for the images at the source - press ENTER for using 'v1.37.0_2025-03-11': "
"Provide container image tag for the images at the source - press ENTER for using 'v1.38.0_2025-04-08': "
)
or "v1.37.0_2025-03-11"
or "v1.38.0_2025-04-08"
)
else:
SOURCE_DOCKER_TAG = os.environ["SOURCE_DOCKER_TAG"]
Expand Down
4 changes: 2 additions & 2 deletions arc_data_services/deploy/yaml/bootstrapper-unified.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -331,11 +331,11 @@ spec:
kubernetes.io/os: linux
containers:
- name: bootstrapper
image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.37.0_2025-03-11
image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.38.0_2025-04-08
imagePullPolicy: Always
args:
- -image
- mcr.microsoft.com/arcdata/arc-bootstrapper:v1.37.0_2025-03-11
- mcr.microsoft.com/arcdata/arc-bootstrapper:v1.38.0_2025-04-08
- -policy
- Always
- -chart
Expand Down
4 changes: 2 additions & 2 deletions arc_data_services/deploy/yaml/bootstrapper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ spec:
kubernetes.io/os: linux
containers:
- name: bootstrapper
image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.37.0_2025-03-11
image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.38.0_2025-04-08
imagePullPolicy: Always
args:
- -image
- mcr.microsoft.com/arcdata/arc-bootstrapper:v1.37.0_2025-03-11
- mcr.microsoft.com/arcdata/arc-bootstrapper:v1.38.0_2025-04-08
- -policy
- Always
- -chart
Expand Down
2 changes: 1 addition & 1 deletion arc_data_services/deploy/yaml/data-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
serviceAccount: sa-arc-controller
docker:
imagePullPolicy: Always
imageTag: v1.37.0_2025-03-11
imageTag: v1.38.0_2025-04-08
registry: mcr.microsoft.com
repository: arcdata
infrastructure: other # Must be a value in the array [alibaba, aws, azure, gcp, onpremises, other]
Expand Down
2 changes: 1 addition & 1 deletion arc_data_services/deploy/yaml/uninstall.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
kubernetes.io/os: linux
containers:
- name: bootstrapper
image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.37.0_2025-03-11
image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.38.0_2025-04-08
imagePullPolicy: IfNotPresent
args: ["-uninstall"]
command: ["/opt/bootstrapper/bin/bootstrapper"]
Expand Down
2 changes: 1 addition & 1 deletion arc_data_services/test/launcher/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ secretGenerator:
images:
- name: arc-ci-launcher
newName: mcr.microsoft.com/arcdata/arc-ci-launcher
newTag: v1.37.0_2025-03-11
newTag: v1.38.0_2025-04-08
4 changes: 2 additions & 2 deletions arc_data_services/upgrade/yaml/bootstrapper-upgrade-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ spec:
- name: your-private-registry
containers:
- name: bootstrapper
image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.37.0_2025-03-11
image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.38.0_2025-04-08
imagePullPolicy: Always
command: ["/opt/bootstrapper/bin/bootstrapper"]
args: ["-image", "mcr.microsoft.com/arcdata/arc-bootstrapper:v1.37.0_2025-03-11", "-policy", "Always", "-chart", "/opt/helm/arcdataservices", "-bootstrap"]
args: ["-image", "mcr.microsoft.com/arcdata/arc-bootstrapper:v1.38.0_2025-04-08", "-policy", "Always", "-chart", "/opt/helm/arcdataservices", "-bootstrap"]
resources:
limits:
cpu: 200m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ metadata:
name: arc
spec:
docker:
imageTag: v1.37.0_2025-03-11
imageTag: v1.38.0_2025-04-08

Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"docker": {
"imagePullPolicy": "Always",
"imageTag": "v1.37.0_2025-03-11",
"imageTag": "v1.38.0_2025-04-08",
"registry": "<registry>",
"repository": "<repository>"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"docker": {
"imagePullPolicy": "Always",
"imageTag": "v1.37.0_2025-03-11",
"imageTag": "v1.38.0_2025-04-08",
"registry": "<registry>",
"repository": "<repository>"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ az k8s-extension create --name arc-data-services `
--resource-group $Env:resourceGroup `
--auto-upgrade false `
--scope cluster `
--version 1.37.0 `
--version 1.38.0 `
--release-namespace arc `
--config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ az k8s-extension create --name arc-data-services `
--resource-group $Env:resourceGroup `
--auto-upgrade false `
--scope cluster `
--version 1.37.0 `
--version 1.38.0 `
--release-namespace arc `
--config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper `

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ az k8s-extension create --name arc-data-services `
--resource-group $Env:resourceGroup `
--auto-upgrade false `
--scope cluster `
--version 1.37.0 `
--version 1.38.0 `
--release-namespace arc `
--config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ az k8s-extension create --name arc-data-services `
--resource-group $Env:resourceGroup `
--auto-upgrade false `
--scope cluster `
--version 1.37.0 `
--version 1.38.0 `
--release-namespace arc `
--config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper `

Expand Down Expand Up @@ -229,7 +229,7 @@ az k8s-extension create --name arc-data-services `
--resource-group $Env:resourceGroup `
--auto-upgrade false `
--scope cluster `
--version 1.37.0 `
--version 1.38.0 `
--release-namespace arc `
--config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper `

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ az k8s-extension create --name arc-data-services `
--resource-group $Env:resourceGroup `
--auto-upgrade false `
--scope cluster `
--version 1.37.0 `
--version 1.38.0 `
--release-namespace arc `
--config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper `

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ az k8s-extension create --name arc-data-services `
--resource-group $Env:resourceGroup `
--auto-upgrade false `
--scope cluster `
--version 1.37.0 `
--version 1.38.0 `
--release-namespace arc `
--config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ az k8s-extension create --name arc-data-services `
--resource-group $env:resourceGroup `
--auto-upgrade false `
--scope cluster `
--version 1.37.0 `
--version 1.38.0 `
--release-namespace arc `
--config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper `

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
L1VMNumVCPU = 8 # This value controls the number of vCPUs to assign to each AKS Edge Essentials host virtual machine.
InternalSwitch = "InternalSwitch" # This value controls the Hyper-V internal switch name used by L0 Azure virtual machine.
L1Username = "Administrator" # This value controls the Admin credential username for the L1 Hyper-V virtual machines that run on the Agora-Client.
L1Password = 'Agora123!!' # This value controls the Admin credential password for the L1 Hyper-V virtual machines that run on the Agora-Client.
L1Password = 'JS123!!' # This value controls the Admin credential password for the L1 Hyper-V virtual machines that run on the Agora-Client.
L1DefaultGateway = "172.20.1.1" # This value controls the default gateway IP address used by each L1 Hyper-V virtual machines that run on the Agora-Client.
L1SwitchName = "AKS-Int" # This value controls the Hyper-V internal switch name used by each L1 Hyper-V virtual machines that run on the Agora-Client.
L1NatSubnetPrefix = "172.20.1.0/24" # This value controls the network subnet used by each L1 Hyper-V virtual machines that run on the Agora-Client.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
L1VMNumVCPU = 8 # This value controls the number of vCPUs to assign to each AKS Edge Essentials host virtual machine.
InternalSwitch = "InternalSwitch" # This value controls the Hyper-V internal switch name used by L0 Azure virtual machine.
L1Username = "Administrator" # This value controls the Admin credential username for the L1 Hyper-V virtual machines that run on the Agora-Client.
L1Password = 'Agora123!!' # This value controls the Admin credential password for the L1 Hyper-V virtual machines that run on the Agora-Client.
L1Password = 'JS123!!' # This value controls the Admin credential password for the L1 Hyper-V virtual machines that run on the Agora-Client.
L1DefaultGateway = "172.20.1.1" # This value controls the default gateway IP address used by each L1 Hyper-V virtual machines that run on the Agora-Client.
L1SwitchName = "AKS-Int" # This value controls the Hyper-V internal switch name used by each L1 Hyper-V virtual machines that run on the Agora-Client.
L1NatSubnetPrefix = "172.20.1.0/24" # This value controls the network subnet used by each L1 Hyper-V virtual machines that run on the Agora-Client.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
L1VMNumVCPU = 8 # This value controls the number of vCPUs to assign to each AKS Edge Essentials host virtual machine.
InternalSwitch = "InternalSwitch" # This value controls the Hyper-V internal switch name used by L0 Azure virtual machine.
L1Username = "Administrator" # This value controls the Admin credential username for the L1 Hyper-V virtual machines that run on the Agora-Client.
L1Password = 'Agora123!!' # This value controls the Admin credential password for the L1 Hyper-V virtual machines that run on the Agora-Client.
L1Password = 'JS123!!' # This value controls the Admin credential password for the L1 Hyper-V virtual machines that run on the Agora-Client.
L1DefaultGateway = "172.20.1.1" # This value controls the default gateway IP address used by each L1 Hyper-V virtual machines that run on the Agora-Client.
L1SwitchName = "AKS-Int" # This value controls the Hyper-V internal switch name used by each L1 Hyper-V virtual machines that run on the Agora-Client.
L1NatSubnetPrefix = "172.20.1.0/24" # This value controls the network subnet used by each L1 Hyper-V virtual machines that run on the Agora-Client.
Expand Down
4 changes: 2 additions & 2 deletions azure_jumpstart_ag/artifacts/PowerShell/Modules/common.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ function Deploy-VirtualizationInfrastructure {
Invoke-Command -Session $Session -ScriptBlock {
$Action = New-ScheduledTaskAction -Execute "powershell.exe" -Argument "-ExecutionPolicy Bypass -File C:\Deployment\AKSEEBootstrap.ps1"
$Trigger = New-ScheduledTaskTrigger -AtStartup
Register-ScheduledTask -TaskName "Startup Scan" -Action $Action -Trigger $Trigger -User $Env:USERNAME -Password 'Agora123!!' -RunLevel Highest | Out-Null
Register-ScheduledTask -TaskName "Startup Scan" -Action $Action -Trigger $Trigger -User $Env:USERNAME -Password 'JS123!!' -RunLevel Highest | Out-Null
Restart-Computer -Force -Confirm:$false
} | Out-File -Append -FilePath ($AgConfig.AgDirectories["AgLogsDir"] + "\L1AKSInfra.log")
Remove-PSSession $Session | Out-File -Append -FilePath ($AgConfig.AgDirectories["AgLogsDir"] + "\L1AKSInfra.log")
Expand Down Expand Up @@ -583,7 +583,7 @@ function Deploy-ClusterSecrets {
foreach ($namespace in $AgConfig.Namespaces) {
if ($namespace -eq "contoso-supermarket" -or $namespace -eq "images-cache") {
kubectx $cluster.Name.ToLower() | Out-File -Append -FilePath ($AgConfig.AgDirectories["AgLogsDir"] + "\ClusterSecrets.log")
kubectl create secret generic postgrespw --from-literal=POSTGRES_PASSWORD='Agora123!!' --namespace $namespace | Out-File -Append -FilePath ($AgConfig.AgDirectories["AgLogsDir"] + "\ClusterSecrets.log")
kubectl create secret generic postgrespw --from-literal=POSTGRES_PASSWORD='JS123!!' --namespace $namespace | Out-File -Append -FilePath ($AgConfig.AgDirectories["AgLogsDir"] + "\ClusterSecrets.log")
kubectl create secret generic cosmoskey --from-literal=COSMOS_KEY=$cosmosDBKey --namespace $namespace | Out-File -Append -FilePath ($AgConfig.AgDirectories["AgLogsDir"] + "\ClusterSecrets.log")
kubectl create secret generic github-token --from-literal=token=$githubPat --namespace $namespace | Out-File -Append -FilePath ($AgConfig.AgDirectories["AgLogsDir"] + "\ClusterSecrets.log")
}
Expand Down
4 changes: 3 additions & 1 deletion azure_jumpstart_ag/contoso_motors/bicep/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ param scenario string = 'contoso_motors'
param k8sWorkerNodesSku string = 'Standard_D8s_v5'
//param k8sWorkerNodesSku string = deployGPUNodes ? 'Standard_NV4as_v4' : 'Standard_D8s_v5'

param deployGPUNodes bool = false
// param deployGPUNodes bool = false

var templateBaseUrl = 'https://raw.githubusercontent.com/${githubAccount}/azure_arc/${githubBranch}/azure_jumpstart_ag/'
var k3sClusterNodesCount = 2 // Number of nodes to deploy in the K3s cluster
Expand Down Expand Up @@ -149,6 +149,7 @@ module ubuntuRancherK3sDataSvcDeployment 'kubernetes/ubuntuRancher.bicep' = {
storageContainerName: toLower(k3sArcDataClusterName)
namingGuid: namingGuid
scenario: scenario
influxDBPassword: windowsAdminPassword
}
}

Expand All @@ -165,6 +166,7 @@ module ubuntuRancherK3sDeployment 'kubernetes/ubuntuRancher.bicep' = {
storageContainerName: toLower(k3sArcClusterName)
namingGuid: namingGuid
scenario: scenario
influxDBPassword: windowsAdminPassword
}
}

Expand Down
2 changes: 1 addition & 1 deletion azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ $clusters | Foreach-Object {
--auto-upgrade false `
--scope cluster `
--release-namespace arc `
--version 1.37.0 `
--version 1.38.0 `
--config Microsoft.CustomLocation.ServiceAccount=sa-bootstrapper

Write-Host "`n"
Expand Down
Loading