Skip to content

Commit bc4fed1

Browse files
QxBytesQxBytes
committed
add windows node template first pass
1 parent 2f246d1 commit bc4fed1

File tree

4 files changed

+61
-80
lines changed

4 files changed

+61
-80
lines changed

‎.pipelines/singletenancy/azure-cni-overlay-stateless/azure-cni-overlay-stateless-e2e-job-template.yaml‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,31 +28,11 @@ stages:
2828
k8sVersion: ${{ parameters.k8sVersion }}
2929
dependsOn: ${{ parameters.dependsOn }}
3030
region: $(REGION_AKS_CLUSTER_TEST)
31-
- job: windows_nodepool
32-
displayName: Add Windows Nodepool
33-
dependsOn: ${{ parameters.name }}
34-
pool:
35-
name: $(BUILD_POOL_NAME_DEFAULT)
36-
demands:
37-
- agent.os -equals Linux
38-
- Role -equals $(CUSTOM_E2E_ROLE)
39-
steps:
40-
- task: AzureCLI@2
41-
inputs:
42-
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
43-
scriptLocation: "inlineScript"
44-
scriptType: "bash"
45-
addSpnToEnvironment: true
46-
inlineScript: |
47-
set -e
48-
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
49-
make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}-$(commitID) VM_SIZE_WIN=${{ parameters.vmSize }}
50-
echo "Windows node are successfully added to v4 Overlay Cluster"
51-
kubectl cluster-info
52-
kubectl get node -owide
53-
kubectl get po -owide -A
54-
name: "Add_Windows_Node"
55-
displayName: "Add windows node on v4 overlay cluster"
31+
- template: ../../templates/add-windows-nodepool-job.yaml
32+
parameters:
33+
depend: ${{ parameters.name }}
34+
clusterName: ${{ parameters.clusterName }}-$(commitID)
35+
vmSize: ${{ parameters.vmSize }}
5636

5737
- stage: ${{ parameters.name }}
5838
displayName: E2E - ${{ parameters.displayName }}

‎.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml‎

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,34 +58,11 @@ stages:
5858
clusterName: ${{ parameters.clusterName }}-$(commitID)
5959
os: linux
6060
scaleup: 100
61-
62-
- job: windows_nodepool
63-
displayName: Add Windows Nodepool
64-
dependsOn: ${{ parameters.name }}_linux
65-
pool:
66-
name: $(BUILD_POOL_NAME_DEFAULT)
67-
demands:
68-
- agent.os -equals Linux
69-
- Role -equals $(CUSTOM_E2E_ROLE)
70-
steps:
71-
- task: AzureCLI@2
72-
inputs:
73-
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
74-
scriptLocation: "inlineScript"
75-
scriptType: "bash"
76-
addSpnToEnvironment: true
77-
inlineScript: |
78-
set -e
79-
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
80-
make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}-$(commitID) VM_SIZE_WIN=${{ parameters.vmSize }}
81-
echo "Windows node are successfully added to v4 Overlay Cluster"
82-
kubectl cluster-info
83-
kubectl get node -owide
84-
kubectl get po -owide -A
85-
name: "Add_Windows_Node"
86-
displayName: "Add windows node on v4 overlay cluster"
87-
88-
61+
- template: ../../templates/add-windows-nodepool-job.yaml
62+
parameters:
63+
depend: ${{ parameters.name }}_linux
64+
clusterName: ${{ parameters.clusterName }}-$(commitID)
65+
vmSize: ${{ parameters.vmSize }}
8966
- job: ${{ parameters.name }}_windows
9067
displayName: Azure CNI Overlay Test Suite | Windows - (${{ parameters.name }})
9168
timeoutInMinutes: 120

‎.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -59,33 +59,11 @@ stages:
5959
clusterName: ${{ parameters.clusterName }}-$(commitID)
6060
os: linux
6161
scaleup: 100
62-
63-
- job: windows_nodepool
64-
displayName: Add Windows Nodepool
65-
dependsOn: ${{ parameters.name }}_linux
66-
pool:
67-
name: $(BUILD_POOL_NAME_DEFAULT)
68-
demands:
69-
- agent.os -equals Linux
70-
- Role -equals $(CUSTOM_E2E_ROLE)
71-
steps:
72-
- task: AzureCLI@2
73-
inputs:
74-
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
75-
scriptLocation: "inlineScript"
76-
scriptType: "bash"
77-
addSpnToEnvironment: true
78-
inlineScript: |
79-
set -e
80-
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
81-
make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}-$(commitID) VM_SIZE_WIN=${{ parameters.vmSize }}
82-
echo "Windows nodes have been successfully added to DualStack Overlay Cluster"
83-
kubectl cluster-info
84-
kubectl get node -owide
85-
kubectl get po -owide -A
86-
name: "Add_Windows_Node"
87-
displayName: "Add windows node"
88-
62+
- template: ../../templates/add-windows-nodepool-job.yaml
63+
parameters:
64+
depend: ${{ parameters.name }}_linux
65+
clusterName: ${{ parameters.clusterName }}-$(commitID)
66+
vmSize: "Standard_D2_v3"
8967
- job: ${{ parameters.name }}_windows
9068
displayName: DualStack Overlay Test Suite | Windows - (${{ parameters.name }})
9169
timeoutInMinutes: 120

‎.pipelines/templates/add-windows-nodepool-job.yaml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
parameters:
2+
depend: ""
3+
clusterName: "" # unique identifier
4+
vmSize: ""
5+
retryCount: 5
6+
7+
jobs:
8+
- job: windows_nodepool
9+
displayName: Add Windows Nodepool
10+
dependsOn: ${{ parameters.depend }}
11+
pool:
12+
name: $(BUILD_POOL_NAME_DEFAULT)
13+
demands:
14+
- agent.os -equals Linux
15+
- Role -equals $(CUSTOM_E2E_ROLE)
16+
steps:
17+
- task: AzureCLI@2
18+
inputs:
19+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
20+
scriptLocation: "inlineScript"
21+
scriptType: "bash"
22+
addSpnToEnvironment: true
23+
inlineScript: |
24+
set -e
25+
26+
windows_nodepool=$(az aks nodepool list \
27+
--resource-group ${{ parameters.clusterName }} \
28+
--cluster-name ${{ parameters.clusterName }} \
29+
--query "[?osType=='Windows']" \
30+
--output tsv)
31+
32+
if [ -z "$windows_nodepool" ]; then
33+
echo "No Windows node pool found in the AKS cluster."
34+
35+
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
36+
make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }} VM_SIZE_WIN=${{ parameters.vmSize }}
37+
echo "Windows node was successfully added to v4 Overlay Cluster"
38+
kubectl cluster-info
39+
kubectl get node -owide
40+
kubectl get po -owide -A
41+
else
42+
echo "Windows node pool already exists in the AKS cluster."
43+
fi
44+
name: "Add_Windows_Node"
45+
displayName: "Add windows node on v4 overlay cluster"
46+
retryCountOnTaskFailure: ${{ parameters.retryCount }}

0 commit comments

Comments
 (0)