Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions .pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,19 @@ steps:
name: "installCilium"
displayName: "Install Cilium"

- script: |
echo "install cilium CLI"
CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/master/stable.txt)
CLI_ARCH=amd64
if [ "$(uname -m)" = "aarch64" ]; then CLI_ARCH=arm64; fi
curl -L --fail --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${CILIUM_CLI_VERSION}/cilium-linux-${CLI_ARCH}.tar.gz{,.sha256sum}
sha256sum --check cilium-linux-${CLI_ARCH}.tar.gz.sha256sum
sudo tar xzvfC cilium-linux-${CLI_ARCH}.tar.gz /usr/local/bin
rm cilium-linux-${CLI_ARCH}.tar.gz{,.sha256sum}
cilium status
name: "installCiliumCLI"
displayName: "Install Cilium CLI"

- script: |
echo "install kubetest2 and gsutils"
go get github.com/onsi/ginkgo/ginkgo
Expand Down Expand Up @@ -102,6 +115,13 @@ steps:
name: "servicesConformance"
displayName: "Run Services Conformance Tests"

- script: |
echo "Run Cilium Connectivity Tests"
cilium status
cilium connectivity test
name: "ciliumConnectivityTests"
displayName: "Run Cilium Connectivity Tests"

- script: |
ARTIFACT_DIR=$(Build.ArtifactStagingDirectory)/test-output/
echo $ARTIFACT_DIR
Expand Down
5 changes: 1 addition & 4 deletions cilium/cilium_helm_values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,10 @@ extraArgs:
ipv4NativeRoutingCIDR: 10.241.0.0/16
enableIPv4Masquerade: false
install-no-conntrack-iptables-rules: false
installIptablesRules: false
installIptablesRules: true
l7Proxy: false
hubble:
enabled: false
l2NeighDiscovery:
enabled: false
kubeProxyReplacement: strict

endpointHealthChecking:
Expand All @@ -41,4 +39,3 @@ endpointHealthChecking:
cni:
install: true
customConf: true
configMap: cni-configuration
2 changes: 1 addition & 1 deletion test/integration/setup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func installCNSDaemonset(ctx context.Context, clientset *kubernetes.Clientset, l
log.Printf("Env %v set to true, deploy azure-ipam and cilium-cni", envInstallAzilium)
initImage, _ := parseImageString(cns.Spec.Template.Spec.InitContainers[0].Image)
cns.Spec.Template.Spec.InitContainers[0].Image = getImageString(initImage, cniDropgzVersion)
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"}
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"}
}
} else {
log.Printf("Env %v not set to true, skipping", envInstallAzilium)
Expand Down