Skip to content

Azure Arc-enabled Kubernetes MicroHack: comprehensive fixes and improvements#338

Merged
ASchwarz1984 merged 76 commits intomicrosoft:mainfrom
skiddder:main
Apr 20, 2026
Merged

Azure Arc-enabled Kubernetes MicroHack: comprehensive fixes and improvements#338
ASchwarz1984 merged 76 commits intomicrosoft:mainfrom
skiddder:main

Conversation

@skiddder
Copy link
Copy Markdown
Contributor

@skiddder skiddder commented Apr 20, 2026

Summary

Comprehensive updates to the Azure Arc-enabled Kubernetes MicroHack (03_Hybrid_Azure_Arc_Kubernetes).

Changes

Infrastructure & Lab Environment

  • Add Windows 11 workstation VM, Azure Bastion, and Ansible provisioning
  • Add explicit NSG rules for node communication
  • Replace public IP addresses with private IPs (SSH tunnel approach)
  • Fix Terraform destroy issue for shut-down VMs
  • Fix naming conventions and cleanup script for manually created resources
  • Fix user_number extraction logic to handle various username patterns

Challenges & Walkthroughs

  • Validate solution steps use correct resource names consistently
  • Fix links between challenges and solutions
  • Fix spelling and description issues across challenges
  • Update challenge 3 content
  • Add team1 namespace configuration (challenge 5)

General

  • Arc Gateway is now GA and supports arc-enabled Kubernetes
  • Fix Helm deployment without LoadBalancer
  • Fix Ansible playbook issues and trailing \r characters
  • Fix regex for general usernames

Fixes #2, #4, #5

skiddder added 30 commits September 25, 2025 10:12
initial
f348ff8
instructions for environment setup
a263798
added required parameter
6655612
added connection description
cb491e0
rework gitops
5de15cb
rework gitops
0675294
testing gitops
f7f041c
gitops testing deletion of ns
8ea201d
added files for hello-world app
c045690
added namespace hello-world
44479a9
added namespace to yaml files
f3f5bcd
added image-automation
384ee85
divers
4a97e96
Merge remote-tracking branch 'upstream/main'
4cc7af8 
merging upstream changes into working fork for arc-enabled kubernetes
ch1
d439a06
ch1
aeb88e3
ch1
9ff5159
ch1
200cefe
rework env setup
71752a5
reworked env setup
66a08c9
renamed so terraform ignores the template
827f91e
env setup desc
07fccb7
ch1
6a1e658
removed sub-id
95c9b85
ch2 - desc
28155d3
added network validation scripts
eae3728 
updated to supported k8s version
removed regional endpoint as it provides false positives
c1782d1
fix connectivity check synopsis
0697861 
added challenges in content table
test
a6dcbb3
ch-2
3d3def2
skiddder and others added 28 commits February 2, 2026 15:34
cleaning up after gitops test
90ba4f7
shutdown schedule for k3s nodes
284baf5 
tags to avoid SSH port closure
updated setup read.me
scp syntax fix
parameterized hardcoded admin name
b95c225 
fixed logic to test for az cli extensions
fixed links
added workaround for cli bug in k8s policy assignment
removed test namespace
6529e47
changed folder name
da45885
removed invalid folder name
48fdcff
added Lars to contributors
a99188a
Change challenge 3
d220e7e
spelling mistake
8eac281
spelling changes
1d681d1
cleansed description
2038165
Merge branch 'main' of https://github.com/skiddder/MicroHack
858da01
fixed regex for user_number extraction to also match different userna…
b064617 
…me patterns
Merge branch 'main' of https://github.com/skiddder/MicroHack
b0b8ec2
fixed regex to work with general user names.
dd5a9f2 
fix for helm deployment without loadbalancer
added openwebui portal
c8165f1
Merge branch 'main' of https://github.com/microsoft/MicroHack
4f59118
Remove unintended files from PR
71f5a4e
arc gateway is now GA and also supporting arc-enabled k8s
a97ffbd
@skiddder
Add team1 namespace configuration
4cccfe4 
mhdemo
fixed naming convention
89fbced 
added cleanup script for manually created resources
fixed terraform destroy issue for shut-down vms
Fix user_number extraction logic
5eefc2e 
Fixes #5
Add Windows 11 workstation VM, Azure Bastion, and Ansible provisioning
77d6a2c 
- Terraform: Windows 11 Pro VM per participant with WinRM for Ansible
- Terraform: Central Azure Bastion (Standard SKU) with VNet peering to all participant VNets
- Ansible: Playbook to install Git, VS Code, WSL2 (via Chocolatey), Ubuntu, Azure CLI, kubectl, Helm
- Ansible: Auto-generated inventory and Bastion tunnel helper script
- NSGs: RDP/WinRM restricted to Bastion subnet, SSH/K3s API restricted to VirtualNetwork
- Updated readme with architecture, deployment steps, and security notes
- start_here.sh: Auto-create provider.tf from template if missing

Closes #3
validated
7ddb09a 
- solution steps use correct resource names consistantly. Fixes #2
- links between challenges and solutions work. Fixes #4
- added explicit rules for node communication
5c1ebb1 
- fixed ansible pb issues
- fixed trailing \r
fixes to work with private ip address and ssh tunnel
4a25190
- fixes deployment parameters
80f4a0d 
- replaces public with private ip addresses
Merge remote-tracking branch 'upstream/main'
601628f 
# Conflicts:
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/Readme.md
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-01.md
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-02.md
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-03.md
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-04.md
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-05.md
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/lab/k3s-master-setup.sh
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/lab/k3s-worker-setup.sh
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/lab/k8s-cluster.tf
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/lab/provider-template.txt
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/lab/readme.md
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/lab/start_here.sh
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/lab/variables.tf
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-01/az_connect_k8s.sh
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-01/solution.md
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-02/solution.md
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-03/solution.md
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-04/solution.md
#	03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-05/solution.md
ASchwarz1984
ASchwarz1984 approved these changes Apr 20, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@ASchwarz1984 ASchwarz1984 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx

@ASchwarz1984 ASchwarz1984 merged commit 6f38cc0 into microsoft:main Apr 20, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ASchwarz1984 ASchwarz1984 ASchwarz1984 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@skiddder @ASchwarz1984