Skip to content

OCPBUGS-38079: Bump controller-runtime to v0.18.4#1122

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:masterfrom
Miciah:OCPBUGS-23742-bump-controller-runtime-to-v0.18.4
Aug 8, 2024
Merged

OCPBUGS-38079: Bump controller-runtime to v0.18.4#1122
openshift-merge-bot[bot] merged 1 commit intoopenshift:masterfrom
Miciah:OCPBUGS-23742-bump-controller-runtime-to-v0.18.4

Conversation

@Miciah
Copy link
Copy Markdown
Contributor

@Miciah Miciah commented Aug 7, 2024

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.

Bump the vendored k8s.io/client-go package to v0.30.2. A previous commit bumped the other k8s.io/* packages to v0.30.2 but left k8s.io/client-go at v0.29.0. However, controller-runtime v0.18.4 requires k8s.io/client-go v0.30.0 or newer because of a breaking change in the client-go leaderelection package.

go get sigs.k8s.io/controller-runtime@v0.18.4
go mod edit -replace=k8s.io/client-go=k8s.io/client-go@v0.30.2
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.

Follow-up to #1046, which bumped the other k8s.io/* packages to v0.30.2.

@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/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Aug 7, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@Miciah: This pull request references Jira Issue OCPBUGS-38079, 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.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @lihongan

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

Details

In response to this:

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.

Bump the vendored k8s.io/client-go package to v0.30.2. A previous commit bumped the other k8s.io/* packages to v0.30.2 but left k8s.io/client-go at v0.29.0. However, controller-runtime v0.18.4 requires k8s.io/client-go v0.30.0 or newer because of a breaking change in the client-go leaderelection package.

go get sigs.k8s.io/controller-runtime@v0.18.4
go mod edit -replace=k8s.io/client-go=k8s.io/client-go v0.30.2
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.

Follow-up to #1046, which bumped the other k8s.io/* packages to v0.30.2.

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.

@frobware
Copy link
Copy Markdown
Contributor

frobware commented Aug 7, 2024

I believe there's a missing @ in the description; what worked for me and yields no diffs to your go.mod is:

go mod edit -replace=k8s.io/client-go=k8s.io/client-go@v0.30.2

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 7, 2024
@Miciah Miciah force-pushed the OCPBUGS-23742-bump-controller-runtime-to-v0.18.4 branch from 63f3f9c to 202d887 Compare August 7, 2024 12:57
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

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

3 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)

Requesting review from QA contact:
/cc @lihongan

Details

In response to this:

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.

Bump the vendored k8s.io/client-go package to v0.30.2. A previous commit bumped the other k8s.io/* packages to v0.30.2 but left k8s.io/client-go at v0.29.0. However, controller-runtime v0.18.4 requires k8s.io/client-go v0.30.0 or newer because of a breaking change in the client-go leaderelection package.

go get sigs.k8s.io/controller-runtime@v0.18.4
go mod edit -replace=k8s.io/client-go=k8s.io/client-go@v0.30.2
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.

Follow-up to #1046, which bumped the other k8s.io/* packages to v0.30.2.

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 openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 7, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 7, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: frobware

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 openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 7, 2024
@Miciah
Copy link
Copy Markdown
Contributor Author

Miciah commented Aug 7, 2024

I believe there's a missing @ in the description; what worked for me and yields no diffs to your go.mod is:

go mod edit -replace=k8s.io/client-go=k8s.io/client-go@v0.30.2

Thanks! You're right; I think I typed the wrong command, then corrected it, but pasted the wrong one in the commit message and PR description. Fixed in https://github.com/openshift/cluster-ingress-operator/compare/63f3f9cf1ea0720b9a63f2085f063b3a60f963eb..202d8870a2af3ea2a621695757b642bbf0f826b6.

@rfredette
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 7, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 3384355 and 2 for PR HEAD 202d887 in total

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 7, 2024
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.

Bump the vendored k8s.io/client-go package to v0.30.2.  A previous commit
bumped the other k8s.io/* packages to v0.30.2 but left k8s.io/client-go at
v0.29.0.  However, controller-runtime v0.18.4 requires k8s.io/client-go
v0.30.0 or newer because of a breaking change in the client-go
leaderelection package.

    go get sigs.k8s.io/controller-runtime@v0.18.4
    go mod edit -replace=k8s.io/client-go=k8s.io/client-go@v0.30.2
    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.

Follow-up to commit fdb6215, which bumped
the other k8s.io/* packages to v0.30.2.

This commit fixes OCPBUGS-38079.

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

* go.mod: Bump.
* go.sum: Regenerate.
* pkg/operator/controller/canary/controller.go (New):
* pkg/operator/controller/certificate-publisher/controller.go (New):
* pkg/operator/controller/certificate/controller.go (New):
* pkg/operator/controller/clientca-configmap/controller.go (New):
* pkg/operator/controller/configurable-route/controller.go (New):
* pkg/operator/controller/crl/controller.go (New):
* pkg/operator/controller/dns/controller.go (New):
* pkg/operator/controller/gateway-service-dns/controller.go (NewUnmanaged):
* pkg/operator/controller/gatewayapi/controller.go (New):
* pkg/operator/controller/gatewayapi/controller_test.go
((fakeController).Watch):
* pkg/operator/controller/gatewayclass/controller.go (NewUnmanaged):
* pkg/operator/controller/ingress/controller.go (New):
* pkg/operator/controller/ingressclass/controller.go (New):
* pkg/operator/controller/monitoring-dashboard/controller.go (New):
* pkg/operator/controller/route-metrics/controller.go (New):
* pkg/operator/controller/status/controller.go (New):
* pkg/operator/controller/sync-http-error-code-configmap/controller.go
(New): Update for the new controller.Watch and source.Kind type signatures.
* vendor/*: Regenerate.
@Miciah Miciah force-pushed the OCPBUGS-23742-bump-controller-runtime-to-v0.18.4 branch from 202d887 to 2639954 Compare August 7, 2024 16:42
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 7, 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 Aug 7, 2024
@Miciah
Copy link
Copy Markdown
Contributor Author

Miciah commented Aug 7, 2024

@rfredette
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 7, 2024
@lihongan
Copy link
Copy Markdown

lihongan commented Aug 8, 2024

/label qe-approved

@openshift-ci openshift-ci Bot added the qe-approved Signifies that QE has signed off on this PR label Aug 8, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

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

3 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)

Requesting review from QA contact:
/cc @lihongan

Details

In response to this:

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.

Bump the vendored k8s.io/client-go package to v0.30.2. A previous commit bumped the other k8s.io/* packages to v0.30.2 but left k8s.io/client-go at v0.29.0. However, controller-runtime v0.18.4 requires k8s.io/client-go v0.30.0 or newer because of a breaking change in the client-go leaderelection package.

go get sigs.k8s.io/controller-runtime@v0.18.4
go mod edit -replace=k8s.io/client-go=k8s.io/client-go@v0.30.2
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.

Follow-up to #1046, which bumped the other k8s.io/* packages to v0.30.2.

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.

@lihongan
Copy link
Copy Markdown

lihongan commented Aug 8, 2024

/retest

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 3384355 and 2 for PR HEAD 2639954 in total

@frobware
Copy link
Copy Markdown
Contributor

frobware commented Aug 8, 2024

  • could not run steps: step src failed: error occurred handling build src-amd64: build not successful after 5 attempts: [the build src-amd64 failed after 17s with reason FetchImageContentFailed: Failed to extract image content., the build src-amd64 failed after 18s with reason FetchImageContentFailed: Failed to extract image content., the build src-amd64 failed after 7m1s with reason FetchImageContentFailed: Failed to extract image content.]

/test-required

@frobware
Copy link
Copy Markdown
Contributor

frobware commented Aug 8, 2024

/retest-required

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 8, 2024

@Miciah: 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-gcp-ovn 2639954 link false /test e2e-gcp-ovn

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-merge-bot openshift-merge-bot Bot merged commit 7cf86c7 into openshift:master Aug 8, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@Miciah: Jira Issue OCPBUGS-38079: All pull requests linked via external trackers have merged:

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

Details

In response to this:

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.

Bump the vendored k8s.io/client-go package to v0.30.2. A previous commit bumped the other k8s.io/* packages to v0.30.2 but left k8s.io/client-go at v0.29.0. However, controller-runtime v0.18.4 requires k8s.io/client-go v0.30.0 or newer because of a breaking change in the client-go leaderelection package.

go get sigs.k8s.io/controller-runtime@v0.18.4
go mod edit -replace=k8s.io/client-go=k8s.io/client-go@v0.30.2
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.

Follow-up to #1046, which bumped the other k8s.io/* packages to v0.30.2.

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-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-ingress-operator
This PR has been included in build ose-cluster-ingress-operator-container-v4.18.0-202408081451.p0.g7cf86c7.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/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. 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