use portmap chain mode

vexxhost · Jun 18, 2024 · 2238c71 · 2238c71
1 parent 33f8eda
commit 2238c71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/hack/run-integration-tests.sh b/hack/run-integration-tests.sh
@@ -117,14 +117,6 @@ RESULTS_FILE=$(./sonobuoy retrieve --filename sonobuoy-results.tar.gz)
 
 # Fail if the Sonobuoy tests failed
 if ! ./sonobuoy results --plugin e2e ${RESULTS_FILE} | grep -q "Status: passed"; then
-  if [[ ${NETWORK_DRIVER} == "cilium" ]]; then
-    # NOTE(okozachenko1203): One failure is expected until https://github.com/cilium/cilium/issues/14287 is fixed.
-    if ! ./sonobuoy results --plugin e2e ${RESULTS_FILE} | grep -Eq "Failed: 1$"; then
-      echo "Sonobuoy tests failed"
-      exit 1
-    fi
-  else
-    echo "Sonobuoy tests failed"
-    exit 1
-  fi
+  echo "Sonobuoy tests failed"
+  exit 1
 fi
diff --git a/magnum_cluster_api/resources.py b/magnum_cluster_api/resources.py
@@ -210,6 +210,9 @@ def get_object(self) -> pykube.ConfigMap:
                             "vendor/cilium/",
                         ),
                         values={
+                            "cni": {
+                                "chainingMode": "portmap"
+                            },
                             "image": {
                                 "tag": cilium_version,
                             },