Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cilium 1.14 mixed test 2 #2645

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
8 changes: 4 additions & 4 deletions artifacts.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions artifacts_ignore.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
images:
- repository: ghcr.io/cybozu/cilium
versions: ["1.14.13.1", "1.14.13.2"]
- repository: ghcr.io/cybozu/cilium-operator-generic
versions: ["1.14.13.1"]
- repository: ghcr.io/cybozu/hubble-relay
versions: ["1.14.13.1", "1.14.13.2"]
- repository: ghcr.io/cybozu/cilium-certgen
versions: ["0.1.14.1"]
- repository: ghcr.io/cybozu-go/coil
versions: ["2.7.2"]
osImage:
Expand Down
3 changes: 3 additions & 0 deletions cilium/base/aggregate_cluster_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ rules:
- ciliumexternalworkloads
- ciliumexternalworkloads/finalizers
- ciliumexternalworkloads/status
- ciliumcidrgroups
- ciliumcidrgroups/finalizers
- ciliumcidrgroups/status
verbs:
- "get"
- "list"
Expand Down
Loading