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.

Sign up for GitHub

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

Jump to bottom

vagrant: Bump all Vagrant box versions #16589

Merged
merged 1 commit into from Jun 22, 2021
Merged

vagrant: Bump all Vagrant box versions #16589

merged 1 commit into from Jun 22, 2021

Conversation

pchaigno
Copy link
Member

Mostly to pick up the latest commits on bpf-next, which fix vulnerabilities but may increase complexity.

@pchaigno pchaigno added area/CI Continuous Integration testing issue or flake release-note/ci This PR makes changes to the CI. labels Jun 18, 2021
@pchaigno pchaigno marked this pull request as ready for review June 18, 2021 18:38
@pchaigno pchaigno requested a review from a team as a code owner June 18, 2021 18:38
@pchaigno pchaigno requested a review from nbusseneau June 18, 2021 18:38
@pchaigno pchaigno marked this pull request as draft June 21, 2021 22:56
@pchaigno
vagrant: Bump all Vagrant box versions
fb723f8 
Mostly to pick up the latest commits on bpf-next, which fix
vulnerabilities but may increase complexity.

Signed-off-by: Paul Chaignon <paul@cilium.io>
@pchaigno pchaigno marked this pull request as ready for review June 22, 2021 17:46
@pchaigno
Copy link
Member Author

k8s-1.16-kernel-netnext is hitting know flake #13853 and #16402 (comment). Other tests are passing or not covering these changes. The CI team review is covered. Marking as ready to merge.

@pchaigno pchaigno added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 22, 2021
@pchaigno pchaigno removed the request for review from nbusseneau June 22, 2021 17:48
@christarazi christarazi merged commit edf76fb into master Jun 22, 2021
@christarazi christarazi deleted the pr/update-packer-ci-build branch June 22, 2021 19:36
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.10.2 Jun 22, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.9.9 Jun 22, 2021
@pchaigno
Copy link
Member Author

I marked for backports as the net-next bump may impact complexity.

@tklauser tklauser mentioned this pull request Jun 25, 2021
Merged
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.10 in 1.10.2 Jun 25, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.10 in 1.10.2 Jun 25, 2021
@joestringer joestringer mentioned this pull request Jul 21, 2021
Closed
joestringer added a commit to joestringer/cilium that referenced this pull request Jul 21, 2021
@joestringer
backporting: Detect only one related commit
4fe4e41 
Recently, the check-stable script has suggested every single possible
match for commits where the name does not uniquely identify the commit.
This can be a bit confusing to backporters since it looks like there are
many commits to backport as part of this PR, but the second and later
ones are not necessary to backport.

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- cilium#16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb
5bef5d7
4dc60e6
816b323
51826b3
df8238d
a4e7bc6 via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Probably within the last year of commits, we should be able to correlate
the exact commit that needs backporting, so iterate through those to
find the exact commit. If none of those are the correct commit, fail out
and push back to the backporter to figure out.

This allows us to now accurately pick the correct commit in most cases:

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- cilium#16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Manually tested by substituting a known commit into 'related_commits',
and by checking the current v1.8 backports which includes an ambiguous
commit due to a revert+reapply in the master branch.

Signed-off-by: Joe Stringer <joe@cilium.io>
@jibi jibi mentioned this pull request Jul 26, 2021
Merged
@pchaigno
Copy link
Member Author

Removing from v1.9 backports until #16964 is addressed.

brb pushed a commit that referenced this pull request Jul 28, 2021
@joestringer @brb
backporting: Detect only one related commit
9abbbbf 
Recently, the check-stable script has suggested every single possible
match for commits where the name does not uniquely identify the commit.
This can be a bit confusing to backporters since it looks like there are
many commits to backport as part of this PR, but the second and later
ones are not necessary to backport.

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- #16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb
5bef5d7
4dc60e6
816b323
51826b3
df8238d
a4e7bc6 via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Probably within the last year of commits, we should be able to correlate
the exact commit that needs backporting, so iterate through those to
find the exact commit. If none of those are the correct commit, fail out
and push back to the backporter to figure out.

This allows us to now accurately pick the correct commit in most cases:

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- #16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Manually tested by substituting a known commit into 'related_commits',
and by checking the current v1.8 backports which includes an ambiguous
commit due to a revert+reapply in the master branch.

Signed-off-by: Joe Stringer <joe@cilium.io>
pchaigno pushed a commit to pchaigno/cilium that referenced this pull request Jul 28, 2021
@joestringer @pchaigno
backporting: Detect only one related commit
7b23911 
[ upstream commit 9abbbbf ]

Recently, the check-stable script has suggested every single possible
match for commits where the name does not uniquely identify the commit.
This can be a bit confusing to backporters since it looks like there are
many commits to backport as part of this PR, but the second and later
ones are not necessary to backport.

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- cilium#16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb
5bef5d7
4dc60e6
816b323
51826b3
df8238d
a4e7bc6 via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Probably within the last year of commits, we should be able to correlate
the exact commit that needs backporting, so iterate through those to
find the exact commit. If none of those are the correct commit, fail out
and push back to the backporter to figure out.

This allows us to now accurately pick the correct commit in most cases:

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- cilium#16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Manually tested by substituting a known commit into 'related_commits',
and by checking the current v1.8 backports which includes an ambiguous
commit due to a revert+reapply in the master branch.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Paul Chaignon <paul@cilium.io>
pchaigno pushed a commit to pchaigno/cilium that referenced this pull request Jul 28, 2021
@joestringer @pchaigno
backporting: Detect only one related commit
56fc37c 
[ upstream commit 9abbbbf ]

Recently, the check-stable script has suggested every single possible
match for commits where the name does not uniquely identify the commit.
This can be a bit confusing to backporters since it looks like there are
many commits to backport as part of this PR, but the second and later
ones are not necessary to backport.

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- cilium#16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb
5bef5d7
4dc60e6
816b323
51826b3
df8238d
a4e7bc6 via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Probably within the last year of commits, we should be able to correlate
the exact commit that needs backporting, so iterate through those to
find the exact commit. If none of those are the correct commit, fail out
and push back to the backporter to figure out.

This allows us to now accurately pick the correct commit in most cases:

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- cilium#16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Manually tested by substituting a known commit into 'related_commits',
and by checking the current v1.8 backports which includes an ambiguous
commit due to a revert+reapply in the master branch.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Paul Chaignon <paul@cilium.io>
@pchaigno
Copy link
Member Author

Marked again for v1.9 backports as backporting #15397 as well should fix #16964.

@pchaigno pchaigno mentioned this pull request Jul 29, 2021
Merged
pchaigno pushed a commit to pchaigno/cilium that referenced this pull request Jul 29, 2021
@joestringer @pchaigno
backporting: Detect only one related commit
98712ba 
[ upstream commit 9abbbbf ]

Recently, the check-stable script has suggested every single possible
match for commits where the name does not uniquely identify the commit.
This can be a bit confusing to backporters since it looks like there are
many commits to backport as part of this PR, but the second and later
ones are not necessary to backport.

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- cilium#16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb
5bef5d7
4dc60e6
816b323
51826b3
df8238d
a4e7bc6 via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Probably within the last year of commits, we should be able to correlate
the exact commit that needs backporting, so iterate through those to
find the exact commit. If none of those are the correct commit, fail out
and push back to the backporter to figure out.

This allows us to now accurately pick the correct commit in most cases:

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- cilium#16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Manually tested by substituting a known commit into 'related_commits',
and by checking the current v1.8 backports which includes an ambiguous
commit due to a revert+reapply in the master branch.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Paul Chaignon <paul@cilium.io>
vadorovsky pushed a commit that referenced this pull request Jul 30, 2021
@joestringer @vadorovsky
backporting: Detect only one related commit
30a1362 
[ upstream commit 9abbbbf ]

Recently, the check-stable script has suggested every single possible
match for commits where the name does not uniquely identify the commit.
This can be a bit confusing to backporters since it looks like there are
many commits to backport as part of this PR, but the second and later
ones are not necessary to backport.

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- #16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb
5bef5d7
4dc60e6
816b323
51826b3
df8238d
a4e7bc6 via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Probably within the last year of commits, we should be able to correlate
the exact commit that needs backporting, so iterate through those to
find the exact commit. If none of those are the correct commit, fail out
and push back to the backporter to figure out.

This allows us to now accurately pick the correct commit in most cases:

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- #16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Manually tested by substituting a known commit into 'related_commits',
and by checking the current v1.8 backports which includes an ambiguous
commit due to a revert+reapply in the master branch.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Paul Chaignon <paul@cilium.io>
vadorovsky pushed a commit that referenced this pull request Aug 1, 2021
@joestringer @vadorovsky
backporting: Detect only one related commit
117c3c5 
[ upstream commit 9abbbbf ]

Recently, the check-stable script has suggested every single possible
match for commits where the name does not uniquely identify the commit.
This can be a bit confusing to backporters since it looks like there are
many commits to backport as part of this PR, but the second and later
ones are not necessary to backport.

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- #16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb
5bef5d7
4dc60e6
816b323
51826b3
df8238d
a4e7bc6 via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Probably within the last year of commits, we should be able to correlate
the exact commit that needs backporting, so iterate through those to
find the exact commit. If none of those are the correct commit, fail out
and push back to the backporter to figure out.

This allows us to now accurately pick the correct commit in most cases:

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- #16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Manually tested by substituting a known commit into 'related_commits',
and by checking the current v1.8 backports which includes an ambiguous
commit due to a revert+reapply in the master branch.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Paul Chaignon <paul@cilium.io>
vadorovsky pushed a commit that referenced this pull request Aug 1, 2021
@joestringer @vadorovsky
backporting: Detect only one related commit
d7e276f 
[ upstream commit 9abbbbf ]

Recently, the check-stable script has suggested every single possible
match for commits where the name does not uniquely identify the commit.
This can be a bit confusing to backporters since it looks like there are
many commits to backport as part of this PR, but the second and later
ones are not necessary to backport.

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- #16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb
5bef5d7
4dc60e6
816b323
51826b3
df8238d
a4e7bc6 via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Probably within the last year of commits, we should be able to correlate
the exact commit that needs backporting, so iterate through those to
find the exact commit. If none of those are the correct commit, fail out
and push back to the backporter to figure out.

This allows us to now accurately pick the correct commit in most cases:

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- #16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Manually tested by substituting a known commit into 'related_commits',
and by checking the current v1.8 backports which includes an ambiguous
commit due to a revert+reapply in the master branch.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Paul Chaignon <paul@cilium.io>
@joestringer joestringer added this to Backport pending to v1.9 in 1.9.11 Sep 1, 2021
@joestringer joestringer removed this from Needs backport from master in 1.9.10 Sep 1, 2021
@joestringer joestringer removed this from Backport pending to v1.9 in 1.9.11 Sep 1, 2021
@joestringer joestringer added this to Backport done to v1.9 in 1.9.10 Sep 1, 2021
@joestringer joestringer mentioned this pull request Sep 1, 2021
Merged
krishgobinath pushed a commit to krishgobinath/cilium that referenced this pull request Oct 20, 2021
@joestringer
backporting: Detect only one related commit
86ae55c 
Recently, the check-stable script has suggested every single possible
match for commits where the name does not uniquely identify the commit.
This can be a bit confusing to backporters since it looks like there are
many commits to backport as part of this PR, but the second and later
ones are not necessary to backport.

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- cilium#16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb
5bef5d7
4dc60e6
816b323
51826b3
df8238d
a4e7bc6 via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Probably within the last year of commits, we should be able to correlate
the exact commit that needs backporting, so iterate through those to
find the exact commit. If none of those are the correct commit, fail out
and push back to the backporter to figure out.

This allows us to now accurately pick the correct commit in most cases:

 * PR: 16589 -- vagrant: Bump all Vagrant box versions (@pchaigno) -- cilium#16589
   Merge with 1 commit(s) merged at: Tue, 22 Jun 2021 12:36:17 -0700!
     Branch:     master (!)                          refs/pull/16589/head
                 ----------                          -------------------
     v (start)
     |  edf76fb via fb723f8 ("vagrant: Bump all Vagrant box versions")
     v (end)

Manually tested by substituting a known commit into 'related_commits',
and by checking the current v1.8 backports which includes an ambiguous
commit due to a revert+reapply in the master branch.

Signed-off-by: Joe Stringer <joe@cilium.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tklauser tklauser tklauser approved these changes

Assignees
No one assigned
Labels
area/CI Continuous Integration testing issue or flake ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/ci This PR makes changes to the CI.
Projects
No open projects
1.10.2
Backport done to v1.10
1.9.10
Backport done to v1.9
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@pchaigno @tklauser @twpayne @jibi @joestringer @christarazi @nbusseneau