Bump openshift/api, controller runtime, and kube component versions #257
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
the
approved
|
/lgtm |
Miciah
reviewed
Apr 8, 2021
| @@ -79,14 +79,14 @@ func New(mgr manager.Manager, config operatorconfig.Config) (controller.Controll | |||
|
|
|||
| // Reconcile computes the operator's current status and therefrom creates or | |||
| // updates the ClusterOperator resource for the operator. | |||
| func (r *reconciler) Reconcile(request reconcile.Request) (reconcile.Result, error) { | |||
| func (r *reconciler) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) { | |||
| nsManifest := manifests.DNSNamespace() | |||
|
|
|||
| co := &configv1.ClusterOperator{ObjectMeta: metav1.ObjectMeta{Name: operatorcontroller.DNSClusterOperatorName().Name}} | |||
| if err := r.client.Get(context.TODO(), operatorcontroller.DNSClusterOperatorName(), co); err != nil { | |||
There was a problem hiding this comment.
Missed one! We can get this in a follow-up.
There was a problem hiding this comment.
This didnt make FF so might as well get it now.
|
/retest |
|
/refresh |
sgreene570
force-pushed
the
openshift-api-controller-runtime-bump
branch
from
6d6bab1
to
48e0244
Compare
pkg/operator/controller/controller.go: Use new context parameter in `r.Reconcile(...)`. pkg/operator/controller/status/controller.go: Use new context parameter in `r.Reconcile(...)`. pkg/operator/operator.go: Add custom manager.ClientBuilder type definition with custom methods to specifically side-step the default client cache. Use a context in `o.Start`, and replace the existing stop channel with `ctx.Done()`. cmd/dns-operator/main.go: Update controller-runtime signals package import.
This commit consists of the following changes: * Bump openshift/api to commit `47be537` (current latest commit). openshift/api commit `2447417` moved openshift/api to kube 1.21, which inspired this commit. This commit is not strictly necessary at the moment, but will save us time when we need to pull in a new relevant API change in the future. * Bump controller runtime to v0.9.0-aplha.1. Controller runtime v0.8.x is currently incompatible with kubernetes 1.21. * Fix a breaking change in `pkg/operator/operator.go` introduced in controller runtime v0.9.0. Luckily this breaking change simplifies the manager workaround used for the version v0.8.3 bump.
sgreene570
force-pushed
the
openshift-api-controller-runtime-bump
branch
from
48e0244
to
84d040a
Compare
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rfredette, sgreene570 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 |
|
/retest |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
1 similar comment
|
/retest Please review the full test history for this PR and help us cut down flakes. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
go.mod: Bump controller-runtime to v0.8.3
Support controller runtime v0.8.3
pkg/operator/controller/controller.go:
Use new context parameter in
r.Reconcile(...).pkg/operator/controller/status/controller.go:
Use new context parameter in
r.Reconcile(...).pkg/operator/operator.go:
Add custom manager.ClientBuilder type definition with custom methods to
specifically side-step the default client cache. Use a context in
o.Start, and replace the existing stop channel withctx.Done().cmd/dns-operator/main.go:
Update controller-runtime signals package import.
go.mod: Bump for kube 1.21 & controller-runtime v0.9.0-alpha
This commit consists of the following changes:
Bump openshift/api to commit
47be537(current latest commit).openshift/api commit
2447417moved openshift/api to kube 1.21,which inspired this commit. This commit is not strictly necessary
at the moment, but will save us time when we need to pull in a new
relevant API change in the future.
Bump controller runtime to v0.9.0-aplha.1. Controller runtime v0.8.x
is currently incompatible with kubernetes 1.21.
Fix a breaking change in
pkg/operator/operator.gointroduced incontroller runtime v0.9.0. Luckily this breaking change simplifies the
manager workaround used for the version v0.8.3 bump.
This PR is similar to some of the commits in openshift/cluster-ingress-operator#589