Skip to content

Commit d9e5fd5

Browse files
committed
test ebpf podsubnet
1 parent 893e2ca commit d9e5fd5

File tree

5 files changed

+725
-2
lines changed

5 files changed

+725
-2
lines changed

.pipelines/pipeline.yaml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,18 @@ stages:
278278
vmSize: Standard_B2ms
279279
k8sVersion: ""
280280
dependsOn: ["test"]
281+
282+
# Cilium EBPF Podsubnet E2E tests
283+
- template: singletenancy/cilium-ebpf/cilium-e2e-job-template.yaml
284+
parameters:
285+
name: "cilium_ebpf_podsubnet_e2e"
286+
displayName: Cilium EBPF Podsubnet Azure Linux
287+
clusterType: swift-byocni-nokubeproxy-up
288+
clusterName: "cilbpfpode2e"
289+
vmSize: Standard_B2ms
290+
k8sVersion: ""
291+
dependsOn: ["test"]
281292

282-
283293
# Cilium Nodesubnet E2E tests
284294
- template: singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml
285295
parameters:
@@ -318,7 +328,7 @@ stages:
318328
- template: singletenancy/cilium-overlay-ebpf/cilium-overlay-e2e-job-template.yaml
319329
parameters:
320330
name: "cilium_ebpf_overlay_e2e"
321-
displayName: Cilium EBPF on AKS Overlay
331+
displayName: Cilium EBPF on AKS Overlay Azure Linux
322332
clusterType: overlay-byocni-nokubeproxy-up
323333
clusterName: "cilbpfovere2e"
324334
vmSize: Standard_B2ms
@@ -458,6 +468,7 @@ stages:
458468
- aks_swift_e2e
459469
- cilium_e2e
460470
- cilium_vnetscale_e2e
471+
- cilium_ebpf_podsubnet_e2e
461472
- cilium_nodesubnet_e2e
462473
- cilium_overlay_e2e
463474
- cilium_ebpf_overlay_e2e
@@ -485,6 +496,10 @@ stages:
485496
name: cilium_vnetscale_e2e
486497
clusterName: "ciliumvscalee2e"
487498
region: $(REGION_AKS_CLUSTER_TEST)
499+
cilium_ebpf_podsubnet_e2e:
500+
name: cilium_ebpf_podsubnet_e2e
501+
clusterName: "cilbpfpode2e"
502+
region: $(REGION_AKS_CLUSTER_TEST)
488503
cilium_nodesubnet_e2e:
489504
name: cilium_nodesubnet_e2e
490505
clusterName: "cilndsubnete2e"

hack/aks/deploy.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ deploy-ebpf-overlay-cilium: deploy-common-ebpf-cilium
3434
| kubectl apply -f -
3535
@$(MAKE) wait-for-cilium
3636

37+
deploy-ebpf-podsubnet-cilium: deploy-common-ebpf-cilium
38+
@kubectl apply -f ../../test/integration/manifests/cilium/v$(EBPF_CILIUM_DIR)/ebpf/podsubnet/static/
39+
CILIUM_VERSION_TAG=$(EBPF_CILIUM_VERSION_TAG) CILIUM_IMAGE_REGISTRY=$(EBPF_CILIUM_IMAGE_REGISTRY) \
40+
envsubst '$${CILIUM_VERSION_TAG},$${CILIUM_IMAGE_REGISTRY},$${IPV6_HP_BPF_VERSION},$${AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY},$${AZURE_IPTABLES_MONITOR_TAG},$${AZURE_IP_MASQ_MERGER_IMAGE_REGISTRY},$${AZURE_IP_MASQ_MERGER_TAG}' < \
41+
../../test/integration/manifests/cilium/v$(EBPF_CILIUM_DIR)/ebpf/podsubnet/cilium.yaml \
42+
| kubectl apply -f -
43+
@$(MAKE) wait-for-cilium
44+
3745
wait-for-cilium:
3846
@kubectl rollout status deployment/cilium-operator -n kube-system --timeout=300s
3947
@kubectl rollout status daemonset/cilium -n kube-system --timeout=300s

0 commit comments

Comments
 (0)