From d36fb7c313b7396edffdc1ce8908ba74b2b32660 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Tue, 17 Dec 2024 16:34:30 +0000 Subject: [PATCH 01/23] Update e2e.yml Signed-off-by: John O'Loughlin --- .github/workflows/e2e.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index ae6f8082..fba4aaf5 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -12,7 +12,7 @@ jobs: e2e: name: E2E - runs-on: hugepage-runner + runs-on: ubuntu-latest steps: - name: Harden Runner uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1 @@ -24,6 +24,13 @@ jobs: with: go-version: 1.22.3 - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + + - name: set hugapages + run: sudo echo 5000 | sudo tee /proc/sys/vm/nr_hugepages + + - name: check hugepages + run: sudo grep -i Huge /proc/meminfo + - name: install_go_kubectl_kind run: source ./ci/ci.sh && install_go_kubectl_kind - name: create_kind_cluster From de8d4a306a01e4bf00d97572a360f02861c7c2b7 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Tue, 17 Dec 2024 16:38:17 +0000 Subject: [PATCH 02/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index 16406b17..65e91ae7 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -28,7 +28,7 @@ export PATH="${PATH}:${HOME}/go/bin" echo "export PATH=\"${PATH}:${HOME}/go/bin/:${HOME}.local/bin/\"" >>~/.bashrc go install sigs.k8s.io/kind@v0.20.0 -echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" | sudo tee /etc/apt/sources.list.d/kubernetes.list +echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg sudo apt-get update sudo apt-get install -y kubectl=1.27.3-1.1 From 2777afe02ead0d1ac49eb9b5105dc6d0367d3bf5 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Tue, 17 Dec 2024 16:50:24 +0000 Subject: [PATCH 03/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index 65e91ae7..5adde9f4 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -28,7 +28,7 @@ export PATH="${PATH}:${HOME}/go/bin" echo "export PATH=\"${PATH}:${HOME}/go/bin/:${HOME}.local/bin/\"" >>~/.bashrc go install sigs.k8s.io/kind@v0.20.0 -echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list +sudo echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg sudo apt-get update sudo apt-get install -y kubectl=1.27.3-1.1 From 2602cbb19ebc3dc5fb7c06fd77390ef81588c0b4 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Tue, 17 Dec 2024 17:03:43 +0000 Subject: [PATCH 04/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index 5adde9f4..559fe225 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -28,7 +28,7 @@ export PATH="${PATH}:${HOME}/go/bin" echo "export PATH=\"${PATH}:${HOME}/go/bin/:${HOME}.local/bin/\"" >>~/.bashrc go install sigs.k8s.io/kind@v0.20.0 -sudo echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list +sudo bash -c 'echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list' curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg sudo apt-get update sudo apt-get install -y kubectl=1.27.3-1.1 From 0813bff313372d91bf0ad2e6dc23f15905c1eb43 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Tue, 17 Dec 2024 17:08:58 +0000 Subject: [PATCH 05/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index 559fe225..e556ccf3 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -29,7 +29,7 @@ echo "export PATH=\"${PATH}:${HOME}/go/bin/:${HOME}.local/bin/\"" >>~/.bashrc go install sigs.k8s.io/kind@v0.20.0 sudo bash -c 'echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list' -curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg +curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key | sudo gpg --no-tty --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg sudo apt-get update sudo apt-get install -y kubectl=1.27.3-1.1 } From 706c2863bc5aa2e31d99ff089eed436f5081a9ff Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Tue, 17 Dec 2024 17:14:00 +0000 Subject: [PATCH 06/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index e556ccf3..8bc8dcf3 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -29,7 +29,7 @@ echo "export PATH=\"${PATH}:${HOME}/go/bin/:${HOME}.local/bin/\"" >>~/.bashrc go install sigs.k8s.io/kind@v0.20.0 sudo bash -c 'echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list' -curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key | sudo gpg --no-tty --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg +sudo bash -c 'curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key | gpg --no-tty --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg' sudo apt-get update sudo apt-get install -y kubectl=1.27.3-1.1 } From 07e4250edb08613d1490e54bba1e57379437518e Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Tue, 17 Dec 2024 17:26:34 +0000 Subject: [PATCH 07/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index 8bc8dcf3..a228c912 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -29,7 +29,7 @@ echo "export PATH=\"${PATH}:${HOME}/go/bin/:${HOME}.local/bin/\"" >>~/.bashrc go install sigs.k8s.io/kind@v0.20.0 sudo bash -c 'echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list' -sudo bash -c 'curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key | gpg --no-tty --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg' +sudo bash -c 'curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg' sudo apt-get update sudo apt-get install -y kubectl=1.27.3-1.1 } From 9f7b70549aec8ebb2e10fdda35a39680f728ea41 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 09:20:28 +0000 Subject: [PATCH 08/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index a228c912..3c7650a6 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -29,7 +29,8 @@ echo "export PATH=\"${PATH}:${HOME}/go/bin/:${HOME}.local/bin/\"" >>~/.bashrc go install sigs.k8s.io/kind@v0.20.0 sudo bash -c 'echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list' -sudo bash -c 'curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg' +curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key -o Release.key +sudo bash -c 'gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg -d Release.key' sudo apt-get update sudo apt-get install -y kubectl=1.27.3-1.1 } From 92da7f03bd85afccfaef0449a2c345b284154800 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 09:24:01 +0000 Subject: [PATCH 09/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index 3c7650a6..57c2c018 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -30,7 +30,7 @@ go install sigs.k8s.io/kind@v0.20.0 sudo bash -c 'echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list' curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key -o Release.key -sudo bash -c 'gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg -d Release.key' +sudo bash -c 'gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg --import Release.key' sudo apt-get update sudo apt-get install -y kubectl=1.27.3-1.1 } From 06793af90c116f10779ceb2df39a93d8f5338758 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 09:34:50 +0000 Subject: [PATCH 10/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index 57c2c018..d2b8b3ad 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -30,7 +30,7 @@ go install sigs.k8s.io/kind@v0.20.0 sudo bash -c 'echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list' curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key -o Release.key -sudo bash -c 'gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg --import Release.key' +sudo bash -c 'gpg --dearmor Release.key -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg' sudo apt-get update sudo apt-get install -y kubectl=1.27.3-1.1 } From be53fcf5b00d91790fe99750ab220a8453b596c1 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 09:39:28 +0000 Subject: [PATCH 11/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/ci.sh b/ci/ci.sh index d2b8b3ad..a03c2aa9 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -29,8 +29,8 @@ echo "export PATH=\"${PATH}:${HOME}/go/bin/:${HOME}.local/bin/\"" >>~/.bashrc go install sigs.k8s.io/kind@v0.20.0 sudo bash -c 'echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list' -curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key -o Release.key -sudo bash -c 'gpg --dearmor Release.key -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg' +curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key -o release.key +sudo bash -c 'gpg -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg --dearmor ./release.key' sudo apt-get update sudo apt-get install -y kubectl=1.27.3-1.1 } From 2c6812aac9df0cb18a1c5daa718e9d367b6995ed Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 09:44:36 +0000 Subject: [PATCH 12/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index a03c2aa9..52ac8f09 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -30,7 +30,7 @@ go install sigs.k8s.io/kind@v0.20.0 sudo bash -c 'echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list' curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key -o release.key -sudo bash -c 'gpg -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg --dearmor ./release.key' +sudo bash -c 'gpg -o --no-tty /etc/apt/keyrings/kubernetes-apt-keyring.gpg --dearmor ./release.key' sudo apt-get update sudo apt-get install -y kubectl=1.27.3-1.1 } From d9bba8d53b767de1066effa6a59247a677f1d064 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 09:44:59 +0000 Subject: [PATCH 13/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index 52ac8f09..79c1f5b8 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -30,7 +30,7 @@ go install sigs.k8s.io/kind@v0.20.0 sudo bash -c 'echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list' curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key -o release.key -sudo bash -c 'gpg -o --no-tty /etc/apt/keyrings/kubernetes-apt-keyring.gpg --dearmor ./release.key' +sudo bash -c 'gpg --no-tty -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg --dearmor ./release.key' sudo apt-get update sudo apt-get install -y kubectl=1.27.3-1.1 } From c7e9da3c8602e206138f3449c85cc5994e666b6e Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 10:19:17 +0000 Subject: [PATCH 14/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/ci.sh b/ci/ci.sh index 79c1f5b8..4a8de854 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -29,8 +29,9 @@ echo "export PATH=\"${PATH}:${HOME}/go/bin/:${HOME}.local/bin/\"" >>~/.bashrc go install sigs.k8s.io/kind@v0.20.0 sudo bash -c 'echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list' -curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key -o release.key -sudo bash -c 'gpg --no-tty -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg --dearmor ./release.key' +sudo bash -c 'curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key -o release.key | gpg --dearmor >> /etc/apt/keyrings/kubernetes-apt-keyring.gpg' +#curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key -o release.key +#sudo bash -c 'gpg --no-tty -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg --dearmor ./release.key' sudo apt-get update sudo apt-get install -y kubectl=1.27.3-1.1 } From fd0e9d6318771b278a92cef2a7b855b1154b46cb Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 10:19:36 +0000 Subject: [PATCH 15/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index 4a8de854..06f0c89a 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -29,7 +29,7 @@ echo "export PATH=\"${PATH}:${HOME}/go/bin/:${HOME}.local/bin/\"" >>~/.bashrc go install sigs.k8s.io/kind@v0.20.0 sudo bash -c 'echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" >> /etc/apt/sources.list.d/kubernetes.list' -sudo bash -c 'curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key -o release.key | gpg --dearmor >> /etc/apt/keyrings/kubernetes-apt-keyring.gpg' +sudo bash -c 'curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key | gpg --dearmor >> /etc/apt/keyrings/kubernetes-apt-keyring.gpg' #curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key -o release.key #sudo bash -c 'gpg --no-tty -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg --dearmor ./release.key' sudo apt-get update From e10015234dacc426f639fbf53f59e81c73c5e68f Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 10:33:06 +0000 Subject: [PATCH 16/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index 06f0c89a..f2a174f9 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -33,7 +33,7 @@ sudo bash -c 'curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key #curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key -o release.key #sudo bash -c 'gpg --no-tty -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg --dearmor ./release.key' sudo apt-get update -sudo apt-get install -y kubectl=1.27.3-1.1 +#sudo apt-get install -y kubectl=1.27.3-1.1 } create_kind_cluster(){ From 65ad394cad106992f2b16ceb6fea25233a05f19a Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 10:42:16 +0000 Subject: [PATCH 17/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index f2a174f9..ed82b388 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -1,5 +1,9 @@ #!/bin/bash set -e + +pwd +ls +echo "*********************************************************************" USERSPACEDIR="/runner/_work/userspace-cni-network-plugin/userspace-cni-network-plugin/" CI_DIR="$USERSPACEDIR/ci/" @@ -54,7 +58,7 @@ make build mkdir_var=$(dirname ${USERSPACEDIR}) kind load docker-image localhost:5000/userspacecni docker exec -i kind-control-plane bash -c "mkdir -p $mkdir_var" -docker cp "${USERSPACEDIR}" "kind-control-plane:${USERSPACEDIR}" +docker cp "${}" "kind-control-plane:${}" } deploy_multus(){ From f153375d8f2dc800ab94078b632e5d4ccadb07b9 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 10:46:47 +0000 Subject: [PATCH 18/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ci/ci.sh b/ci/ci.sh index ed82b388..e77e1415 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -1,10 +1,8 @@ #!/bin/bash set -e -pwd -ls -echo "*********************************************************************" -USERSPACEDIR="/runner/_work/userspace-cni-network-plugin/userspace-cni-network-plugin/" +#USERSPACEDIR="/runner/_work/userspace-cni-network-plugin/userspace-cni-network-plugin/" +USERSPACEDIR="/home/runner/work/userspace-cni-network-plugin/userspace-cni-network-plugin" CI_DIR="$USERSPACEDIR/ci/" vpp_ligato_latest_container() From b3a788b32579e39c07dc6494603777c7305ee82f Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 10:54:26 +0000 Subject: [PATCH 19/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index e77e1415..a6d4bfc2 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -56,7 +56,7 @@ make build mkdir_var=$(dirname ${USERSPACEDIR}) kind load docker-image localhost:5000/userspacecni docker exec -i kind-control-plane bash -c "mkdir -p $mkdir_var" -docker cp "${}" "kind-control-plane:${}" +docker cp "${USERSPACEDIR}" "kind-control-plane:${USERSPACEDIR}" } deploy_multus(){ From 90a0f376e6b30da1f0f898b1fbb6bd5779c7f273 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 11:55:51 +0000 Subject: [PATCH 20/23] Update vpp_pod.sh Signed-off-by: John O'Loughlin --- ci/vpp_test_setup/vpp_pod.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/vpp_test_setup/vpp_pod.sh b/ci/vpp_test_setup/vpp_pod.sh index fc2fa79b..a74375f7 100755 --- a/ci/vpp_test_setup/vpp_pod.sh +++ b/ci/vpp_test_setup/vpp_pod.sh @@ -1,7 +1,9 @@ #!/bin/bash # set CI_DIR if not defined in parent script -CI_DIR="${CI_DIR:=/runner/_work/userspace-cni-network-plugin/userspace-cni-network-plugin/ci/}" + +CI_DIR="${CI_DIR:=/home/runner/work/userspace-cni-network-plugin/userspace-cni-network-plugin/ci/}" +#CI_DIR="${CI_DIR:=/runner/_work/userspace-cni-network-plugin/userspace-cni-network-plugin/ci/}" kubectl apply -f "$CI_DIR/vpp_test_setup/network_attachment_definition.yaml" kubectl create -n vpp configmap vpp-app-startup-config --from-file="$CI_DIR/vpp_test_setup/startup.conf" worker="kind-control-plane" From 55e27ce7a78b4111f00ac0a18fc0cb8fe3c807e5 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 12:47:42 +0000 Subject: [PATCH 21/23] Update vpp_host.sh Signed-off-by: John O'Loughlin --- ci/vpp_test_setup/vpp_host.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/vpp_test_setup/vpp_host.sh b/ci/vpp_test_setup/vpp_host.sh index 245b9afd..4f7bc8df 100755 --- a/ci/vpp_test_setup/vpp_host.sh +++ b/ci/vpp_test_setup/vpp_host.sh @@ -1,7 +1,8 @@ #!/bin/bash # Set USERSPACEDIR if not defined in parent script -USERSPACEDIR="${USERSPACEDIR:=/runner/_work/userspace-cni-network-plugin/userspace-cni-network-plugin/}" +USERSPACEDIR="${USERSPACEDIR:=/home/runner/work/userspace-cni-network-plugin/userspace-cni-network-plugin/}" +#USERSPACEDIR="${USERSPACEDIR:=/runner/_work/userspace-cni-network-plugin/userspace-cni-network-plugin/}" kubectl delete ns vpp kubectl create ns vpp From 92af1223701c15e8814144890e5a780272283571 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 13:03:24 +0000 Subject: [PATCH 22/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/ci.sh b/ci/ci.sh index a6d4bfc2..5c5a585d 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -88,6 +88,10 @@ echo "Setting up vpp pods" sleep 20 kubectl get all -A +kubectl get nodes + +kubectl describe -n vpp vpp-app1-kind-control-plane + kubectl exec -n vpp vpp-app1-kind-control-plane -- ./vpp_pod_setup_memif.sh kubectl exec -n vpp vpp-app2-kind-control-plane -- ./vpp_pod_setup_memif.sh kubectl exec -n vpp vpp-app1-kind-control-plane -- vppctl "sh int address" From 947e5c40231a19c3a953137e83e3ace529e52ea9 Mon Sep 17 00:00:00 2001 From: John O'Loughlin Date: Wed, 18 Dec 2024 13:09:30 +0000 Subject: [PATCH 23/23] Update ci.sh Signed-off-by: John O'Loughlin --- ci/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci.sh b/ci/ci.sh index 5c5a585d..33912805 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -90,7 +90,7 @@ kubectl get all -A kubectl get nodes -kubectl describe -n vpp vpp-app1-kind-control-plane +kubectl describe pod -n vpp vpp-app1-kind-control-plane kubectl exec -n vpp vpp-app1-kind-control-plane -- ./vpp_pod_setup_memif.sh kubectl exec -n vpp vpp-app2-kind-control-plane -- ./vpp_pod_setup_memif.sh