From cc5039d45f988d1dfe60d5adbea076ae5c68f29b Mon Sep 17 00:00:00 2001 From: Changlu Yi Date: Wed, 13 Dec 2023 18:42:50 +0800 Subject: [PATCH 1/2] change v2.13.2 to v2.13.1 Signed-off-by: Changlu Yi --- .github/workflows/build-x86-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml index 266d53da136..1e7fa210be4 100644 --- a/.github/workflows/build-x86-image.yaml +++ b/.github/workflows/build-x86-image.yaml @@ -255,7 +255,7 @@ jobs: - name: Install ginkgo working-directory: ${{ env.E2E_DIR }} - run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo + run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.13.1 - name: Download image uses: actions/download-artifact@v3 From d6bc61e9f029bc1b01517e88e7e526278d38bb28 Mon Sep 17 00:00:00 2001 From: Changlu Yi Date: Wed, 13 Dec 2023 18:45:24 +0800 Subject: [PATCH 2/2] change typo Signed-off-by: Changlu Yi --- dist/images/uninstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/images/uninstall.sh b/dist/images/uninstall.sh index 7416e75ce28..a8859855611 100644 --- a/dist/images/uninstall.sh +++ b/dist/images/uninstall.sh @@ -62,7 +62,7 @@ ip6tables -t filter -D FORWARD -m set --match-set ovn60subnets src -j ACCEPT ip6tables -t filter -D FORWARD -m set --match-set ovn60services dst -j ACCEPT ip6tables -t filter -D FORWARD -m set --match-set ovn60services src -j ACCEPT ip6tables -t filter -D OUTPUT -p udp -m udp --dport 6081 -j MARK --set-xmark 0x0 -ip6tables -t mangle -D POSTROUTING -p tcp -m set --match-set ovn40subnets src -m tcp --tcp-flags RST RST -m state --state INVALID -j DROP +ip6tables -t mangle -D POSTROUTING -p tcp -m set --match-set ovn60subnets src -m tcp --tcp-flags RST RST -m state --state INVALID -j DROP if [ -n "$nodeIPv6" ]; then ip6tables -t nat -D POSTROUTING ! -s "$nodeIPv6" -m mark --mark 0x4000/0x4000 -j MASQUERADE