Merge pull request #156 from maiqueb/disable-cni-check-cmd

e2e tests: fix currently broken setup on kind clusters
k8snetworkplumbingwg · Oct 21, 2021 · 7e39872 · 7e39872
2 parents ebcf63f + 876f0a2
commit 7e39872
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -75,7 +75,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install requirements
-        run: sudo apt-get install nmap jq
+        run: sudo apt-get install nmap jq && ./hack/build-go.sh
 
       - name: Get tools, setup KinD cluster test environment
         run: source hack/e2e-get-test-tools.sh && ./hack/e2e-setup-kind-cluster.sh --number-of-compute $NUMBER_OF_COMPUTE_NODES

diff --git a/hack/e2e-test.sh b/hack/e2e-test.sh
@@ -160,18 +160,23 @@ metadata:
 spec:
   config: '{
       "cniVersion": "0.3.0",
-      "type": "macvlan",
-      "master": "$TEST_INTERFACE_NAME",
-      "mode": "bridge",
-      "ipam": {
-        "type": "whereabouts",
-        "leader_lease_duration": $LEADER_LEASE_DURATION,
-        "leader_renew_deadline": $LEADER_RENEW_DEADLINE,
-        "leader_retry_period": $LEADER_RETRY_PERIOD,
-        "range": "$1",
-        "log_level": "debug",
-        "log_file": "/tmp/wb"
-      }
+      "disableCheck": true,
+      "plugins": [
+          {
+              "type": "macvlan",
+              "master": "$TEST_INTERFACE_NAME",
+              "mode": "bridge",
+              "ipam": {
+                  "type": "whereabouts",
+                  "leader_lease_duration": $LEADER_LEASE_DURATION,
+                  "leader_renew_deadline": $LEADER_RENEW_DEADLINE,
+                  "leader_retry_period": $LEADER_RETRY_PERIOD,
+                  "range": "$1",
+                  "log_level": "debug",
+                  "log_file": "/tmp/wb"
+              }
+          }
+      ]
     }'
 EOF
 }
@@ -202,6 +207,10 @@ is_ippool_consistent() {
   local pod_ips
   local resolved_ippool_ip
   local exit_code=0
+
+  echo "Forcing reconciliation of the cluster ..."
+  bin/ip-reconciler -kubeconfig="${HOME}"/.kube/config
+
   ippool_keys=($(kubectl get ippool $pool_name --namespace $pool_namespace --output json \
     | jq --raw-output '.spec.allocations|to_entries |map("\(.key)")| .[]'))
   ips=($(nmap -sL -n $range | awk '/Nmap scan report for/{printf "%s ", $NF}'))