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

revert: makefile naming for cluster creation #2214

Merged
merged 2 commits into from
Sep 13, 2023
Merged

revert: makefile naming for cluster creation #2214

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
8302f5d
revert: cilium naming
jpayne3506 Sep 12, 2023
ee3ca44
Addressing Comments
jpayne3506 Sep 13, 2023
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 .pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
dependsOn: ""
name: "cilium"
clusterType: "cilium-overlay-up"
clusterType: "overlay-byocni-nokubeproxy-up"
clusterName: "cilium-overlay"
nodeCount: 10
vmSize: "Standard_DS4_v2"
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/cni/cilium/nightly-release-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ stages:
parameters:
name: cilium_overlay_nightly
displayName: Cilium on AKS Overlay
clusterType: cilium-overlay-up
clusterType: overlay-byocni-nokubeproxy-up
clusterName: ciliumnightly-$(commitID)
vmSize: Standard_B2ms
k8sVersion: ""
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/cni/pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ stages:
- template: cilium/cilium-overlay-load-test-template.yaml
parameters:
name: cilium
clusterType: cilium-overlay-up
clusterType: overlay-byocni-nokubeproxy-up
clusterName: "cilium-overlay"
nodeCount: ${CILIUM_NODE_COUNT}
vmSize: "Standard_DS4_v2"
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ stages:
name: "cilium_e2e"
displayName: Cilium
testDropgz: ""
clusterType: cilium-podsubnet-up
clusterType: swift-byocni-nokubeproxy-up
clusterName: "ciliume2e"
vmSize: Standard_B2ms
k8sVersion: ""
Expand All @@ -327,7 +327,7 @@ stages:
name: "cilium_overlay_cilium_e2e"
displayName: Cilium on AKS Overlay
testDropgz: ""
clusterType: cilium-overlay-up
clusterType: overlay-byocni-nokubeproxy-up
clusterName: "overlaye2e"
vmSize: Standard_B2ms
k8sVersion: ""
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/submodules-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ stages:
name: "cilium_e2e"
displayName: Cilium
testDropgz: true
clusterType: cilium-podsubnet-up
clusterType: swift-byocni-nokubeproxy-up
clusterName: "submodciliume2e"
vmSize: Standard_B2ms
k8sVersion: ""
Expand All @@ -280,7 +280,7 @@ stages:
name: "cilium_overlay_e2e"
displayName: Cilium on AKS Overlay
testDropgz: true
clusterType: cilium-overlay-up
clusterType: overlay-byocni-nokubeproxy-up
clusterName: "submodoverlaye2e"
vmSize: Standard_B2ms
k8sVersion: ""
Expand Down
47 changes: 23 additions & 24 deletions hack/aks/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,98 +99,97 @@ overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster
--yes
@$(MAKE) set-kubeconf

overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster
overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--network-plugin azure \
--network-dataplane cilium \
--network-plugin none \
--network-plugin-mode overlay \
--pod-cidr 192.168.0.0/16 \
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
--no-ssh-key \
--kube-proxy-config ./kube-proxy.json \
--yes
@$(MAKE) set-kubeconf

overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster
overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--network-plugin azure \
--network-dataplane cilium \
--network-plugin-mode overlay \
--pod-cidr 192.168.0.0/16 \
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
--no-ssh-key \
--yes
@$(MAKE) set-kubeconf

swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster
overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--network-plugin none \
--network-plugin azure \
--network-plugin-mode overlay \
--pod-cidr 192.168.0.0/16 \
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
--no-ssh-key \
--os-sku $(OS_SKU) \
--yes
@$(MAKE) set-kubeconf


swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster
swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--network-plugin azure \
--network-dataplane cilium \
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \
--network-plugin none \
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
--no-ssh-key \
--os-sku $(OS_SKU) \
--yes
@$(MAKE) set-kubeconf

swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster
swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--network-plugin azure \
--network-plugin none \
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
--no-ssh-key \
--os-sku $(OS_SKU) \
--kube-proxy-config ./kube-proxy.json \
--yes
@$(MAKE) set-kubeconf

cilium-overlay-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy for Cilium
swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--network-plugin none \
--network-plugin-mode overlay \
--pod-cidr 192.168.0.0/16 \
--network-plugin azure \
--network-dataplane cilium \
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
--no-ssh-key \
--kube-proxy-config ./kube-proxy.json \
--yes
@$(MAKE) set-kubeconf

cilium-podsubnet-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy for Cilium
swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--network-plugin none \
--network-plugin azure \
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
--no-ssh-key \
--os-sku $(OS_SKU) \
--kube-proxy-config ./kube-proxy.json \
--yes
@$(MAKE) set-kubeconf

Expand Down
32 changes: 16 additions & 16 deletions hack/aks/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@ SWIFT Infra
net-up Create required swift vnet/subnets

AKS Clusters
byocni-up Alias to swift-byocni-up
cilium-up Alias to swift-cilium-up
up Alias to swift-up
overlay-byocni-up Bring up a Overlay BYO CNI cluster
overlay-cilium-up Bring up a Overlay Cilium cluster
overlay-up Bring up a Overlay AzCNI cluster
swift-byocni-up Bring up a SWIFT BYO CNI cluster
swift-cilium-up Bring up a SWIFT Cilium cluster
swift-up Bring up a SWIFT AzCNI cluster
cilium-overlay-up Bring up a Overlay BYO CNI cluster without kube-proxy for Cilium
cilium-podsubnet-up Bring up a SWIFT BYO CNI cluster without kube-proxy for Cilium
windows-cniv1-up Bring up a Windows AzCNIv1 cluster
linux-cniv1-up Bring up a Linux AzCNIv1 cluster
dualstack-overlay-byocni-up Bring up an dualstack overlay cluster without CNS and CNI installed
down Delete the cluster
vmss-restart Restart the nodes of the cluster
byocni-up Alias to swift-byocni-up
cilium-up Alias to swift-cilium-up
up Alias to swift-up
overlay-byocni-up Bring up a Overlay BYO CNI cluster
overlay-byocni-nokubeproxy-up Bring up a Overlay BYO CNI cluster without kube-proxy
overlay-cilium-up Bring up a Overlay Cilium cluster
overlay-up Bring up a Overlay AzCNI cluster
swift-byocni-up Bring up a SWIFT BYO CNI cluster
swift-byocni-nokubeproxy-up Bring up a SWIFT BYO CNI cluster without kube-proxy
swift-cilium-up Bring up a SWIFT Cilium cluster
swift-up Bring up a SWIFT AzCNI cluster
windows-cniv1-up Bring up a Windows AzCNIv1 cluster
linux-cniv1-up Bring up a Linux AzCNIv1 cluster
dualstack-overlay-byocni-up Bring up an dualstack overlay cluster without CNS and CNI installed
down Delete the cluster
vmss-restart Restart the nodes of the cluster
```