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, cilium-operator-generic, hubble-relay to 1.12.11 #1058

Merged
merged 3 commits into from
Jul 24, 2023
Merged
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
12 changes: 10 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -552,9 +552,12 @@ jobs:
mv /out/linux/amd64/bin/bpftool ../workspace/usr/local/bin/
- run:
name: Build iproute2
# The actual directory name of libbpf.tar.gz after extraction is cilium-libbpf in images/iproute2/checkout-libbpf.
# So we replace libbpf with cilium-libbpf by sed.
command: |
if [ ! -f BUILDS ]; then exit 0; fi
cd src/image-tools
sed -i -e "s/libbpf-/cilium-libbpf-/g" images/iproute2/checkout-libbpf.sh
images/iproute2/checkout-libbpf.sh
images/iproute2/build-libbpf-native.sh
images/iproute2/checkout-iproute2.sh
Expand Down Expand Up @@ -871,9 +874,14 @@ workflows:
name: build-chrony
container-image: chrony
- build-cilium-envoy:
version: 0c056b5821621f5407fd4844a333f25b1157556f
version: ca87bee70e40bfa681d5859e7da4cba6b8ba4e8c
- build-cilium-image-tools:
version: 7d5641cd879c93e8aeffc83407382458a1616aa9
# https://github.com/cilium/image-tools/commits/master
# From this commit, cilium/image-tools stops building iproute2 because of cilium v1.14 doesn't depend on iproute2.
# But, we use v1.12.11, so we still have to build iproute2.
# So we use an older version of image-tools which builds iproute2.
# https://github.com/cilium/image-tools/commit/8a2f099f14330221848c14808f3208e4dd2469bb
version: ff22ba3bff1010f4a2dd76ede789663c3beaf8d2
- build:
name: build-cilium
container-image: cilium
Expand Down
2 changes: 1 addition & 1 deletion cilium-operator-generic/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.12.10.1
1.12.11.1
2 changes: 1 addition & 1 deletion cilium/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.12.10.1
1.12.11.1
2 changes: 1 addition & 1 deletion hubble-relay/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.12.10.1
1.12.11.1