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

[release-4.17] OCPBUGS-38483: Bump to k8s.io v0.30.3, controller-runtime v0.18.4 #422

Open
wants to merge 1 commit into
base: release-4.17
Choose a base branch
from

Conversation

Miciah
Copy link
Contributor

@Miciah Miciah commented Sep 18, 2024

Bump the vendored k8s.io/* packages to v0.30.3; bump the vendored sigs.k8s.io/controller-runtime package to v0.18.4, the latest release, which uses the k8s.io/* v0.30.1 packages; and bump the vendored github.com/openshift/coredns-ocp-dnsnameresolver/operator package to commit 27d076fec9c2eb167469d5aa4a2ed8a29c2c14fc, which uses controller-runtime v0.18.4 and k8s.io/* v0.30.3.

go get k8s.io/[email protected] k8s.io/[email protected] k8s.io/[email protected] k8s.io/[email protected] sigs.k8s.io/[email protected] github.com/openshift/coredns-ocp-dnsnameresolver/operator@27d076fec9c2eb167469d5aa4a2ed8a29c2c14fc
go mod tidy
go mod vendor

Update calls to controller.Watch to adapt to breaking changes in controller-runtime. Namely, the handler and predicate arguments have been removed from Watch and are now specified as options on the source. Additionally, the source.Kind type now has a type parameter, so it is necessary to specify a client.Object type argument.


This is manual backport of #420. For the release-4.17 branch of cluster-dns-operator, we need to use the commit from the corresponding branch of coredns-ocp-dnsnameresolver.

Bump the vendored k8s.io/* packages to v0.30.3; bump the vendored
sigs.k8s.io/controller-runtime package to v0.18.4, the latest release,
which uses the k8s.io/* v0.30.1 packages; and bump the vendored
github.com/openshift/coredns-ocp-dnsnameresolver/operator package to commit
27d076fec9c2eb167469d5aa4a2ed8a29c2c14fc, which uses controller-runtime
v0.18.4 and k8s.io/* v0.30.3.

    go get k8s.io/[email protected] k8s.io/[email protected] k8s.io/[email protected] k8s.io/[email protected] sigs.k8s.io/[email protected] github.com/openshift/coredns-ocp-dnsnameresolver/operator@27d076fec9c2eb167469d5aa4a2ed8a29c2c14fc
    go mod tidy
    go mod vendor

Update calls to controller.Watch to adapt to breaking changes in
controller-runtime.  Namely, the handler and predicate arguments have been
removed from Watch and are now specified as options on the source.
Additionally, the source.Kind type now has a type parameter, so it is
necessary to specify a client.Object type argument.

This commit is related to OCPBUGS-38483.

https://issues.redhat.com/browse/OCPBUGS-38483

* go.mod: Bump.
* go.sum: Regenerate.
* pkg/operator/controller/controller.go (New):
* pkg/operator/controller/status/controller.go (New): Update for the new
controller.Watch and source.Kind type signatures.
* vendor/*: Regenerate.
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 18, 2024
@openshift-ci-robot
Copy link
Contributor

@Miciah: This pull request references Jira Issue OCPBUGS-38483, which is invalid:

  • expected the bug to target either version "4.18." or "openshift-4.18.", but it targets "4.17.0" instead
  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is ON_QA instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

Bump the vendored k8s.io/* packages to v0.30.3; bump the vendored sigs.k8s.io/controller-runtime package to v0.18.4, the latest release, which uses the k8s.io/* v0.30.1 packages; and bump the vendored github.com/openshift/coredns-ocp-dnsnameresolver/operator package to commit 27d076fec9c2eb167469d5aa4a2ed8a29c2c14fc, which uses controller-runtime v0.18.4 and k8s.io/* v0.30.3.

go get k8s.io/[email protected] k8s.io/[email protected] k8s.io/[email protected] k8s.io/[email protected] sigs.k8s.io/[email protected] github.com/openshift/coredns-ocp-dnsnameresolver/operator@27d076fec9c2eb167469d5aa4a2ed8a29c2c14fc
go mod tidy
go mod vendor

Update calls to controller.Watch to adapt to breaking changes in controller-runtime. Namely, the handler and predicate arguments have been removed from Watch and are now specified as options on the source. Additionally, the source.Kind type now has a type parameter, so it is necessary to specify a client.Object type argument.


This is manual backport of #420. For the release-4.17 branch of cluster-dns-operator, we need to use the commit from the corresponding branch of coredns-ocp-dnsnameresolver.

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-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 18, 2024
@Miciah Miciah changed the base branch from master to release-4.17 September 18, 2024 14:48
@openshift-ci-robot
Copy link
Contributor

@Miciah: This pull request references Jira Issue OCPBUGS-38483, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is ON_QA instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bump the vendored k8s.io/* packages to v0.30.3; bump the vendored sigs.k8s.io/controller-runtime package to v0.18.4, the latest release, which uses the k8s.io/* v0.30.1 packages; and bump the vendored github.com/openshift/coredns-ocp-dnsnameresolver/operator package to commit 27d076fec9c2eb167469d5aa4a2ed8a29c2c14fc, which uses controller-runtime v0.18.4 and k8s.io/* v0.30.3.

go get k8s.io/[email protected] k8s.io/[email protected] k8s.io/[email protected] k8s.io/[email protected] sigs.k8s.io/[email protected] github.com/openshift/coredns-ocp-dnsnameresolver/operator@27d076fec9c2eb167469d5aa4a2ed8a29c2c14fc
go mod tidy
go mod vendor

Update calls to controller.Watch to adapt to breaking changes in controller-runtime. Namely, the handler and predicate arguments have been removed from Watch and are now specified as options on the source. Additionally, the source.Kind type now has a type parameter, so it is necessary to specify a client.Object type argument.


This is manual backport of #420. For the release-4.17 branch of cluster-dns-operator, we need to use the commit from the corresponding branch of coredns-ocp-dnsnameresolver.

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.

@Miciah
Copy link
Contributor Author

Miciah commented Sep 18, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 18, 2024
@openshift-ci-robot
Copy link
Contributor

@Miciah: This pull request references Jira Issue OCPBUGS-38483, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-38102 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-38102 targets the "4.18.0" version, which is one of the valid target versions: 4.18.0
  • bug has dependents

Requesting review from QA contact:
/cc @lihongan

In response to this:

/jira refresh

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.

Copy link
Contributor

openshift-ci bot commented Sep 18, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from miciah. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@candita
Copy link
Contributor

candita commented Sep 18, 2024

/assign @rfredette

@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 18, 2024
Copy link
Contributor

openshift-ci bot commented Sep 18, 2024

@Miciah: The following tests 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-operator 28278c7 link true /test e2e-aws-ovn-operator
ci/prow/e2e-aws-ovn-techpreview 28278c7 link false /test e2e-aws-ovn-techpreview
ci/prow/e2e-aws-ovn 28278c7 link true /test e2e-aws-ovn
ci/prow/e2e-aws-ovn-single-node 28278c7 link false /test e2e-aws-ovn-single-node
ci/prow/verify 28278c7 link true /test verify
ci/prow/e2e-aws-ovn-upgrade 28278c7 link true /test e2e-aws-ovn-upgrade
ci/prow/images 28278c7 link true /test images
ci/prow/unit 28278c7 link true /test unit

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.

@lihongan
Copy link
Contributor

/retest

@Miciah Miciah added the priority/backlog Higher priority than priority/awaiting-more-evidence. label Nov 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jira/severity-important Referenced Jira bug's severity is important 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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. priority/backlog Higher priority than priority/awaiting-more-evidence.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants