Merge pull request #636 from TrekkieCoder/main

PR : service-proxy and cicd fixes
loxilb-io · Apr 12, 2024 · 9f4719a · 9f4719a
2 parents e870597 + 1d9b1c0
commit 9f4719a
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:

diff --git 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
@@ -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