Skip to content

Commit

Permalink
Merge pull request #1303 from inspektor-gadget/qasim/containerd-swap-fix
Browse files Browse the repository at this point in the history
integration: Remove containerd workaround for TestTraceOomkill
  • Loading branch information
mqasimsarfraz committed Jan 30, 2023
2 parents da7b94d + 33ccb50 commit 4ff42ee
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
7 changes: 0 additions & 7 deletions .github/workflows/inspektor-gadget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion minikube.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MINIKUBE_VERSION ?= v1.28.0
MINIKUBE_VERSION ?= v1.29.0
KUBERNETES_VERSION ?= v1.24.6
MINIKUBE_DRIVER ?= docker

Expand Down

0 comments on commit 4ff42ee

Please sign in to comment.