Skip to content

Commit 1b5420a

Browse files
camrynlrbtr
andauthored
Add cilium connectivity tests (#1565)
* cilium connectivity tests * skip 2 failing tests * skip 2 failing tests * skip deploy cilium-cni, update cilium helm vals * update setup_test Co-authored-by: Evan Baker <[email protected]>
1 parent 6864596 commit 1b5420a

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,19 @@ steps:
5454
name: "installCilium"
5555
displayName: "Install Cilium"
5656
57+
- script: |
58+
echo "install cilium CLI"
59+
CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/master/stable.txt)
60+
CLI_ARCH=amd64
61+
if [ "$(uname -m)" = "aarch64" ]; then CLI_ARCH=arm64; fi
62+
curl -L --fail --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${CILIUM_CLI_VERSION}/cilium-linux-${CLI_ARCH}.tar.gz{,.sha256sum}
63+
sha256sum --check cilium-linux-${CLI_ARCH}.tar.gz.sha256sum
64+
sudo tar xzvfC cilium-linux-${CLI_ARCH}.tar.gz /usr/local/bin
65+
rm cilium-linux-${CLI_ARCH}.tar.gz{,.sha256sum}
66+
cilium status
67+
name: "installCiliumCLI"
68+
displayName: "Install Cilium CLI"
69+
5770
- script: |
5871
echo "install kubetest2 and gsutils"
5972
go get github.com/onsi/ginkgo/ginkgo
@@ -102,6 +115,13 @@ steps:
102115
name: "servicesConformance"
103116
displayName: "Run Services Conformance Tests"
104117
118+
- script: |
119+
echo "Run Cilium Connectivity Tests"
120+
cilium status
121+
cilium connectivity test
122+
name: "ciliumConnectivityTests"
123+
displayName: "Run Cilium Connectivity Tests"
124+
105125
- script: |
106126
ARTIFACT_DIR=$(Build.ArtifactStagingDirectory)/test-output/
107127
echo $ARTIFACT_DIR

cilium/cilium_helm_values.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,10 @@ extraArgs:
2727
ipv4NativeRoutingCIDR: 10.241.0.0/16
2828
enableIPv4Masquerade: false
2929
install-no-conntrack-iptables-rules: false
30-
installIptablesRules: false
30+
installIptablesRules: true
3131
l7Proxy: false
3232
hubble:
3333
enabled: false
34-
l2NeighDiscovery:
35-
enabled: false
3634
kubeProxyReplacement: strict
3735

3836
endpointHealthChecking:
@@ -41,4 +39,3 @@ endpointHealthChecking:
4139
cni:
4240
install: true
4341
customConf: true
44-
configMap: cni-configuration

test/integration/setup_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func installCNSDaemonset(ctx context.Context, clientset *kubernetes.Clientset, l
119119
log.Printf("Env %v set to true, deploy azure-ipam and cilium-cni", envInstallAzilium)
120120
initImage, _ := parseImageString(cns.Spec.Template.Spec.InitContainers[0].Image)
121121
cns.Spec.Template.Spec.InitContainers[0].Image = getImageString(initImage, cniDropgzVersion)
122-
cns.Spec.Template.Spec.InitContainers[0].Args = []string{"deploy", "azure-ipam", "-o", "/opt/cni/bin/azure-ipam", "azilium.conflist", "-o", "/etc/cni/net.d/05-cilium.conflist", "cilium-cni", "-o", "/opt/cni/bin/cilium-cni"}
122+
cns.Spec.Template.Spec.InitContainers[0].Args = []string{"deploy", "azure-ipam", "-o", "/opt/cni/bin/azure-ipam", "azilium.conflist", "-o", "/etc/cni/net.d/05-cilium.conflist"}
123123
}
124124
} else {
125125
log.Printf("Env %v not set to true, skipping", envInstallAzilium)

0 commit comments

Comments
 (0)