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

API-1863: Rebase 1.31 #458

Merged
merged 7 commits into from
Nov 13, 2024
Merged

Conversation

dinhxuanvu
Copy link
Member

No description provided.

@dinhxuanvu
Copy link
Member Author

Waiting for openshift/kubernetes-apiserver#60 to merge first.

@dinhxuanvu dinhxuanvu changed the title Rebase 1.31 API-1820: Rebase 1.31 Nov 6, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 6, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 6, 2024

@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.

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.

@dinhxuanvu dinhxuanvu changed the title API-1820: Rebase 1.31 API-1863: Rebase 1.31 Nov 6, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 6, 2024

@dinhxuanvu: This pull request references API-1863 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 the "4.18.0" version, but no target version was set.

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.

@dinhxuanvu
Copy link
Member Author

/test e2e-aws-ovn-cmd

@dinhxuanvu
Copy link
Member Author

/retest-required

@dinhxuanvu
Copy link
Member Author

/test e2e-aws-ovn-cmd

1 similar comment
@dinhxuanvu
Copy link
Member Author

/test e2e-aws-ovn-cmd

@dinhxuanvu
Copy link
Member Author

@p0lyn0mial @tkashem PTAL

Signed-off-by: Vu Dinh <vudinh@outlook.com>
@dinhxuanvu
Copy link
Member Author

@p0lyn0mial @tkashem Updated and ready for final review.

k8s.io/utils v0.0.0-20230726121419-3b25d923346b
k8s.io/kubectl v0.31.1
k8s.io/kubernetes v1.31.1
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
Copy link
Contributor

Choose a reason for hiding this comment

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

kube in 1.31 uses utils in v0.0.0-20240711033017-18e509b52bc8 version

https://github.com/kubernetes/kubernetes/blob/release-1.31/go.mod#L120C37-L120C49

why not to use the same version ?

Copy link
Member Author

Choose a reason for hiding this comment

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

This is the result of go mod tidy/vendor cmd. I didn't manually change the k8s.io/utils. Only updated the dependencies with semver versioning.

@@ -18,6 +19,7 @@ import (
"k8s.io/client-go/rest"
"k8s.io/component-base/featuregate"
aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver"
controlplaneadmission "k8s.io/kubernetes/pkg/controlplane/apiserver/admission"
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is okay, before we used k8s.io/kubernetes/pkg/kubeapiserver and now we will also be using k8s.io/kubernetes/pkg/controlplane

objectMetaShallowCopy := review.ObjectMeta
objectMetaShallowCopy.Namespace = ""
objectMetaShallowCopy.ManagedFields = nil
if !equality.Semantic.DeepEqual(metav1.ObjectMeta{}, objectMetaShallowCopy) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is also okay, since the resources are not persisted.

dinhxuanvu and others added 6 commits November 13, 2024 04:05
Signed-off-by: Vu Dinh <vudinh@outlook.com>
- update missing genclient:skipVerbs to authorization types
- add validation to require empty ObjectMeta
Signed-off-by: Vu Dinh <vudinh@outlook.com>
Signed-off-by: Vu Dinh <vudinh@outlook.com>
Signed-off-by: Vu Dinh <vudinh@outlook.com>
Signed-off-by: Vu Dinh <vudinh@outlook.com>
@p0lyn0mial
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 13, 2024
Copy link
Contributor

openshift-ci bot commented Nov 13, 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

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 13, 2024
@chiragkyal
Copy link
Member

/test okd-scos-e2e-aws-ovn
/test e2e-aws-ovn-serial

Copy link
Contributor

openshift-ci bot commented Nov 13, 2024

@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/okd-scos-e2e-aws-ovn 65ff9ae link false /test okd-scos-e2e-aws-ovn

Full PR test history. Your PR dashboard.

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-merge-bot openshift-merge-bot bot merged commit 53c5b3a into openshift:master Nov 13, 2024
9 of 10 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-openshift-apiserver
This PR has been included in build ose-openshift-apiserver-container-v4.19.0-202411140108.p0.g53c5b3a.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
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
Development

Successfully merging this pull request may close these issues.

6 participants