Skip to content

Commit 356dc69

Browse files
santhoshmprabhusanthoshmprabhu
committed
chore: move pipeline changes out
1 parent a8b4cf1 commit 356dc69

File tree

8 files changed

+36
-55
lines changed

8 files changed

+36
-55
lines changed

‎.pipelines/pipeline.yaml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -261,17 +261,6 @@ stages:
261261
k8sVersion: ""
262262
dependsOn: "containerize"
263263

264-
# Cilium Nodesubnet E2E tests
265-
- template: singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml
266-
parameters:
267-
name: "cilium_nodesubnet_e2e"
268-
displayName: Cilium NodeSubnet
269-
clusterType: nodesubnet-byocni-nokubeproxy-up
270-
clusterName: "cilndsubnete2e"
271-
vmSize: Standard_B2s
272-
k8sVersion: ""
273-
dependsOn: "containerize"
274-
275264
# Cilium Overlay E2E tests
276265
- template: singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
277266
parameters:
@@ -416,7 +405,6 @@ stages:
416405
- azure_overlay_stateless_e2e
417406
- aks_swift_e2e
418407
- cilium_e2e
419-
- cilium_nodesubnet_e2e
420408
- cilium_overlay_e2e
421409
- cilium_h_overlay_e2e
422410
- aks_ubuntu_22_linux_e2e
@@ -437,10 +425,6 @@ stages:
437425
cilium_e2e:
438426
name: cilium_e2e
439427
clusterName: "ciliume2e"
440-
region: $(REGION_AKS_CLUSTER_TEST)
441-
cilium_nodesubnet_e2e:
442-
name: cilium_nodesubnet_e2e
443-
clusterName: "cilndsubnete2e"
444428
region: $(REGION_AKS_CLUSTER_TEST)
445429
cilium_overlay_e2e:
446430
name: cilium_overlay_e2e

‎.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ stages:
7171
os: ${{ parameters.os }}
7272
datapath: true
7373
dns: true
74-
cni: cilium
7574
portforward: true
7675
service: true
76+
hostport: true
7777
dependsOn: ${{ parameters.name }}
7878

7979
- job: failedE2ELogs

‎.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-step-template.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ steps:
5757
pwd
5858
kubectl cluster-info
5959
kubectl get po -owide -A
60-
CILIUM_VERSION_TAG=${CILIUM_NODE_SUBNET_VERSION}
6160
echo "install Cilium ${CILIUM_VERSION_TAG}"
6261
export DIR=${CILIUM_VERSION_TAG%.*}
6362
echo "installing files from ${DIR}"

‎hack/aks/Makefile‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@ AZIMG = mcr.microsoft.com/azure-cli
88
AZCLI ?= docker run --rm -v $(AZCFG):/root/.azure -v $(KUBECFG):/root/.kube -v $(SSH):/root/.ssh -v $(PWD):/root/tmpsrc $(AZIMG) az
99

1010
# overrideable defaults
11-
AUTOUPGRADE ?= patch
12-
K8S_VER ?= 1.30
13-
NODE_COUNT ?= 2
14-
NODE_COUNT_WIN ?= $(NODE_COUNT)
15-
NODEUPGRADE ?= NodeImage
16-
OS ?= linux # Used to signify if you want to bring up a windows nodePool on byocni clusters
17-
OS_SKU ?= Ubuntu
18-
OS_SKU_WIN ?= Windows2022
19-
REGION ?= westus2
20-
VM_SIZE ?= Standard_B2s
21-
VM_SIZE_WIN ?= Standard_B2s
22-
KUBE_PROXY_JSON_PATH ?= ./kube-proxy.json
11+
AUTOUPGRADE ?= patch
12+
K8S_VER ?= 1.30
13+
NODE_COUNT ?= 2
14+
NODE_COUNT_WIN ?= $(NODE_COUNT)
15+
NODEUPGRADE ?= NodeImage
16+
OS ?= linux # Used to signify if you want to bring up a windows nodePool on byocni clusters
17+
OS_SKU ?= Ubuntu
18+
OS_SKU_WIN ?= Windows2022
19+
REGION ?= westus2
20+
VM_SIZE ?= Standard_B2s
21+
VM_SIZE_WIN ?= Standard_B2s
2322

2423
# overrideable variables
2524
SUB ?= $(AZURE_SUBSCRIPTION)
@@ -104,13 +103,13 @@ nodesubnet-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an NodeSubne
104103
--kubernetes-version $(K8S_VER) \
105104
--node-count $(NODE_COUNT) \
106105
--node-vm-size $(VM_SIZE) \
107-
--load-balancer-sku standard \
106+
--load-balancer-sku basic \
108107
--max-pods 250 \
109108
--network-plugin none \
110109
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
111110
--os-sku $(OS_SKU) \
112111
--no-ssh-key \
113-
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
112+
--kube-proxy-config ./kube-proxy.json \
114113
--yes
115114
@$(MAKE) set-kubeconf
116115

@@ -147,7 +146,7 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO
147146
--pod-cidr 192.168.0.0/16 \
148147
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
149148
--no-ssh-key \
150-
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
149+
--kube-proxy-config ./kube-proxy.json \
151150
--yes
152151
@$(MAKE) set-kubeconf
153152

@@ -216,7 +215,7 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus
216215
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
217216
--no-ssh-key \
218217
--os-sku $(OS_SKU) \
219-
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
218+
--kube-proxy-config ./kube-proxy.json \
220219
--yes
221220
@$(MAKE) set-kubeconf
222221

@@ -306,7 +305,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up
306305
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
307306
--no-ssh-key \
308307
--os-sku $(OS_SKU) \
309-
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
308+
--kube-proxy-config ./kube-proxy.json \
310309
--yes
311310
@$(MAKE) set-kubeconf
312311

@@ -435,7 +434,7 @@ dualstack-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up a Dualstack o
435434
--ip-families ipv4,ipv6 \
436435
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
437436
--no-ssh-key \
438-
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
437+
--kube-proxy-config ./kube-proxy.json \
439438
--yes
440439
@$(MAKE) set-kubeconf
441440

‎hack/aks/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ AKS Clusters
2424
byocni-up Alias to swift-byocni-up
2525
cilium-up Alias to swift-cilium-up
2626
up Alias to swift-up
27-
nodesubnet-byocni-nokubeproxy-up Bring up a Nodesubnet BYO CNI cluster. Does not include secondary IP configs.
2827
overlay-byocni-up Bring up a Overlay BYO CNI cluster
2928
overlay-byocni-nokubeproxy-up Bring up a Overlay BYO CNI cluster without kube-proxy
3029
overlay-cilium-up Bring up a Overlay Cilium cluster

‎test/integration/cilium-nodesubnet/ipconfigupdate.go‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,22 @@ import (
1212
"github.com/pkg/errors"
1313
)
1414

15-
func runAzCommand(params ...string) (string, error) {
15+
func runCommand(command string) (string, error) {
16+
cmd := exec.Command("bash", "-c", command)
1617
var out bytes.Buffer
1718
var stderr bytes.Buffer
19+
cmd.Stdout = &out
20+
cmd.Stderr = &stderr
1821
var err error
19-
fmt.Println("Running Azure CLI command ", strings.Join(params, " "))
2022
for i := 0; i < 3; i++ {
21-
cmd := exec.Command("az", params...)
22-
cmd.Stdout = &out
23-
cmd.Stderr = &stderr
2423
err = cmd.Run()
2524
if err == nil {
2625
break
2726
}
2827
}
2928

3029
if err != nil {
31-
return "", errors.Wrap(err, fmt.Sprintf("command failed %s", stderr.String()))
30+
return "", errors.Wrap(err, "command failed")
3231
}
3332

3433
return out.String(), nil
@@ -61,14 +60,16 @@ func main() {
6160
os.Exit(1)
6261
}
6362

64-
result, err := runAzCommand("vmss", "list", "-g", resourceGroup, "--query", "[0].name", "-o", "tsv")
63+
command := fmt.Sprintf("az vmss list -g %s --query '[0].name' -o tsv", resourceGroup)
64+
result, err := runCommand(command)
6565
if err != nil {
6666
fmt.Printf("Command failed with error: %s\n", err)
6767
os.Exit(1)
6868
}
6969
vmssName := strings.TrimSpace(result)
7070

71-
result, err = runAzCommand("vmss", "show", "-g", resourceGroup, "-n", vmssName)
71+
command = fmt.Sprintf("az vmss show -g %s -n %s", resourceGroup, vmssName)
72+
result, err = runCommand(command)
7273
if err != nil {
7374
fmt.Printf("Command failed with error: %s\n", err)
7475
os.Exit(1)
@@ -103,14 +104,8 @@ func main() {
103104
for i := 2; i <= secondaryConfigCount+1; i++ {
104105
ipConfig := make(map[string]interface{})
105106
for k, v := range primaryIPConfig {
106-
// only the primary config needs loadBalancerBackendAddressPools. Azure doesn't allow
107-
// secondary IP configs to be associated load balancer backend pools.
108-
if k == "loadBalancerBackendAddressPools" {
109-
continue
110-
}
111107
ipConfig[k] = v
112108
}
113-
114109
ipConfigName := fmt.Sprintf("ipconfig%d", i)
115110
if !contains(usedIPConfigNames, ipConfigName) {
116111
ipConfig["name"] = ipConfigName
@@ -130,13 +125,20 @@ func main() {
130125
os.Exit(1)
131126
}
132127

133-
_, err = runAzCommand("vmss", "update", "-g", resourceGroup, "-n", vmssName, "--set", fmt.Sprintf("virtualMachineProfile.networkProfile=%s", networkProfileJSON))
128+
escapedNetworkProfileJSON := strings.ReplaceAll(string(networkProfileJSON), `\`, `\\`)
129+
escapedNetworkProfileJSON = strings.ReplaceAll(escapedNetworkProfileJSON, `'`, `\'`)
130+
131+
command = fmt.Sprintf("az vmss update -g %s -n %s --set virtualMachineProfile.networkProfile='%s'", resourceGroup, vmssName, escapedNetworkProfileJSON)
132+
fmt.Println("Command to update VMSS: ", command)
133+
_, err = runCommand(command)
134134
if err != nil {
135135
fmt.Printf("Command failed with error: %s\n", err)
136136
os.Exit(1)
137137
}
138138

139-
_, err = runAzCommand("vmss", "update-instances", "-g", resourceGroup, "-n", vmssName, "--instance-ids", "*")
139+
command = fmt.Sprintf("az vmss update-instances -g %s -n %s --instance-ids '*'", resourceGroup, vmssName)
140+
fmt.Println("Command to update VMSS instances: ", command)
141+
_, err = runCommand(command)
140142
if err != nil {
141143
fmt.Printf("Command failed with error: %s\n", err)
142144
os.Exit(1)

‎test/integration/manifests/ip-masq-agent/config-custom.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@ data:
1313
- 192.168.0.0/16
1414
- 100.64.0.0/10
1515
- 10.244.0.0/16
16-
- 10.10.0.0/16
1716
masqLinkLocal: false
1817
masqLinkLocalIPv6: true

‎test/integration/manifests/ip-masq-agent/config-reconcile.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ data:
1111
- 192.168.0.0/16
1212
- 100.64.0.0/10
1313
- 10.244.0.0/16
14-
- 10.10.0.0/16
1514
masqLinkLocal: true

0 commit comments

Comments
 (0)