Skip to content

Feat/policy #968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BSWANG merged 2 commits into from
Jan 14, 2026
Merged

Feat/policy #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d45146a
fix(watchdogs): skip endpoints in IPvlan datapath mode
l1b0k Jan 13, 2026
c00f9ef
feat: update Terway policy image
l1b0k Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/images/terway-controlplane/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1-labs
ARG TERWAY_POLICY_IMAGE=registry-cn-zhangjiakou.ack.aliyuncs.com/acs/terway:policy-15f6eed1@sha256:bb689a75738a9624ac2e4468e42dec5900c3b6429f9619277c3a0f8bda82577f
ARG TERWAY_POLICY_IMAGE=registry-cn-zhangjiakou.ack.aliyuncs.com/acs/terway:policy-d45146a6@sha256:2a1641efacd98527056aa4d03f0ba184fdd24db1ba4caffa15701b54e497d214

FROM --platform=$TARGETPLATFORM ${TERWAY_POLICY_IMAGE} AS policy-dist

Expand Down
2 changes: 1 addition & 1 deletion deploy/images/terway/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1-labs
ARG TERWAY_POLICY_IMAGE=registry-cn-zhangjiakou.ack.aliyuncs.com/acs/terway:policy-15f6eed1@sha256:bb689a75738a9624ac2e4468e42dec5900c3b6429f9619277c3a0f8bda82577f
ARG TERWAY_POLICY_IMAGE=registry-cn-zhangjiakou.ack.aliyuncs.com/acs/terway:policy-d45146a6@sha256:2a1641efacd98527056aa4d03f0ba184fdd24db1ba4caffa15701b54e497d214
ARG UBUNTU_IMAGE=registry.cn-hangzhou.aliyuncs.com/acs/ubuntu:24.04-update
ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:9f1bfe736009afb1fbb562718bbc42ea07d37d8e@sha256:a666a7a01a2dc610c3ab6e32f25ca5e294201f3cbbc01f233320c527955deee3
ARG CILIUM_BPFTOOL_IMAGE=quay.io/cilium/cilium-bpftool:0db3a73729ceb42e947d826bb96a655be79e5317@sha256:de23c9546c4eafab33f75d6f5d129947bbbafc132dbd113c0cecc9a61929e6b0
Expand Down
37 changes: 37 additions & 0 deletions policy/cilium/0018-fix-watchdogs-skip-endpoints-in-IPvlan-datapath-mode.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: l1b0k <libokang.lbk@alibaba-inc.com>
Date: Tue, 13 Jan 2026 13:45:06 +0800
Subject: fix(watchdogs): skip endpoints in IPvlan datapath mode

Signed-off-by: l1b0k <libokang.lbk@alibaba-inc.com>
---
daemon/cmd/watchdogs.go | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/daemon/cmd/watchdogs.go b/daemon/cmd/watchdogs.go
index e3f21e4fa6..af08fc53e8 100644
--- a/daemon/cmd/watchdogs.go
+++ b/daemon/cmd/watchdogs.go
@@ -6,6 +6,8 @@ package cmd
import (
"context"

+ datapathOption "github.com/cilium/cilium/pkg/datapath/option"
+ "github.com/cilium/cilium/pkg/option"
"github.com/cilium/hive/cell"
"github.com/sirupsen/logrus"
"github.com/spf13/pflag"
@@ -108,6 +110,10 @@ func (d *Daemon) checkEndpointBPFPrograms(ctx context.Context, p epBPFProgWatchd
continue
}

+ if option.Config.DatapathMode == datapathOption.DatapathModeIPvlan {
+ continue
+ }
+
if ep.HostInterface() == "" {
continue
}
--
2.50.1 (Apple Git-155)

Loading