Skip to content

API-1820: Bump 1.30#441

Merged
openshift-merge-bot[bot] merged 5 commits intoopenshift:masterfrom
dinhxuanvu:bump-1.30
Oct 29, 2024
Merged

API-1820: Bump 1.30#441
openshift-merge-bot[bot] merged 5 commits intoopenshift:masterfrom
dinhxuanvu:bump-1.30

Conversation

@dinhxuanvu
Copy link
Copy Markdown
Contributor

@dinhxuanvu dinhxuanvu commented Aug 6, 2024

No description provided.

@openshift-ci openshift-ci Bot requested review from abhgupta and adambkaplan August 6, 2024 15:31
@dinhxuanvu dinhxuanvu mentioned this pull request Aug 6, 2024
Merged
tkashem
tkashem reviewed Aug 20, 2024
View reviewed changes
Comment thread go.mod
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 23, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 23, 2024
@dinhxuanvu dinhxuanvu force-pushed the bump-1.30 branch 5 times, most recently from 2055257 to a5f2adf Compare September 27, 2024 01:40
@ardaguclu ardaguclu mentioned this pull request Sep 27, 2024
Merged
@Prashanth684 Prashanth684 mentioned this pull request Sep 30, 2024
Merged
@p0lyn0mial p0lyn0mial mentioned this pull request Oct 1, 2024
Closed
@p0lyn0mial
Copy link
Copy Markdown
Contributor

p0lyn0mial commented Oct 4, 2024

ci/prow/e2e-aws-ovn-builds should be green before we merge this PR, we need to wait for openshift/origin#29134

@dinhxuanvu
bump(kubernetes,kubernetes-apiserver,api,k8s.io/*)
ebfec26 
Signed-off-by: Vu Dinh <vudinh@outlook.com>
@dinhxuanvu
go mod update
8661c1a 
Signed-off-by: Vu Dinh <vudinh@outlook.com>
@dinhxuanvu dinhxuanvu mentioned this pull request Oct 4, 2024
Closed
@ardaguclu
Copy link
Copy Markdown
Member

ardaguclu commented Oct 7, 2024

Failures look unrelated and the e2e-aws-ovn-builds should be fixed
/retest

p0lyn0mial
p0lyn0mial reviewed Oct 7, 2024
View reviewed changes
Comment thread hack/update-generated-conversions.sh Outdated
Comment thread hack/update-generated-conversions.sh
Comment thread hack/update-generated-conversions.sh Outdated
Comment thread hack/update-generated-conversions.sh Outdated
benluddy
benluddy reviewed Oct 7, 2024
View reviewed changes
Comment thread hack/update-generated-conversions.sh Outdated
Comment thread hack/update-generated-conversions.sh Outdated
Comment thread hack/update-generated-conversions.sh
Comment thread hack/update-generated-conversions.sh Outdated
Comment thread hack/verify-generated-conversions.sh
dinhxuanvu
dinhxuanvu commented Oct 16, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor Author

@dinhxuanvu dinhxuanvu left a comment

Choose a reason for hiding this comment

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

Updated. PTAL

Comment thread hack/verify-generated-conversions.sh
Comment thread hack/update-generated-conversions.sh Outdated
Comment thread hack/update-generated-conversions.sh Outdated
Comment thread hack/update-generated-conversions.sh
@dinhxuanvu dinhxuanvu changed the title Bump 1.30 API-1820: Bump 1.30 Oct 16, 2024
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Oct 16, 2024 •
edited by openshift-ci Bot
Loading

@dinhxuanvu: This pull request references API-1820 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target either version "4.18." or "openshift-4.18.", but it targets "openshift-4.17" instead.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 16, 2024
@p0lyn0mial
Copy link
Copy Markdown
Contributor

p0lyn0mial commented Oct 25, 2024

kubernetes/kubernetes#128259 has been merged and will be available in 1.32+.

To properly integrate the patch, we would need to move it to https://github.com/openshift/kubernetes-code-generator and then use this repository in OAS.

I don't thinks it's worth the effort, so I'm fine with using the temporary hack for the next two releases.
@dinhxuanvu , please restore your hack, add a comment explaining that it's a temporary solution, and indicate that it will be removed in 1.32. Please also include instructions on what exactly needs to be removed.

@dinhxuanvu
Copy link
Copy Markdown
Contributor Author

dinhxuanvu commented Oct 25, 2024

@p0lyn0mial Done.

@ardaguclu
Copy link
Copy Markdown
Member

ardaguclu commented Oct 25, 2024

Unrelated;
/test e2e-aws-ovn-upgrade

@dinhxuanvu
Copy link
Copy Markdown
Contributor Author

dinhxuanvu commented Oct 25, 2024

/retest-required

p0lyn0mial
p0lyn0mial reviewed Oct 25, 2024
View reviewed changes
Comment thread hack/update-generated-openapi.sh Outdated
@benluddy
Copy link
Copy Markdown
Contributor

benluddy commented Oct 25, 2024

I don't thinks it's worth the effort, so I'm fine with using the temporary hack for the next two releases.
@dinhxuanvu , please restore your hack, add a comment explaining that it's a temporary solution, and indicate that it will be removed in 1.32. Please also include instructions on what exactly needs to be removed.

👍 That sounds fine. It's hard to imagine a patch that would be backported that would also break the workaround.

@dinhxuanvu
Copy link
Copy Markdown
Contributor Author

dinhxuanvu commented Oct 25, 2024

Updated and ready to go.

@p0lyn0mial
Copy link
Copy Markdown
Contributor

p0lyn0mial commented Oct 28, 2024

/lgtm

/hold
Since @benluddy also reviewed this PR, I'm holding it so he can have a final look.

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 28, 2024
@openshift-ci openshift-ci Bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 28, 2024
p0lyn0mial
p0lyn0mial reviewed Oct 28, 2024
View reviewed changes
Comment thread hack/update-generated-conversions.sh Outdated
@dinhxuanvu
Fix codegen scripts
a2c9db4 
This is a temporary solution due to the loss of --build-tag flag which is restored
in k8s 1.31 (see kubernetes/kubernetes#128259). When openshift-apiserver is
rebased to 1.32, the custom build tag `--build-tag=ignore_autogenerated_openshift`
will be added back to codegen cmd.

Signed-off-by: Vu Dinh <vudinh@outlook.com>
@dinhxuanvu
Make update
1df7309 
Signed-off-by: Vu Dinh <vudinh@outlook.com>
@dinhxuanvu
Update openshiftadmission code
01f9602 
Signed-off-by: Vu Dinh <vudinh@outlook.com>
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 28, 2024
@p0lyn0mial
Copy link
Copy Markdown
Contributor

p0lyn0mial commented Oct 28, 2024

/lgtm
/hold cancel

@openshift-ci openshift-ci Bot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Oct 28, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 28, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dinhxuanvu, p0lyn0mial

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Oct 28, 2024

/retest-required

Remaining retests: 0 against base HEAD cb67691 and 2 for PR HEAD 01f9602 in total

1 similar comment
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Oct 28, 2024

/retest-required

Remaining retests: 0 against base HEAD cb67691 and 2 for PR HEAD 01f9602 in total

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 29, 2024 •
edited
Loading

@dinhxuanvu: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-ovn-cmd 01f9602 link false /test e2e-aws-ovn-cmd

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Oct 29, 2024

/retest-required

Remaining retests: 0 against base HEAD cb67691 and 2 for PR HEAD 01f9602 in total

@openshift-merge-bot openshift-merge-bot Bot merged commit f52627a into openshift:master Oct 29, 2024
@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Oct 29, 2024

[ART PR BUILD NOTIFIER]

Distgit: ose-openshift-apiserver
This PR has been included in build ose-openshift-apiserver-container-v4.18.0-202410292107.p0.gf52627a.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@benluddy benluddy benluddy left review comments

@p0lyn0mial p0lyn0mial p0lyn0mial left review comments

@abhgupta abhgupta Awaiting requested review from abhgupta

@adambkaplan adambkaplan Awaiting requested review from adambkaplan

+1 more reviewer

@tkashem tkashem tkashem left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@p0lyn0mial p0lyn0mial

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@dinhxuanvu @p0lyn0mial @ardaguclu @openshift-ci-robot @benluddy @openshift-bot @tkashem @openshift-merge-robot