[ci skip] 2024.10.01-31796

cybozu-go · Oct 1, 2024 · a0804c0 · a0804c0
2 parents 4dfacaa + 32c68b2
commit a0804c0
Show file tree

Hide file tree

Showing 10 changed files with 742 additions and 285 deletions.
diff --git a/Makefile b/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)-lb-dsr-patch https://github.com/cybozu-go/cilium /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
 	cd /tmp/work-cilium
 	$(HELM) template /tmp/work-cilium/install/kubernetes/cilium/ \
 		--namespace=kube-system \

diff --git a/artifacts.go b/artifacts.go
diff --git a/artifacts_ignore.yaml b/artifacts_ignore.yaml
@@ -1,12 +1,4 @@
 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:

diff --git a/cilium/base/aggregate_cluster_role.yaml b/cilium/base/aggregate_cluster_role.yaml
@@ -50,6 +50,9 @@ rules:
   - ciliumexternalworkloads
   - ciliumexternalworkloads/finalizers
   - ciliumexternalworkloads/status
+  - ciliumcidrgroups
+  - ciliumcidrgroups/finalizers
+  - ciliumcidrgroups/status
   verbs:
   - "get"
   - "list"