[ci skip] 2024.09.24-31692

Makefile

@@ -82,7 +82,7 @@ update-coil:
 update-cilium: helm
 	rm -rf /tmp/work-cilium
 	mkdir -p /tmp/work-cilium
-	git clone --depth 1 --branch v$(shell echo $(CILIUM_TAG) | cut -d \. -f 1,2,3) https://github.com/cilium/cilium /tmp/work-cilium
+	git clone --depth 1 --branch v$(shell echo $(CILIUM_TAG) | cut -d \. -f 1,2,3)-lb-dsr-patch https://github.com/cybozu-go/cilium /tmp/work-cilium
 	cd /tmp/work-cilium
 	$(HELM) template /tmp/work-cilium/install/kubernetes/cilium/ \
 		--namespace=kube-system \

artifacts_ignore.yaml

@@ -1,4 +1,12 @@
 images:
+- repository: ghcr.io/cybozu/cilium
+  versions: ["1.14.13.1", "1.14.13.2", "1.14.14.1"]
+- repository: ghcr.io/cybozu/cilium-operator-generic
+  versions: ["1.14.13.1", "1.14.14.1"]
+- repository: ghcr.io/cybozu/hubble-relay
+  versions: ["1.14.13.1", "1.14.13.2", "1.14.14.1"]
+- repository: ghcr.io/cybozu/cilium-certgen
+  versions: ["0.1.14.1"]
 - repository: ghcr.io/cybozu/etcd
   versions: ["3.5.15.1"]
 osImage:

cilium/base/aggregate_cluster_role.yaml

@@ -50,9 +50,6 @@ rules:
   - ciliumexternalworkloads
   - ciliumexternalworkloads/finalizers
   - ciliumexternalworkloads/status
-  - ciliumcidrgroups
-  - ciliumcidrgroups/finalizers
-  - ciliumcidrgroups/status
   verbs:
   - "get"
   - "list"

cilium/pre/kustomization.yaml

@@ -33,15 +33,6 @@ patches:
     patch: |-
       - op: remove
         path: /spec/ttlSecondsAfterFinished
-  - target:
-      group: apps
-      version: v1
-      kind: DaemonSet
-      name: cilium
-    patch: |-
-      - op: replace
-        path: /spec/updateStrategy/rollingUpdate/maxUnavailable
-        value: 1
 configMapGenerator:
 - name: cilium-config
   namespace: kube-system