Merge pull request #1527 from cybozu/cilium-1.15.13-patched

cilium: apply patches to 1.15.13
cybozu · Feb 18, 2025 · 98f1570 · 98f1570
2 parents 86d1952 + 4e93b23
commit 98f1570
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/cilium-operator-generic/BRANCH b/cilium-operator-generic/BRANCH
@@ -1 +1 @@
-1.14
+1.15
diff --git a/cilium-operator-generic/Dockerfile b/cilium-operator-generic/Dockerfile
@@ -10,7 +10,7 @@ COPY TAG /
 # LICENSE.all
 WORKDIR /go/src/github.com/cybozu-go/
 RUN VERSION=$(cut -d \. -f 1,2,3 < /TAG ) \
-    && BRANCH=v${VERSION}-lbsvc-patch \
+    && BRANCH=v${VERSION}-cybozu \
     && git clone --depth 1 --branch ${BRANCH} https://github.com/cybozu-go/cilium \
     && cd cilium \
     && make licenses-all \

diff --git a/cilium-operator-generic/TAG b/cilium-operator-generic/TAG
@@ -1 +1 @@
-1.14.14.2
+1.15.13.2
diff --git a/cilium/Makefile b/cilium/Makefile
@@ -1,5 +1,5 @@
-CILIUM_REPO ?= https://github.com/cilium/cilium.git
-CILIUM_TARGET ?= v$(shell cat TAG | cut -d'.' -f1-3)
+CILIUM_REPO ?= https://github.com/cybozu-go/cilium.git
+CILIUM_TARGET ?= v$(shell cat TAG | cut -d'.' -f1-3)-cybozu
 CILIUM_IMAGE_TOOLS_REPO ?= https://github.com/cilium/image-tools.git
 CILIUM_IMAGE_TOOLS_TARGET ?= ff8fb49706288a4b2346abc274e7a2f84d7dc02c
 CILIUM_PROXY_REPO ?= https://github.com/cilium/proxy.git

diff --git a/cilium/TAG b/cilium/TAG
@@ -1 +1 @@
-1.15.13.1
+1.15.13.2