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

OCPBUGS-1730: Bump vendored K8S libraries to 1.25.2 #421

Merged
merged 1 commit into from
Oct 6, 2022

Conversation

gcs278
Copy link
Contributor

@gcs278 gcs278 commented Sep 26, 2022

Update k8s.io/api, k8s.io/apimachinery, k8s.io/apiserver, and k8s.io/client-go to v0.25.2 which maps to the overall 1.25 kubernetes release. Also bump github.com/openshift/library-go for its 1.25 support. All other vendor updates were automatically included as a part of these updates.

@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Sep 26, 2022
@openshift-ci-robot
Copy link
Contributor

@gcs278: This pull request references Jira Issue OCPBUGS-1730, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.12.0) matches configured target version for branch (4.12.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @ShudiLi

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Update k8s.io/api, k8s.io/apimachinery, k8s.io/apiserver, and k8s.io/client-go to v0.25.2 which maps to the overall 1.25 kubernetes release. Also bump github.com/openshift/library-go for its 1.25 support. All other vendor updates were automatically included as a part of these updates.

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/test-infra repository.

@gcs278
Copy link
Contributor Author

gcs278 commented Sep 27, 2022

nothing specific about router and OVNKubernetesControllerDisconnectedSouthboundDatabase issues
/retest

@Miciah
Copy link
Contributor

Miciah commented Sep 28, 2022

/assign

@gcs278
Copy link
Contributor Author

gcs278 commented Sep 28, 2022

/retest

@brandisher
Copy link

/assign

@candita
Copy link
Contributor

candita commented Sep 28, 2022

/assign @Miciah

@@ -0,0 +1,819 @@
{{/*

Choose a reason for hiding this comment

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

Is this file intentionally included as part of the bump?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Whoops I have no clue where this came from. Thanks for catching this, I don't think this is part of the vendor bump... Maybe it was just sitting in my repo when I did the bump.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah yea now I know. I created this file to test an alternative haproxy configuration. I didn't catch that it was still hanging out.

@@ -9,7 +9,7 @@ require (
github.com/fortytw2/leaktest v1.3.0
github.com/fsnotify/fsnotify v1.4.9
github.com/gocarina/gocsv v0.0.0-20190927101021-3ecffd272576
github.com/google/go-cmp v0.5.5
github.com/google/go-cmp v0.5.8
github.com/haproxytech/config-parser/v4 v4.0.0-rc1
github.com/openshift/api v0.0.0-20211201130627-34f305c3af47

Choose a reason for hiding this comment

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

Does this need a bump as well? It looks like it was done for cluster-ingress-operator in #829

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry just saw this comment. Hmmm, that's strange. I didn't explicitly do the bump of openshift/api in cluster-ingress-operator and nor did I do it here. Not sure why this didn't bump, but maybe it's a dependency chain that openshift/router is not triggering?
Do you think I should bump openshift/api to it's K8S API bump regardless? I'm not sure.

Choose a reason for hiding this comment

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

I'd be inclined to say "no" only because if the router doesn't need the bump, then we probably don't gain anything by bumping it aside from keeping the future delta of the API changes smaller. WDYT @Miciah ?

Copy link
Contributor

Choose a reason for hiding this comment

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

Bumping openshift/api isn't necessary. There are no changes in it that would directly affect openshift/router.

@gcs278
Copy link
Contributor Author

gcs278 commented Sep 28, 2022

/retest

1 similar comment
@gcs278
Copy link
Contributor Author

gcs278 commented Sep 28, 2022

/retest

@ShudiLi
Copy link
Member

ShudiLi commented Sep 29, 2022

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Sep 29, 2022
@gcs278
Copy link
Contributor Author

gcs278 commented Oct 3, 2022

Lots of errors, installation probably went wrong.
/retest

@brandisher
Copy link

Aside from the one pending (albiet non-blocking) question here these changes look good to me and I don't see any issues. If we do indeed need to bump openshift/api it can be done in another PR.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 3, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 3, 2022

@gcs278: all tests passed!

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/test-infra repository. I understand the commands that are listed here.

@gcs278
Copy link
Contributor Author

gcs278 commented Oct 4, 2022

@Miciah this should be ready for you to review and approve

@Miciah
Copy link
Contributor

Miciah commented Oct 6, 2022

/lgtm
/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 6, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Miciah

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 Oct 6, 2022
@openshift-merge-robot openshift-merge-robot merged commit 0cf6d57 into openshift:master Oct 6, 2022
@openshift-ci-robot
Copy link
Contributor

@gcs278: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-1730 has been moved to the MODIFIED state.

In response to this:

Update k8s.io/api, k8s.io/apimachinery, k8s.io/apiserver, and k8s.io/client-go to v0.25.2 which maps to the overall 1.25 kubernetes release. Also bump github.com/openshift/library-go for its 1.25 support. All other vendor updates were automatically included as a part of these updates.

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/test-infra repository.

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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants