From c9dde3a79de8ca31b418a6e9da31212edd4866d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Thu, 17 Aug 2023 15:04:09 +0800 Subject: [PATCH 1/2] base: remove ovn patch for skipping ct MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张祖建 --- dist/images/Dockerfile.base | 4 +--- pkg/controller/init.go | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dist/images/Dockerfile.base b/dist/images/Dockerfile.base index 562ecf9e5ae..49e4e3dd703 100644 --- a/dist/images/Dockerfile.base +++ b/dist/images/Dockerfile.base @@ -50,8 +50,6 @@ RUN cd /usr/src/ && git clone -b branch-22.03 --depth=1 https://github.com/ovn-o curl -s https://github.com/kubeovn/ovn/commit/54c478d38ec31c900d54d29c557bf414f5194baf.patch | git apply && \ # patch.c: Avoid patch interface deletion & recreation during restart. curl -s https://github.com/kubeovn/ovn/commit/03a46942b9e14d77a23313c193fe062ccafa4769.patch | git apply && \ - # do not send traffic that not designate to svc to conntrack - curl -s https://github.com/kubeovn/ovn/commit/44ee74998edfd85a40d4920045ae4c39e2ceff6e.patch | git apply && \ # change hash type from dp_hash to hash with field src_ip curl -s https://github.com/kubeovn/ovn/commit/168a3f20579b720370f137c82c04cf3b1a9811e2.patch | git apply && \ # set ether dst addr for dnat on logical switch @@ -125,7 +123,7 @@ RUN --mount=type=bind,target=/packages,from=ovs-builder,source=/packages \ ARG DEBUG=false RUN --mount=type=bind,target=/packages,from=ovs-builder,source=/packages \ if [ "${DEBUG}" = "true" ]; then \ - apt update && apt install -y --no-install-recommends valgrind && \ + apt update && apt install -y --no-install-recommends gdb valgrind && \ rm -rf /var/lib/apt/lists/* && \ dpkg -i --ignore-depends=openvswitch-switch,openvswitch-common /packages/*.ddeb; \ fi diff --git a/pkg/controller/init.go b/pkg/controller/init.go index 3ba14c56f77..b5d7a4286ce 100644 --- a/pkg/controller/init.go +++ b/pkg/controller/init.go @@ -30,13 +30,6 @@ func (c *Controller) InitOVN() error { klog.Errorf("init load balancer failed: %v", err) return err } - v4Svc, _ := util.SplitStringIP(c.config.ServiceClusterIPRange) - if v4Svc != "" { - if err := c.ovnLegacyClient.SetLBCIDR(v4Svc); err != nil { - klog.Errorf("init load balancer svc cidr failed: %v", err) - return err - } - } } if err := c.initDefaultVlan(); err != nil { From 92f867972113a64462faa4d6fbe8844746bd97aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Thu, 17 Aug 2023 10:30:15 +0800 Subject: [PATCH 2/2] ci: increase k8s network policy e2e timeout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张祖建 --- .github/workflows/build-x86-image.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml index 37ec9572677..bdfed15b786 100644 --- a/.github/workflows/build-x86-image.yaml +++ b/.github/workflows/build-x86-image.yaml @@ -414,7 +414,7 @@ jobs: - build-e2e-binaries - netpol-path-filter runs-on: ubuntu-22.04 - timeout-minutes: 60 + timeout-minutes: 90 strategy: fail-fast: false matrix: @@ -560,7 +560,7 @@ jobs: - build-e2e-binaries - netpol-path-filter runs-on: ubuntu-22.04 - timeout-minutes: 60 + timeout-minutes: 90 strategy: fail-fast: false matrix: