Skip to content

[v1.7] Dockerfile: Bump cilium-runtime image#12371

Merged
joestringer merged 2 commits intov1.7from
pr/1.7-bump-cilium-runtime
Jul 2, 2020
Merged

[v1.7] Dockerfile: Bump cilium-runtime image#12371
joestringer merged 2 commits intov1.7from
pr/1.7-bump-cilium-runtime

Conversation

@christarazi
Copy link
Copy Markdown
Member

@christarazi christarazi commented Jul 1, 2020

No description provided.

@maintainer-s-little-helper maintainer-s-little-helper Bot added backport/1.7 kind/backports This PR provides functionality previously merged into master. labels Jul 1, 2020
@christarazi christarazi changed the title [v1.7] Bump cilium-runtime image [v1.7] Dockerfile: Bump cilium-runtime image Jul 1, 2020
@christarazi christarazi marked this pull request as ready for review July 1, 2020 21:00
@christarazi christarazi requested a review from a team as a code owner July 1, 2020 21:00
@christarazi
Copy link
Copy Markdown
Member Author

christarazi commented Jul 1, 2020

test-backport-1.7

@joestringer joestringer mentioned this pull request Jul 1, 2020
Merged
@joestringer
Copy link
Copy Markdown
Member

joestringer commented Jul 2, 2020 •
edited
Loading

Failed Cilium-Ginkgo-Tests with #12374. All other tests pass.

@joestringer
Copy link
Copy Markdown
Member

joestringer commented Jul 2, 2020

test-backport-1.7

@joestringer
Copy link
Copy Markdown
Member

joestringer commented Jul 2, 2020

Hit #12374 again, along with managed etcd flake: https://jenkins.cilium.io/job/Cilium-PR-Ginkgo-Tests-Validated/19793/

@joestringer
Copy link
Copy Markdown
Member

joestringer commented Jul 2, 2020

Running v1.7 branch without this commit to see whether the breakage is already in the tree or possibly introduced by the runtime image bump:

#12376

@joestringer joestringer mentioned this pull request Jul 2, 2020
Closed
26 tasks
@joestringer
Copy link
Copy Markdown
Member

joestringer commented Jul 2, 2020 •
edited
Loading

Investigation with @jrfastab reveals this appears to be directly relevant to the changes in this PR, because apparently the cilium-runtime dockerfile in v1.7 branch will pull latest bpftool, which is introducing this regression.

We can solve this by modifying the runtime image for v1.7 to pull a known stable kernel tree SHA for bpftool and deploying that instead of latest bpf-next.

@joestringer joestringer force-pushed the pr/1.7-bump-cilium-runtime branch from 7b5b10d to 286ccd7 Compare July 2, 2020 17:16
jrfastab
jrfastab approved these changes Jul 2, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@jrfastab jrfastab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks reasonable to me. And fixing bpf-next bug now.

@joestringer
Copy link
Copy Markdown
Member

joestringer commented Jul 2, 2020

I built a new cilium-runtime image with bpftool generated from the stable Linux 5.4 tree rather than from bpf-next latest so this should resolve the issue we were hitting in CI.

@joestringer
Copy link
Copy Markdown
Member

joestringer commented Jul 2, 2020

test-backport-1.7

@joestringer
Copy link
Copy Markdown
Member

joestringer commented Jul 2, 2020

I realised that commit d7c3061 specifically tried to bring in a newer version of bpftool than would be available in v5.4 so it's probably better to bump to stable release 5.7 since the above commit was in February; 5.6 was in May which means 5.7 would merge in the bpf-next from that time to include the change.

@joestringer joestringer force-pushed the pr/1.7-bump-cilium-runtime branch from 286ccd7 to 9fbd973 Compare July 2, 2020 17:27
joestringer and others added 2 commits July 2, 2020 10:37
@joestringer
contrib: Anchor bpftool to stable 5.7.x tree
f5ae928 
Generate bpftool binaries from a known stable release rather than the
latest development tree.

Signed-off-by: Joe Stringer <joe@cilium.io>
@christarazi @joestringer
Dockerfile: Bump cilium-runtime image
a555e6b 
Signed-off-by: Chris Tarazi <chris@isovalent.com>
Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer force-pushed the pr/1.7-bump-cilium-runtime branch from 9fbd973 to a555e6b Compare July 2, 2020 17:38
@joestringer
Copy link
Copy Markdown
Member

joestringer commented Jul 2, 2020

test-backport-1.7

@joestringer
Copy link
Copy Markdown
Member

joestringer commented Jul 2, 2020

Previously-failing test is already showing to be passing: https://jenkins.cilium.io/job/Cilium-PR-Ginkgo-Tests-Validated/19797/execution/node/174/log/

@maintainer-s-little-helper maintainer-s-little-helper Bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jul 2, 2020
@joestringer joestringer merged commit 55893b8 into v1.7 Jul 2, 2020
@joestringer joestringer deleted the pr/1.7-bump-cilium-runtime branch July 2, 2020 21:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@joestringer joestringer joestringer approved these changes

@jrfastab jrfastab jrfastab approved these changes

Assignees

No one assigned

Labels

kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@christarazi @joestringer @jrfastab