Skip to content

Commit 2a80877

Browse files
l1b0kl1b0k
committed
feat: bump cilium to v1.16.18 and update related images
Signed-off-by: l1b0k <[email protected]>
1 parent 33c318b commit 2a80877

17 files changed

+54
-65
lines changed

‎deploy/images/policy/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
2222
( ! $(readelf -d bin/calico-felix | grep -q NEEDED) || ( echo "Error: bin/calico-felix was not statically linked"; false )) \
2323
&& chmod +x /go/src/github.com/projectcalico/calico/bin/calico-felix
2424

25-
FROM --platform=$TARGETPLATFORM quay.io/cilium/cilium-builder:0aa9ec56fe2df313baa592994c1e4dd2a6a38f96@sha256:d5df105dbf3362be00cb88ba8f517d54b3a272e71f7b3e9be38690b48e23149e as cilium-builder
25+
FROM --platform=$TARGETPLATFORM quay.io/cilium/cilium-builder:03739b8b3d9bcfd05501f61d035f6b027e4c9425@sha256:01cdf345f1aa673c073fdf7f59a78c58eff9974c940d81cfd2286aba890da841 as cilium-builder
2626
ARG GOPROXY
2727
ENV GOPROXY=$GOPROXY
2828
ARG CILIUM_SHA=""
@@ -31,8 +31,8 @@ LABEL cilium-sha=${CILIUM_SHA}
3131
LABEL maintainer="[email protected]"
3232
WORKDIR /go/src/github.com/cilium
3333
RUN rm -rf cilium
34-
ENV GIT_TAG=v1.16.12
35-
ENV GIT_COMMIT=a66093957f9614320e5d7364615235209b757c55
34+
ENV GIT_TAG=v1.16.18
35+
ENV GIT_COMMIT=ab50022137f1d6af6914dead0d83b13ab3119d4d
3636
RUN git clone -b $GIT_TAG --depth 1 https://github.com/cilium/cilium.git && \
3737
cd cilium && git config --global user.email terway && git config --global user.name terway && \
3838
[ "`git rev-parse HEAD`" = "${GIT_COMMIT}" ]

‎deploy/images/terway/Dockerfile‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
# syntax=docker/dockerfile:1-labs
22
ARG TERWAY_POLICY_IMAGE=registry-cn-zhangjiakou.ack.aliyuncs.com/acs/terway:policy-71baf890@sha256:20e5741a0ad2dc4358ade7a8d41ebf192e6804bff94da95f34f1be7397b3cf4e
33
ARG UBUNTU_IMAGE=registry.cn-hangzhou.aliyuncs.com/acs/ubuntu:24.04-update
4-
ARG CILIUM_IPROUTE2_IMAGE=quay.io/cilium/cilium-iproute2:3570d58349efb2d6b0342369a836998c93afd291@sha256:1abcd7a5d2117190ab2690a163ee9cd135bc9e4cf8a4df662a8f993044c79342
5-
ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:02191b3a68f4003f075e69a61b61faa8d12d4b6d@sha256:54ca04f65a6de3aa5243a7da392aed342c64f579ebd94ea1290590ce77a433a8
6-
ARG CILIUM_BPFTOOL_IMAGE=quay.io/cilium/cilium-bpftool:5a9c4852a21287686009bfe1cdc1fed6e7aabdea@sha256:188e398ee30456373530698d0d29de66dda0c4428068ea430027ceb7e9c15b7c
7-
ARG CILIUM_IPTABLES_IMAGE=quay.io/cilium/iptables:1331e9b1b03f70c9d8b08626d9a7126963f86478@sha256:d761d967243aced2729adde1e332a9c9def6baeb61f5f6cde5758b04e9a79355
4+
ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:9f1bfe736009afb1fbb562718bbc42ea07d37d8e@sha256:a666a7a01a2dc610c3ab6e32f25ca5e294201f3cbbc01f233320c527955deee3
5+
ARG CILIUM_BPFTOOL_IMAGE=quay.io/cilium/cilium-bpftool:0db3a73729ceb42e947d826bb96a655be79e5317@sha256:de23c9546c4eafab33f75d6f5d129947bbbafc132dbd113c0cecc9a61929e6b0
6+
ARG CILIUM_IPTABLES_IMAGE=quay.io/cilium/iptables:67f517af50e18f64cd12625021f1c39246bb4f92@sha256:d075f03e89aacf51908346ec8ed5d251b8d3ad528ce30a710fcd074cdf91f11d
87

98
FROM --platform=$TARGETPLATFORM ${TERWAY_POLICY_IMAGE} AS policy-dist
109
FROM --platform=$TARGETPLATFORM ${CILIUM_LLVM_IMAGE} AS llvm-dist
1110
FROM --platform=$TARGETPLATFORM ${CILIUM_BPFTOOL_IMAGE} AS bpftool-dist
12-
FROM --platform=$TARGETPLATFORM ${CILIUM_IPROUTE2_IMAGE} AS iproute2-dist
1311
FROM --platform=$TARGETPLATFORM ${CILIUM_IPTABLES_IMAGE} AS iptables-dist
1412

1513
FROM --platform=$BUILDPLATFORM golang:1.25.5 AS builder
@@ -32,7 +30,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
3230
go build -tags default_build -ldflags "-s -w" -o terway-cli ./cmd/terway-cli
3331

3432
FROM --platform=$TARGETPLATFORM ${UBUNTU_IMAGE}
35-
RUN apt-get update && apt-get install -y kmod libelf1 libmnl0 iptables nftables kmod curl ipset bash ethtool bridge-utils socat grep findutils jq conntrack iputils-ping && \
33+
RUN apt-get update && apt-get install -y iproute2 kmod libelf1 libmnl0 iptables nftables kmod curl ipset bash ethtool bridge-utils socat grep findutils jq conntrack iputils-ping && \
3634
apt-get purge --auto-remove && apt-get clean && rm -rf /var/lib/apt/lists/*
3735

3836
RUN --mount=type=bind,from=iptables-dist,source=/iptables,target=/iptables \
@@ -42,8 +40,6 @@ RUN --mount=type=bind,source=/hack/iptables-wrapper-installer.sh,target=/iptable
4240

4341
COPY --link --from=llvm-dist /usr/local/bin/clang /usr/local/bin/llc /usr/bin/
4442
COPY --link --from=bpftool-dist /usr/local /usr/local
45-
COPY --link --from=iproute2-dist /usr/local /usr/local
46-
COPY --link --from=iproute2-dist /usr/lib/libbpf* /usr/lib/
4743
COPY --link --from=policy-dist /bin/calico-felix /usr/local/bin/calico-felix
4844

4945
COPY --link ../../../policy/policyinit.sh ./../../policy/uninstall_policy.sh ../../../hack/init.sh /usr/bin/

‎policy/cilium/0001-cni-add-terway-cni.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ index 07b6afca7c..fd69aab5e6 100644
660660
}
661661
}
662662
diff --git a/pkg/endpoint/endpoint.go b/pkg/endpoint/endpoint.go
663-
index bba3bc2aed..ae7e11b752 100644
663+
index 72f0cbfbbc..063d6c4f58 100644
664664
--- a/pkg/endpoint/endpoint.go
665665
+++ b/pkg/endpoint/endpoint.go
666666
@@ -31,6 +31,7 @@ import (
@@ -671,7 +671,7 @@ index bba3bc2aed..ae7e11b752 100644
671671
dptypes "github.com/cilium/cilium/pkg/datapath/types"
672672
"github.com/cilium/cilium/pkg/defaults"
673673
"github.com/cilium/cilium/pkg/endpoint/regeneration"
674-
@@ -429,6 +430,10 @@ type Endpoint struct {
674+
@@ -425,6 +426,10 @@ type Endpoint struct {
675675

676676
// NetNsCookie is the network namespace cookie of the Endpoint.
677677
NetNsCookie uint64
@@ -682,7 +682,7 @@ index bba3bc2aed..ae7e11b752 100644
682682
}
683683

684684
func (e *Endpoint) GetRealizedRedirects() (redirects map[string]uint16) {
685-
@@ -711,6 +716,9 @@ func (e *Endpoint) GetID16() uint16 {
685+
@@ -709,6 +714,9 @@ func (e *Endpoint) GetID16() uint16 {
686686
// In some datapath modes, it may return an empty string as there is no unique
687687
// host netns network interface for this endpoint.
688688
func (e *Endpoint) HostInterface() string {
@@ -692,7 +692,7 @@ index bba3bc2aed..ae7e11b752 100644
692692
return e.ifName
693693
}
694694

695-
@@ -2590,6 +2598,9 @@ func (e *Endpoint) Delete(conf DeleteConfig) []error {
695+
@@ -2589,6 +2597,9 @@ func (e *Endpoint) Delete(conf DeleteConfig) []error {
696696
// setDown sets the Endpoint's underlying interface down. If the interface
697697
// cannot be retrieved, returns nil.
698698
func (e *Endpoint) setDown() error {
@@ -794,7 +794,7 @@ index 0000000000..16d42d2e7b
794794
+ return ep.eniIndex
795795
+}
796796
diff --git a/pkg/option/config.go b/pkg/option/config.go
797-
index 0fbbdeb7f0..e38fd79cdb 100644
797+
index 41ce99326c..581382cacc 100644
798798
--- a/pkg/option/config.go
799799
+++ b/pkg/option/config.go
800800
@@ -40,6 +40,7 @@ import (
@@ -805,7 +805,7 @@ index 0fbbdeb7f0..e38fd79cdb 100644
805805
"github.com/cilium/cilium/pkg/defaults"
806806
"github.com/cilium/cilium/pkg/ip"
807807
ipamOption "github.com/cilium/cilium/pkg/ipam/option"
808-
@@ -2574,7 +2575,8 @@ func (c *DaemonConfig) TunnelingEnabled() bool {
808+
@@ -2573,7 +2574,8 @@ func (c *DaemonConfig) TunnelingEnabled() bool {
809809
func (c *DaemonConfig) AreDevicesRequired() bool {
810810
return c.EnableNodePort || c.EnableHostFirewall || c.EnableWireguard ||
811811
c.EnableHighScaleIPcache || c.EnableL2Announcements || c.ForceDeviceRequired ||
@@ -1311,5 +1311,5 @@ index cd4b2f673e..fceb272841 100644
13111311

13121312
// IPAM is the Cilium specific CNI IPAM configuration
13131313
--
1314-
2.39.5 (Apple Git-154)
1314+
2.50.1 (Apple Git-155)
13151315

‎policy/cilium/0002-bypass-the-node-local-dns-ip.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ index d8871026d5..f7b44be648 100644
3232
ret = ipv4_l3(ctx, ETH_HLEN, NULL, NULL, ip4);
3333
if (ret == CTX_ACT_OK)
3434
--
35-
2.39.5 (Apple Git-154)
35+
2.50.1 (Apple Git-155)
3636

‎policy/cilium/0003-cep-optimize-cep-watch.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,5 +132,5 @@ index ca0c3753c2..70abef8924 100644
132132

133133
if annotationsChanged {
134134
--
135-
2.39.5 (Apple Git-154)
135+
2.50.1 (Apple Git-155)
136136

‎policy/cilium/0004-lb-enable-in-cluster-load-balancer.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ index 486d4669c6..9e453da546 100644
6161
k8sLoadBalancerIPs = parseIPs(loadBalancerIPs)
6262
} else if option.Config.BGPAnnounceLBIP {
6363
diff --git a/pkg/option/config.go b/pkg/option/config.go
64-
index e38fd79cdb..854fd4abc5 100644
64+
index 581382cacc..d082a24585 100644
6565
--- a/pkg/option/config.go
6666
+++ b/pkg/option/config.go
6767
@@ -245,6 +245,9 @@ const (
@@ -84,7 +84,7 @@ index e38fd79cdb..854fd4abc5 100644
8484
// EnableSVCSourceRangeCheck enables check of loadBalancerSourceRanges
8585
EnableSVCSourceRangeCheck bool
8686

87-
@@ -3053,6 +3059,7 @@ func (c *DaemonConfig) Populate(vp *viper.Viper) {
87+
@@ -3052,6 +3058,7 @@ func (c *DaemonConfig) Populate(vp *viper.Viper) {
8888
c.EnableIPIPTermination = vp.GetBool(EnableIPIPTermination)
8989
c.EnableUnreachableRoutes = vp.GetBool(EnableUnreachableRoutes)
9090
c.EnableNodePort = vp.GetBool(EnableNodePort)
@@ -93,5 +93,5 @@ index e38fd79cdb..854fd4abc5 100644
9393
c.EnableHostPort = vp.GetBool(EnableHostPort)
9494
c.EnableHostLegacyRouting = vp.GetBool(EnableHostLegacyRouting)
9595
--
96-
2.39.5 (Apple Git-154)
96+
2.50.1 (Apple Git-155)
9797

‎policy/cilium/0005-deprecated-disable-per-package-lb.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ index 0db9f8a1fa..28ff4c121f 100644
5353
cDefinesMap["HOST_ID"] = fmt.Sprintf("%d", identity.GetReservedID(labels.IDNameHost))
5454
cDefinesMap["WORLD_ID"] = fmt.Sprintf("%d", identity.GetReservedID(labels.IDNameWorld))
5555
diff --git a/pkg/option/config.go b/pkg/option/config.go
56-
index 854fd4abc5..33d18ab335 100644
56+
index d082a24585..ab0731826c 100644
5757
--- a/pkg/option/config.go
5858
+++ b/pkg/option/config.go
5959
@@ -1233,6 +1233,8 @@ const (
@@ -65,7 +65,7 @@ index 854fd4abc5..33d18ab335 100644
6565
)
6666

6767
// Default string arguments
68-
@@ -2435,6 +2437,8 @@ type DaemonConfig struct {
68+
@@ -2434,6 +2436,8 @@ type DaemonConfig struct {
6969
// EnableSocketLBPodConnectionTermination enables the termination of connections from pods
7070
// to deleted service backends when socket-LB is enabled
7171
EnableSocketLBPodConnectionTermination bool
@@ -74,7 +74,7 @@ index 854fd4abc5..33d18ab335 100644
7474
}
7575

7676
var (
77-
@@ -3171,6 +3175,8 @@ func (c *DaemonConfig) Populate(vp *viper.Viper) {
77+
@@ -3170,6 +3174,8 @@ func (c *DaemonConfig) Populate(vp *viper.Viper) {
7878
c.BPFEventsTraceEnabled = vp.GetBool(BPFEventsTraceEnabled)
7979
c.EnableIPSecEncryptedOverlay = vp.GetBool(EnableIPSecEncryptedOverlay)
8080

@@ -84,5 +84,5 @@ index 854fd4abc5..33d18ab335 100644
8484
switch c.ServiceNoBackendResponse {
8585
case ServiceNoBackendResponseReject, ServiceNoBackendResponseDrop:
8686
--
87-
2.39.5 (Apple Git-154)
87+
2.50.1 (Apple Git-155)
8888

‎policy/cilium/0006-gops-allow-disable-gops.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ index 707835d816..0e2da2efa6 100644
2323
addrField := logrus.Fields{"address": addr, logfields.LogSubsys: "gops"}
2424
log = log.WithFields(addrField)
2525
--
26-
2.39.5 (Apple Git-154)
26+
2.50.1 (Apple Git-155)
2727

‎policy/cilium/0007-ctmap-log-ct-gc-status.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ index c4ebecc404..81555cfc8a 100644
3939
}
4040

4141
--
42-
2.39.5 (Apple Git-154)
42+
2.50.1 (Apple Git-155)
4343

‎policy/cilium/0008-Ignore-the-link-local-IPv6-addresses-as-it-is-genera.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ index 0b1187c6dc..f003329fc9 100644
3434
pluginCtx.Logger.WithError(err).WithField(logfields.Interface, link.Attrs().Name).Warn("No valid IPv6 address found")
3535
}
3636
--
37-
2.39.5 (Apple Git-154)
37+
2.50.1 (Apple Git-155)
3838

0 commit comments

Comments
 (0)