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

v1.13 Backports 2023-07-10 #26737

Merged
merged 4 commits into from
Jul 11, 2023
Merged

v1.13 Backports 2023-07-10 #26737

merged 4 commits into from
Jul 11, 2023

Conversation

jibi
Copy link
Member

@jibi jibi commented Jul 10, 2023

Once this PR is merged, you can update the PR labels via:

for pr in 25393 26316 26590 26715; do contrib/backporting/set-labels.py $pr done 1.13; done

or with

make add-labels BRANCH=v1.13 ISSUES=25393,26316,26590,26715

dependabot bot and others added 4 commits July 10, 2023 14:01
[ upstream commit 3a3f135 ]

Bumps [github.com/docker/distribution](https://github.com/docker/distribution) from 2.8.1+incompatible to 2.8.2+incompatible.
- [Release notes](https://github.com/docker/distribution/releases)
- [Commits](distribution/distribution@v2.8.1...v2.8.2)

---
updated-dependencies:
- dependency-name: github.com/docker/distribution
  dependency-type: indirect
...

backporting conflicts:
* had to rerun go mod tidy

Signed-off-by: dependabot[bot] <support@github.com>
[ upstream commit d1b6815 ]

backporting conflicts:
* had to rerun go mod tidy

Signed-off-by: renovate[bot] <bot@renovateapp.com>
[ upstream commit 8a5f1c6 ]

The CRD spec of CiliumBGPPeeringPolicy states

```
NodeSelector selects a group of nodes where this BGP Peering Policy
applies. If empty / nil this policy applies to all nodes.
```

However, our current implementation treats empty / nil selector as an
error. This commit fixes it.

Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 1f35baf ]

Both of these workflows use binaries that are built in CI making use of
various vendored dependencies, so run them as well on PRs only changing
vendor/.

backporting conflicts:
* tests-datapath-verifier.yaml doesn't exist in the v1.13 branch

Signed-off-by: Tobias Klauser <tobias@cilium.io>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
@jibi jibi added kind/backports This PR provides functionality previously merged into master. backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. labels Jul 10, 2023
Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

Looks good for my change. Thanks for adding a note about conflicts.

@jibi
Copy link
Member Author

jibi commented Jul 10, 2023

/test-backport-1.13

@jibi jibi marked this pull request as ready for review July 10, 2023 22:06
@jibi jibi requested a review from a team as a code owner July 10, 2023 22:06
Copy link
Member

@YutaroHayakawa YutaroHayakawa left a comment

Choose a reason for hiding this comment

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

Thanks!

@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 11, 2023
@julianwiedmann julianwiedmann merged commit c18c2a3 into v1.13 Jul 11, 2023
115 checks passed
@julianwiedmann julianwiedmann deleted the pr/v1.13-backport-2023-07-10 branch July 11, 2023 05:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. 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
Development

Successfully merging this pull request may close these issues.

None yet

4 participants