diff --git a/.github/workflows/inspektor-gadget.yml b/.github/workflows/inspektor-gadget.yml index e076bf4d3f..37105373a8 100644 --- a/.github/workflows/inspektor-gadget.yml +++ b/.github/workflows/inspektor-gadget.yml @@ -544,13 +544,6 @@ jobs: sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) test" sudo apt-get update sudo apt-get install docker-ce - # For containerd, swap limit isn't propogated to memory controller of pod cgroup with - # memory.memsw.limit_in_bytes set to a large value, resulting in OOM not triggered. - # Disable swap to make things simpler for us - - name: Disable swap for ${{ matrix.runtime }} - if: matrix.runtime == 'containerd' - run: | - sudo swapoff -a - name: Run integration for container runtime ${{ matrix.runtime }} run: | set -o pipefail diff --git a/integration/local-gadget/k8s/Makefile b/integration/local-gadget/k8s/Makefile index 00c7947d24..2a155ff256 100644 --- a/integration/local-gadget/k8s/Makefile +++ b/integration/local-gadget/k8s/Makefile @@ -45,4 +45,4 @@ test-%: build build-tests $(MINIKUBE) -p $${MINIKUBE_PROFILE} ssh "sudo ln -sf /var/lib/minikube/binaries/$(KUBERNETES_VERSION)/kubectl /bin/kubectl" && \ $(MINIKUBE) -p $${MINIKUBE_PROFILE} ssh "sudo ln -sf /etc/kubernetes/admin.conf /root/.kube/config" && \ echo "Running test in minikube with profile $${MINIKUBE_PROFILE} ..." && \ - $(MINIKUBE) -p $${MINIKUBE_PROFILE} ssh "sudo local-gadget-integration.test -test.v -integration -container-runtime $* $${INTEGRATION_TESTS_PARAMS}" + $(MINIKUBE) -p $${MINIKUBE_PROFILE} ssh "sudo local-gadget-integration.test -integration -container-runtime $* $${INTEGRATION_TESTS_PARAMS}" diff --git a/minikube.mk b/minikube.mk index e4bc017d97..eeb938f8d0 100644 --- a/minikube.mk +++ b/minikube.mk @@ -1,4 +1,4 @@ -MINIKUBE_VERSION ?= v1.28.0 +MINIKUBE_VERSION ?= v1.29.0 KUBERNETES_VERSION ?= v1.24.6 MINIKUBE_DRIVER ?= docker