Merge pull request #548 from l1b0k/main

policy: update policy image

Dockerfile

@@ -1,4 +1,4 @@
-ARG TERWAY_POLICY_IMAGE=registry.cn-hongkong.aliyuncs.com/acs/terway:policy-20231127-4fac1ee7@sha256:0d0f47af6a0d6ef9c07f1af6791ff0a79c061489aaf0319494f0f8c289fd1e32
+ARG TERWAY_POLICY_IMAGE=registry.cn-hongkong.aliyuncs.com/acs/terway:policy-20231222-e587c3c9@sha256:2e2d936d95a8eb4f0c822ce7b00dcfbbd0a3a4b0886655d321b19cdfb9b0c034
 ARG UBUNTU_IMAGE=registry.cn-hangzhou.aliyuncs.com/acs/ubuntu:20.04-update
 ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:547db7ec9a750b8f888a506709adb41f135b952e@sha256:4d6fa0aede3556c5fb5a9c71bc6b9585475ac9b1064f516d4c45c8fb691c9d9e
 ARG CILIUM_BPFTOOL_IMAGE=quay.io/cilium/cilium-bpftool:78448c1a37ff2b790d5e25c3d8b8ec3e96e6405f@sha256:99a9453a921a8de99899ef82e0822f0c03f65d97005c064e231c06247ad8597d
@@ -22,7 +22,7 @@ RUN go mod download
 COPY . .
 RUN cd cmd/terway && CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -tags default_build \
     -ldflags \
-    "-X \"github.com/AliyunContainerService/terway/pkg/version.gitCommit=`git rev-parse HEAD`\" \
+    "-s -w -X \"github.com/AliyunContainerService/terway/pkg/version.gitCommit=`git rev-parse HEAD`\" \
     -X \"github.com/AliyunContainerService/terway/pkg/version.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`\" \
     -X \"github.com/AliyunContainerService/terway/pkg/version.gitVersion=`git describe --tags --match='v*' --abbrev=14`\" \
     -X \"github.com/AliyunContainerService/terway/pkg/aliyun.kubernetesAlicloudIdentity=Kubernetes.Alicloud/`git rev-parse --short HEAD 2>/dev/null`\"" -o terwayd .

Dockerfile.policy

@@ -1,4 +1,4 @@
-FROM --platform=$TARGETPLATFORM calico/go-build:v0.75 as felix-builder
+FROM --platform=$TARGETPLATFORM calico/go-build:v0.90 as felix-builder
 ARG GOPROXY
 ENV GOPROXY $GOPROXY
 ENV GIT_BRANCH=v3.24.5
@@ -10,15 +10,15 @@ RUN mkdir -p /go/src/github.com/projectcalico/ && cd /go/src/github.com/projectc
 COPY policy/felix /terway_patch
 RUN cd /go/src/github.com/projectcalico/calico && git apply /terway_patch/*.patch
 RUN cd /go/src/github.com/projectcalico/calico && \
-    go build -v -o bin/calico-felix -v -ldflags \
-    "-X github.com/projectcalico/calico/felix/buildinfo.GitVersion=${GIT_BRANCH} \
+    CGO_ENABLED=0 go build -o bin/calico-felix -ldflags \
+    "-s -w -X github.com/projectcalico/calico/felix/buildinfo.GitVersion=${GIT_BRANCH} \
     -X github.com/projectcalico/calico/felix/buildinfo.BuildDate=$(date -u +'%FT%T%z') \
     -X github.com/projectcalico/calico/felix/buildinfo.GitRevision=${GIT_COMMIT} \
     -B 0x${GIT_COMMIT}" "github.com/projectcalico/calico/felix/cmd/calico-felix" && \
     ( ! $(readelf -d bin/calico-felix | grep -q NEEDED) || ( echo "Error: bin/calico-felix was not statically linked"; false )) \
     && chmod +x /go/src/github.com/projectcalico/calico/bin/calico-felix
 
-FROM --platform=$TARGETPLATFORM quay.io/cilium/cilium-builder:0a47f410d147719a579cd3c069fd0e4a84b8b055@sha256:191db32a7cb4c5143a6fcc8a83ffd9a701925bed7523e6628dc75cbadf694858 as cilium-builder
+FROM --platform=$TARGETPLATFORM quay.io/cilium/cilium-builder:1d3ec0f0b74a32048a9716c7a8ce1eee851ca0ec@sha256:9fab9eb021456705d99b014d2f9e59aff9f50aa1a296aa55e984f3e947a62120 as cilium-builder
 ARG GOPROXY
 ENV GOPROXY $GOPROXY
 ARG CILIUM_SHA=""