From 1b5420ae621b2f34c3accc7f803f1124825544d0 Mon Sep 17 00:00:00 2001
From: Camryn Lee <31013536+camrynl@users.noreply.github.com>
Date: Thu, 8 Sep 2022 17:54:52 -0700
Subject: [PATCH] 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 <rbtr@users.noreply.github.com>
---
 .../cilium/cilium-e2e-step-template.yaml      | 20 +++++++++++++++++++
 cilium/cilium_helm_values.yaml                |  5 +----
 test/integration/setup_test.go                |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
index ab15c79b4b..6125cedf87 100644
--- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
@@ -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
@@ -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
diff --git a/cilium/cilium_helm_values.yaml b/cilium/cilium_helm_values.yaml
index c4318da290..dfa387e900 100644
--- a/cilium/cilium_helm_values.yaml
+++ b/cilium/cilium_helm_values.yaml
@@ -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:
@@ -41,4 +39,3 @@ endpointHealthChecking:
 cni:
   install: true
   customConf: true
-  configMap: cni-configuration
diff --git a/test/integration/setup_test.go b/test/integration/setup_test.go
index 574724499e..a43fb5adcf 100644
--- a/test/integration/setup_test.go
+++ b/test/integration/setup_test.go
@@ -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)