Skip to content

refactor: drop wireguard support #32

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

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

refactor: drop wireguard support #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
998a13e
refactor: drop wireguard references
bcho Mar 5, 2026
d4458da
refactor: remove wireguard references in cli
bcho Mar 5, 2026
ed5cee5
refactor: drop wireguard from karpenter
bcho Mar 5, 2026
f1894b4
doc: remove wireguard mentions from doc
bcho Mar 5, 2026
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
2 changes: 1 addition & 1 deletion cli/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $ aks-flex-cli network deploy
## Initializing AKS Cluster

```
$ aks-flex-cli aks deploy --cilium --wireguard
$ aks-flex-cli aks deploy --cilium
```

## Initializing Remote Cloud Network
Expand Down
2 changes: 1 addition & 1 deletion cli/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ require (
github.com/Azure/aks-flex/plugin v0.0.0-00010101000000-000000000000
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v8 v8.0.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v2 v2.1.0
github.com/joho/godotenv v1.5.1
github.com/nebius/gosdk v0.0.0-20260218100913-7fb27c45819a
Expand All @@ -27,6 +26,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v7 v7.3.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v8 v8.2.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v8 v8.0.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
github.com/aws/aws-sdk-go-v2 v1.41.1 // indirect
github.com/aws/aws-sdk-go-v2/config v1.32.9 // indirect
Expand Down
94 changes: 0 additions & 94 deletions cli/internal/aks/deploy/assets/aks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
"type": "string",
"defaultValue": "Standard_D16ds_v5"
},
"deployWireguard": {
"type": "bool",
"defaultValue": false
},
"deployUnboundedCNI": {
"type": "bool",
"defaultValue": false
Expand Down Expand Up @@ -171,81 +167,6 @@
"[variables('karpenterMIId')]"
]
},
{
"condition": "[parameters('deployWireguard')]",
"apiVersion": "2023-09-01",
"type": "Microsoft.Network/networkSecurityGroups/securityRules",
"name": "nsg/AllowWireGuard",
"properties": {
"priority": 100,
"direction": "Inbound",
"access": "Allow",
"protocol": "Udp",
"sourcePortRange": "*",
"destinationPortRange": "51820",
"sourceAddressPrefix": "*",
"destinationAddressPrefix": "*"
}
},
{
"condition": "[parameters('deployWireguard')]",
"apiVersion": "2023-09-01",
"type": "Microsoft.Network/publicIPPrefixes",
"name": "wg-pips",
"location": "[resourceGroup().location]",
"sku": {
"name": "Standard"
},
"properties": {
"prefixLength": 31,
"publicIPAddressVersion": "IPv4"
}
},
{
"condition": "[parameters('deployWireguard')]",
"apiVersion": "2025-10-01",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "[concat(parameters('clusterName'), '/wireguard')]",
"properties": {
"count": 1,
"vmSize": "[parameters('gatewayVMSize')]",
"mode": "User",
"osType": "Linux",
"vnetSubnetId": "[resourceId('Microsoft.Network/virtualNetworks/subnets', 'vnet', 'nodes')]",
"enableNodePublicIP": true,
"nodePublicIPPrefixID": "[resourceId('Microsoft.Network/publicIPPrefixes', 'wg-pips')]",
"networkProfile": {
"allowedHostPorts": [
{
"portStart": 51820,
"portEnd": 51820,
"protocol": "UDP"
}
]
},
"nodeLabels": {
"stretch.azure.com/wireguard-gateway": "true",
"stretch.azure.com/wireguard-hub": "true"
},
"nodeTaints": [
"stretch.azure.com/wireguard-gateway=true:NoSchedule"
]
},
"dependsOn": [
"[resourceId('Microsoft.ContainerService/managedClusters', parameters('clusterName'))]",
"[resourceId('Microsoft.Network/publicIPPrefixes', 'wg-pips')]"
]
},
{
"condition": "[parameters('deployWireguard')]",
"apiVersion": "2023-09-01",
"type": "Microsoft.Network/routeTables",
"name": "wg-routes",
"location": "[resourceGroup().location]",
"properties": {
"routes": []
}
},
{
"condition": "[parameters('deployUnboundedCNI')]",
"apiVersion": "2023-09-01",
Expand Down Expand Up @@ -321,21 +242,6 @@
"oidcIssuerUrl": {
"type": "string",
"value": "[reference(variables('aksClusterId'), '2024-01-01').oidcIssuerProfile.issuerUrl]"
},
"nodePoolName": {
"condition": "[parameters('deployWireguard')]",
"type": "string",
"value": "wireguard"
},
"publicIpPrefixId": {
"condition": "[parameters('deployWireguard')]",
"type": "string",
"value": "[resourceId('Microsoft.Network/publicIPPrefixes', 'wg-pips')]"
},
"routeTableId": {
"condition": "[parameters('deployWireguard')]",
"type": "string",
"value": "[resourceId('Microsoft.Network/routeTables', 'wg-routes')]"
}
}
}
125 changes: 0 additions & 125 deletions cli/internal/aks/deploy/assets/wireguard-deployment.yaml
View file
Open in desktop

This file was deleted.

20 changes: 1 addition & 19 deletions cli/internal/aks/deploy/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ var (
if deploycilium {
return fmt.Errorf("--cilium cannot be used with --unbounded-cni")
}
if deployWireguard {
return fmt.Errorf("--wireguard cannot be used with --unbounded-cni")
}
}
return nil
},
Expand All @@ -39,7 +36,6 @@ var (
}

deploycilium bool
deployWireguard bool
unboundedCNI bool
deployGPUOperator bool
deployGPUDevicePlugin bool
Expand All @@ -52,8 +48,7 @@ var (

func init() {
Command.Flags().BoolVar(&deploycilium, "cilium", false, "deploy Cilium CNI") // default to true to allow minimal networking to work
Command.Flags().BoolVar(&deployWireguard, "wireguard", false, "deploy WireGuard gateway node pool and DaemonSet")
Command.Flags().BoolVar(&unboundedCNI, "unbounded-cni", false, "deploy unbounded cni (mutually exclusive with --cilium and --wireguard)")
Command.Flags().BoolVar(&unboundedCNI, "unbounded-cni", false, "deploy unbounded cni (mutually exclusive with --cilium)")
Command.Flags().BoolVar(&deployGPUOperator, "gpu-operator", false, "install NVIDIA GPU Operator via Helm")
Command.Flags().BoolVar(&deployGPUDevicePlugin, "gpu-device-plugin", false, "install NVIDIA GPU Device Plugin via Helm")
Command.Flags().BoolVar(&skipARM, "skip-arm", false, "skip the ARM template deployment step")
Expand Down Expand Up @@ -116,12 +111,6 @@ func run(ctx context.Context) error {
"vmSize": {
Value: cfg.SystemVMSize,
},
"gatewayVMSize": {
Value: cfg.GatewayVMSize,
},
"deployWireguard": {
Value: deployWireguard,
},
"deployUnboundedCNI": {
Value: unboundedCNI,
},
Expand Down Expand Up @@ -150,13 +139,6 @@ func run(ctx context.Context) error {
log.Printf("Cilium deployment complete")
}

if deployWireguard {
if err := deployWireGuard(ctx, credentials, cfg); err != nil {
return err
}
log.Printf("WireGuard deployment complete")
}

if unboundedCNI {
if err := unboundedcni.Deploy(ctx, kubeconfigPath, cfg); err != nil {
return err
Expand Down
Loading