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

[release-1.19] Update sigs.k8s.io/gateway-api to 0.8.0 #46677

Merged
merged 5 commits into from
Sep 7, 2023
Merged

[release-1.19] Update sigs.k8s.io/gateway-api to 0.8.0 #46677

merged 5 commits into from
Sep 7, 2023

Conversation

ericvn
Copy link
Contributor

@ericvn ericvn commented Aug 24, 2023 •
edited by istio-policy-bot
Loading

Please provide a description of this PR:

This is a manual cherry-pick of #46674 which is a subset of a larger #46658. We don't want to pull all the changes in (I don't think), so this limits to just the gateway-api.

To help us figure out who should review this PR, please put an X in all the areas that this PR affects.

  • Ambient
  • Configuration Infrastructure
  • Docs
  • Installation
  • Networking
  • Performance and Scalability
  • Policies and Telemetry
  • Security
  • Test and Release
  • User Experience
  • Developer Infrastructure

@ericvn ericvn requested a review from a team as a code owner August 24, 2023 18:28
@istio-policy-bot istio-policy-bot added area/networking release-notes-none Indicates a PR that does not require release notes. labels Aug 24, 2023
@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 24, 2023
@ksubrmnn ksubrmnn added the do-not-merge/hold Block automatic merging of a PR. label Aug 25, 2023
@ksubrmnn
Copy link
Contributor

Hold for 1.19.1

@keithmattix
Copy link
Contributor

Since we need to cut a new rc for #46706, do we want to go ahead and merge this too?

@istio-testing istio-testing added needs-rebase Indicates a PR needs to be rebased before being merged size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 30, 2023
@ksubrmnn
Copy link
Contributor

ksubrmnn commented Aug 30, 2023 •
edited
Loading

Since we need to cut a new rc for #46706, do we want to go ahead and merge this too?

Those changes were just for the samples folder so I don't believe they necessitate a new rc

Edit to add: Saw discussion on other PRs. Let's move to slack.

@istio-testing istio-testing removed the needs-rebase Indicates a PR needs to be rebased before being merged label Aug 30, 2023
@ericvn ericvn changed the title [release-1.19] Update sigs.k8s.io/gateway-api to rc2 [release-1.19] Update sigs.k8s.io/gateway-api to 0.8.0 Aug 30, 2023
@ericvn
Copy link
Contributor Author

ericvn commented Aug 30, 2023

Pulled in changes from #46773 for moving to the actual 0.8.0 release.

@jwendell
Copy link
Member

Pulled in changes from #46773 for moving to the actual 0.8.0 release.

It looks like you missed the tests/integration/pilot/testdata/gateway-api-crd.yaml file

@ericvn
Copy link
Contributor Author

ericvn commented Aug 31, 2023

Pulled in changes from #46773 for moving to the actual 0.8.0 release.

It looks like you missed the tests/integration/pilot/testdata/gateway-api-crd.yaml file

Yep. Looks like that came in a late commit. Pulling that as well.

@ericvn ericvn mentioned this pull request Aug 31, 2023
Merged
@istio-testing istio-testing added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 31, 2023
hanxiaop
hanxiaop reviewed Sep 6, 2023
View reviewed changes
go.mod Outdated
@@ -108,19 +108,19 @@ require (
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.12.2
istio.io/api v1.19.0-rc.0.0.20230828012244-464da4944bb2
istio.io/api v1.19.0-beta.1.0.20230821193953-6d232ba686ad
Copy link
Member

Choose a reason for hiding this comment

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

I think now this can be updated to v1.19.0?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I believe there is a PR to do the that was put on hold.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

See istio/client-go#1739

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Once that PR merges, the pipeline will push the change to istio/istio.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks for the info

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Once that PR merges, the pipeline will push the change to istio/istio.

Or since the pipeline was held, we may find we have a rebase issue, and have to fix it manually. Will know more once these PRs start getting approved/un held.

Copy link
Member

Choose a reason for hiding this comment

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

@ericvn I think one thing may not be correct is the istio/api repo's version is changed from rc to beta

@istio-testing istio-testing added the needs-rebase Indicates a PR needs to be rebased before being merged label Sep 6, 2023
@ericvn ericvn force-pushed the updateGWAPI1.19 branch 2 times, most recently from b44c8e8 to 87bbbae Compare September 6, 2023 23:03
@istio-testing istio-testing removed the needs-rebase Indicates a PR needs to be rebased before being merged label Sep 6, 2023
hanxiaop
hanxiaop approved these changes Sep 7, 2023
View reviewed changes
Copy link
Member

@hanxiaop hanxiaop left a comment

Choose a reason for hiding this comment

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

LGTM, I think I saw the operator/ and test/ changes in the main branch which was also related to the gateway-api bumping.

@ericvn
Copy link
Contributor Author

ericvn commented Sep 7, 2023 •
edited
Loading

The label is typically not indicative of much as the pipeline keeps things in check. At the time this was done, that was likely the correct up-repo commit that matched across repos. But I see something else merged and caused another rebase-needed. Likely an up-repo change merged and got pushed down and I need to pick that up (I suspect it will be the upstream repos moving from beta-> rc necessitating your desired change in this PR).

@ericvn
Copy link
Contributor Author

ericvn commented Sep 7, 2023 •
edited
Loading

Rebased and should be good again. All the repos got back in sync with the build-tools common-files updates across the repos so this PR no longer contains updates in api and client-go.

@ericvn ericvn removed the do-not-merge/hold Block automatic merging of a PR. label Sep 7, 2023
@ericvn
Copy link
Contributor Author

ericvn commented Sep 7, 2023

Letting this merge to prevent any more required rebases and 1.19.0 has been released and this can merge for 1.19.1.

@istio-testing istio-testing merged commit a61bc40 into istio:release-1.19 Sep 7, 2023
27 checks passed
@ericvn ericvn deleted the updateGWAPI1.19 branch September 7, 2023 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hanxiaop hanxiaop hanxiaop approved these changes

Assignees
No one assigned
Labels
area/networking release-notes-none Indicates a PR that does not require release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@ericvn @ksubrmnn @keithmattix @jwendell @hanxiaop @istio-testing @istio-policy-bot