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-26 #27095

Merged
merged 2 commits into from Jul 31, 2023
Merged

v1.13 Backports 2023-07-26 #27095

merged 2 commits into from Jul 31, 2023

Conversation

nbusseneau
Copy link
Member

@nbusseneau nbusseneau commented Jul 26, 2023

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

for pr in 27002 27014; do contrib/backporting/set-labels.py $pr done 1.13; done

or with

make add-labels BRANCH=v1.13 ISSUES=27002,27014

@nbusseneau nbusseneau 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 26, 2023
@nbusseneau nbusseneau marked this pull request as ready for review July 26, 2023 16:10
@nbusseneau nbusseneau requested review from a team as code owners July 26, 2023 16:10
@nbusseneau nbusseneau force-pushed the pr/v1.13-backport-2023-07-26 branch from 8d6ac82 to f855856 Compare July 26, 2023 16:15
@nbusseneau
Copy link
Member Author

/test-backport-1.13

@nbusseneau
Copy link
Member Author

Note for maintainers:

After merge, the following checks will need to be unmarked as required on v1.13:

  • gateway-api-conformance-test

(note: ingress-conformance-test should also have been in this list, but it seems we had missed to mark it previously)

And the following checks will need to be marked as required instead:

  • ConformanceGatewayAPI
  • ConformanceIngress

@joestringer joestringer added the dont-merge/wait-until-release Freeze window for current release is blocking non-bugfix PRs label Jul 26, 2023
@joestringer
Copy link
Member

@cilium/tophat, feel free to approve but I'll take care of merge after releases since I can then adjust the branch protection immediately afterwards.

michi-covalent and others added 2 commits July 31, 2023 16:15
[ upstream commit 7a9447d ]

Use Ariane to trigger all the required workflows so that they get marked
as skipped when they get skipped.

Fixes #26968

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 944dddf ]

To generate the gRPC API reference, we copy the "api" repository at the
root of the repository to "Documentation/_api". This step is required
everywhere we need to build the docs:

  - Locally, we run it through the "copy-api" target in
    Documentation/Makefile, before generating the HTML.
  - Same thing for the Netlify preview, where "copy-api" is a dependency
    for the "html-netlify" target.
  - However, on ReadTheDocs, where we generate and host the online
    documentation, we do not perform this step; nor do we use the
    Makefile at all.

As a workaround, let's simplify the way we access the API reference.
Instead of copying the docs, just symlink them from the Documentation
directory.

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
@nbusseneau nbusseneau force-pushed the pr/v1.13-backport-2023-07-26 branch from f855856 to 6a8c102 Compare July 31, 2023 14:16
@nbusseneau
Copy link
Member Author

Rebased following conflict with ce3a511 which was merged before this PR. No need to re-trigger any CI.

@nbusseneau nbusseneau added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. and removed dont-merge/wait-until-release Freeze window for current release is blocking non-bugfix PRs labels Jul 31, 2023
@aanm aanm merged commit 279f550 into v1.13 Jul 31, 2023
32 of 33 checks passed
@aanm aanm deleted the pr/v1.13-backport-2023-07-26 branch July 31, 2023 14:25
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

7 participants