Skip to content

Commit d545c2b

Browse files
naiming-zededaeriknordmark
authored andcommitted
Add vendor files for add controller-driven kube-vip load balancer for K3S_BASE
- add the pillar vendor files updated eve-api Signed-off-by: naiming-zededa <naiming@zededa.com>
1 parent a4e8f59 commit d545c2b

File tree

14 files changed

+5948
-3739
lines changed

14 files changed

+5948
-3739
lines changed

pkg/kube/cluster-init.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -868,6 +868,10 @@ check_kubevip_lb() {
868868
local lb_iface="" lb_cidr="" lb=""
869869
if [ -f "$enc_status_file" ]; then
870870
enc_data=$(cat "$enc_status_file")
871+
lb_count=$(echo "$enc_data" | jq '.LBInterfaces | length')
872+
if [ "$lb_count" -gt 1 ] 2>/dev/null; then
873+
logmsg "check_kubevip_lb: $lb_count LB interfaces configured, only the first is supported; ignoring the rest"
874+
fi
871875
lb_iface=$(echo "$enc_data" | jq -r '.LBInterfaces[0].Interface // ""')
872876
lb_cidr=$(echo "$enc_data" | jq -r '.LBInterfaces[0].IPPrefix // ""')
873877
fi

pkg/pillar/cmd/zedagent/parseconfig.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3523,6 +3523,10 @@ func parseEdgeNodeClusterConfig(getconfigCtx *getconfigContext,
35233523
if ifName == "" || len(cidrs) == 0 {
35243524
continue
35253525
}
3526+
if len(cidrs) > 1 {
3527+
log.Warnf("parseEdgeNodeClusterConfig: interface %s has %d CIDRs, only the first is supported; ignoring the rest",
3528+
ifName, len(cidrs))
3529+
}
35263530
if _, _, lbErr := net.ParseCIDR(cidrs[0]); lbErr != nil {
35273531
log.Errorf("parseEdgeNodeClusterConfig: invalid LB CIDR %s: %v", cidrs[0], lbErr)
35283532
continue

pkg/pillar/vendor/github.com/lf-edge/eve-api/go/config/devconfig.pb.go

Lines changed: 212 additions & 176 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/pillar/vendor/github.com/lf-edge/eve-api/go/config/edge_node_cluster.pb.go

Lines changed: 290 additions & 61 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/pillar/vendor/github.com/lf-edge/eve-api/go/config/netconfig.pb.go

Lines changed: 227 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)