From 5afdea32651f1cbaef0119639934def622819e81 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Sat, 13 Apr 2024 00:56:50 +0900 Subject: [PATCH 1/2] service-proxy: support with calico networking --- pkg/loxinet/layer3.go | 10 ++++++++++ pkg/loxinet/port.go | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkg/loxinet/layer3.go b/pkg/loxinet/layer3.go index aba339adc..5d6c7f8e4 100644 --- a/pkg/loxinet/layer3.go +++ b/pkg/loxinet/layer3.go @@ -273,6 +273,16 @@ func (l3 *L3H) IfaSelect(Obj string, addr net.IP, findAny bool) (int, net.IP, st ifa := l3.IfaMap[key] if ifa == nil { + if findAny { + for _, ifa := range l3.IfaMap { + if ifa.Key.Obj == "lo" { + continue + } + if len(ifa.Ifas) > 0 { + return 0, ifa.Ifas[0].IfaAddr, Obj + } + } + } return L3ObjErr, net.IPv4(0, 0, 0, 0), "" } diff --git a/pkg/loxinet/port.go b/pkg/loxinet/port.go index 817c578d4..ad1c20544 100644 --- a/pkg/loxinet/port.go +++ b/pkg/loxinet/port.go @@ -1050,8 +1050,8 @@ func (p *Port) DP(work DpWorkT) int { zn, _ := mh.zn.Zonefind(p.Zone) if zn != nil { match := false - for _, pe := range zn.Ports.portImap { - if pe.Name != p.Name { + for _, pe := range zn.Ports.portSmap { + if pe != nil && pe.Name != p.Name { if pe.HInfo.MacAddr == p.HInfo.MacAddr { match = true break From ea4146b18c90f488774ce1f5bd1f7ce9af55a2b6 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Sat, 13 Apr 2024 00:58:14 +0900 Subject: [PATCH 2/2] cicd: added labels for large self-hosted runner --- .github/workflows/docker-k3s-lb.yml | 2 +- .github/workflows/k0s-weave.yml | 2 +- .github/workflows/k3s-cilium-cluster.yml | 2 +- .github/workflows/k3s-flannel-cluster.yml | 2 +- .github/workflows/k3s-flannel-incluster-l2.yml | 2 +- .github/workflows/k3s-flannel-incluster.yml | 2 +- .github/workflows/k3s-flannel-ubuntu-22.yml | 2 +- .github/workflows/k3s-flannel.yml | 2 +- .github/workflows/k8s-calico-ipvs.yml | 2 +- .github/workflows/k8s-calico-ipvs2.yml | 2 +- .github/workflows/k8s-calico-ipvs3-ha.yml | 2 +- .github/workflows/k8s-calico-ipvs3.yml | 2 +- .github/workflows/k8s-calico.yml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker-k3s-lb.yml b/.github/workflows/docker-k3s-lb.yml index b1f4c4d64..d4310ed19 100644 --- a/.github/workflows/docker-k3s-lb.yml +++ b/.github/workflows/docker-k3s-lb.yml @@ -12,7 +12,7 @@ on: jobs: test-runner: name: docker-k3s-sanity - runs-on: self-hosted + runs-on: [self-hosted, large] if: github.repository == 'loxilb-io/loxilb' && github.event.inputs.tagName == '' steps: diff --git a/.github/workflows/k0s-weave.yml b/.github/workflows/k0s-weave.yml index 04cbaa3b0..c5c7db82b 100644 --- a/.github/workflows/k0s-weave.yml +++ b/.github/workflows/k0s-weave.yml @@ -12,7 +12,7 @@ on: jobs: test-runner: name: k0s-weave-sanity - runs-on: self-hosted + runs-on: [self-hosted, large] if: github.repository == 'loxilb-io/loxilb' && github.event.inputs.tagName == '' steps: diff --git a/.github/workflows/k3s-cilium-cluster.yml b/.github/workflows/k3s-cilium-cluster.yml index cb63db9e9..b1cfd59cc 100644 --- a/.github/workflows/k3s-cilium-cluster.yml +++ b/.github/workflows/k3s-cilium-cluster.yml @@ -12,7 +12,7 @@ on: jobs: build: name: k3s-cilium-cluster-sanity - runs-on: self-hosted + runs-on: [self-hosted, large] steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/k3s-flannel-cluster.yml b/.github/workflows/k3s-flannel-cluster.yml index 2434ede60..5d2ef671f 100644 --- a/.github/workflows/k3s-flannel-cluster.yml +++ b/.github/workflows/k3s-flannel-cluster.yml @@ -12,7 +12,7 @@ on: jobs: build: name: k3s-flannel-cluster-sanity - runs-on: self-hosted + runs-on: [self-hosted, large] steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/k3s-flannel-incluster-l2.yml b/.github/workflows/k3s-flannel-incluster-l2.yml index f6b73dc46..7944bea26 100644 --- a/.github/workflows/k3s-flannel-incluster-l2.yml +++ b/.github/workflows/k3s-flannel-incluster-l2.yml @@ -12,7 +12,7 @@ on: jobs: build: name: k3s-flannel-incluster-l2-sanity - runs-on: self-hosted + runs-on: [self-hosted, large] if: github.repository == 'loxilb-io/loxilb' && github.event.inputs.tagName == '' steps: diff --git a/.github/workflows/k3s-flannel-incluster.yml b/.github/workflows/k3s-flannel-incluster.yml index 3da4ea13f..a2942d5e8 100644 --- a/.github/workflows/k3s-flannel-incluster.yml +++ b/.github/workflows/k3s-flannel-incluster.yml @@ -12,7 +12,7 @@ on: jobs: build: name: k3s-flannel-incluster-sanity - runs-on: self-hosted + runs-on: [self-hosted, large] if: github.repository == 'loxilb-io/loxilb' && github.event.inputs.tagName == '' steps: diff --git a/.github/workflows/k3s-flannel-ubuntu-22.yml b/.github/workflows/k3s-flannel-ubuntu-22.yml index d5cc08878..b53ffef63 100644 --- a/.github/workflows/k3s-flannel-ubuntu-22.yml +++ b/.github/workflows/k3s-flannel-ubuntu-22.yml @@ -13,7 +13,7 @@ jobs: build: if: github.repository == 'loxilb-io/loxilb' name: k3s-flannel-sanity-ubuntu-22 - runs-on: self-hosted + runs-on: [self-hosted, large] steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/k3s-flannel.yml b/.github/workflows/k3s-flannel.yml index 0d697cd01..133fc312e 100644 --- a/.github/workflows/k3s-flannel.yml +++ b/.github/workflows/k3s-flannel.yml @@ -13,7 +13,7 @@ jobs: build: if: github.repository == 'loxilb-io/loxilb' name: k3s-flannel-sanity - runs-on: self-hosted + runs-on: [self-hosted, large] steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/k8s-calico-ipvs.yml b/.github/workflows/k8s-calico-ipvs.yml index 231bba018..c44514a21 100644 --- a/.github/workflows/k8s-calico-ipvs.yml +++ b/.github/workflows/k8s-calico-ipvs.yml @@ -12,7 +12,7 @@ on: jobs: test-runner: name: k8s-calico-cluster-ipvs-sanity - runs-on: self-hosted + runs-on: [self-hosted, large] if: github.repository == 'loxilb-io/loxilb' && github.event.inputs.tagName == '' steps: diff --git a/.github/workflows/k8s-calico-ipvs2.yml b/.github/workflows/k8s-calico-ipvs2.yml index 0afc7a0aa..170da72d1 100644 --- a/.github/workflows/k8s-calico-ipvs2.yml +++ b/.github/workflows/k8s-calico-ipvs2.yml @@ -12,7 +12,7 @@ on: jobs: test-runner: name: k8s-calico-cluster-ipvs2-sanity - runs-on: self-hosted + runs-on: [self-hosted, large] if: github.repository == 'loxilb-io/loxilb' && github.event.inputs.tagName == '' steps: diff --git a/.github/workflows/k8s-calico-ipvs3-ha.yml b/.github/workflows/k8s-calico-ipvs3-ha.yml index 09d88e298..19a33b0fc 100644 --- a/.github/workflows/k8s-calico-ipvs3-ha.yml +++ b/.github/workflows/k8s-calico-ipvs3-ha.yml @@ -12,7 +12,7 @@ on: jobs: test-runner: name: k8s-calico-cluster-ipvs3-ha-sanity - runs-on: self-hosted + runs-on: [self-hosted, large] if: github.repository == 'loxilb-io/loxilb' && github.event.inputs.tagName == '' steps: diff --git a/.github/workflows/k8s-calico-ipvs3.yml b/.github/workflows/k8s-calico-ipvs3.yml index f332366dc..bf8855e4a 100644 --- a/.github/workflows/k8s-calico-ipvs3.yml +++ b/.github/workflows/k8s-calico-ipvs3.yml @@ -12,7 +12,7 @@ on: jobs: test-runner: name: k8s-calico-cluster-ipvs3-sanity - runs-on: self-hosted + runs-on: [self-hosted, large] if: github.repository == 'loxilb-io/loxilb' && github.event.inputs.tagName == '' steps: diff --git a/.github/workflows/k8s-calico.yml b/.github/workflows/k8s-calico.yml index 0e394524d..0177038fb 100644 --- a/.github/workflows/k8s-calico.yml +++ b/.github/workflows/k8s-calico.yml @@ -12,7 +12,7 @@ on: jobs: build: name: k8s-calico-cluster-sanity - runs-on: self-hosted + runs-on: [self-hosted, large] if: github.repository == 'loxilb-io/loxilb' && github.event.inputs.tagName == '' steps: