Skip to content

chore: update sigs.k8s.io/controller-runtime to v0.22.1 #2042

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.

Sign up for GitHub

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

Jump to bottom
Merged
tolusha merged 19 commits into from
Sep 24, 2025
Merged

chore: update sigs.k8s.io/controller-runtime to v0.22.1 #2042

tolusha merged 19 commits into from
Sep 24, 2025

Conversation

@tolusha
Copy link
Contributor

@tolusha tolusha commented Sep 17, 2025 •
edited
Loading

What does this PR do?

  • Update k8s.io/* to v0.34.1
  • Update sigs.k8s.io/controller-runtime to v0.22.1

Screenshot/screencast of this PR

N/A

What issues does this PR fix or reference?

N/A

How to test this PR?

  1. Prepare a patch file if needed:
cat > /tmp/cr-patch.yaml <<EOF
apiVersion: org.eclipse.che/v2
kind: CheCluster
spec: {}
EOF
  1. Deploy the operator:

OpenShift

./build/scripts/olm/test-catalog-from-sources.sh --cr-patch-yaml /tmp/cr-patch.yaml

on Minikube

./build/scripts/minikube-tests/test-operator-from-sources.sh --cr-patch-yaml /tmp/cr-patch.yaml

PR Checklist

As the author of this Pull Request I made sure that:

Reviewers

Reviewers, please comment how you tested the PR when approving it.

@tolusha
chore: Update sigs.k8s.io/controller-runtime to v0.22.1
cee7633 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha
chore: fix tests
571c51f 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha
chore: get rid of deprecated Requeue=true
2e57ec6 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha
chore: get rid of deprecated Requeue=true
2e27d2d 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha
chore: Add k8s client wrapper
45b6c6c 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha
chore: refactor test client
41bbe00 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha
chore: Use client wrapper for workspace-config controller
12671e2 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha
chore: Refactoring
2862475 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha
chore: Update dev resources
7faf24e 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha
chore: Update clear-defined-test.sh
36366e5 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha
chore: Update go.sum
a028410 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha
make fmt
57a05ce 
Signed-off-by: Anatolii Bazko <[email protected]>
@openshift-ci
Copy link

openshift-ci bot commented Sep 17, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@tolusha tolusha changed the title Updatecontrollerruntime chore: udate sigs.k8s.io/controller-runtime to v0.22.1 Sep 17, 2025
@tolusha
chore: fixup go.sum
c23fbb6 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha
chore: Add more tests for workspaces-config-controller
d08c263 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha
chore: Fix potentional issues with TypeMeta
80f29eb 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha
fixup
41c90f1 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha tolusha marked this pull request as ready for review September 19, 2025 13:00
rohanKanojia
rohanKanojia approved these changes Sep 20, 2025
View reviewed changes
controllers/workspaceconfig/workspaces_config_controller.go
client client.Client,
nonCachedClient client.Client,
cli client.Client,
nonCachedCli client.Client,
Copy link
Contributor

@rohanKanojia rohanKanojia Sep 20, 2025

Choose a reason for hiding this comment

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

Umm, not 100% sure whether I have full context...why was this rename necessary? cli could be interpreted as “command-line interface” in many contexts.

Copy link
Contributor Author

@tolusha tolusha Sep 22, 2025

Choose a reason for hiding this comment

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

I will revert

pkg/deploy/server/server_reconciler.go Outdated

if done, err := s.syncPermissions(ctx); !done {
return reconcile.Result{Requeue: true}, false, err
return reconcile.Result{RequeueAfter: time.Second /**/}, false, err
Copy link
Contributor

@rohanKanojia rohanKanojia Sep 20, 2025

Choose a reason for hiding this comment

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

typo?

Suggested change
return reconcile.Result{RequeueAfter: time.Second /**/}, false, err
return reconcile.Result{RequeueAfter: time.Second}, false, err

pkg/common/chetypes/types.go Outdated
DiscoveryClient discovery.DiscoveryInterface
Scheme *runtime.Scheme
Client client.Client // TODO remove
NonCachingClient client.Client // TODO remove
Copy link
Contributor

@rohanKanojia rohanKanojia Sep 20, 2025

Choose a reason for hiding this comment

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

This comment for the old Client, NonCachingClient fields might get overlooked over time.
Suggest creating a tracking issue before merging this PR.

Copy link
Contributor Author

@tolusha tolusha Sep 22, 2025

Choose a reason for hiding this comment

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

I will update the comment

@openshift-ci openshift-ci bot added the lgtm label Sep 20, 2025
@openshift-ci
Copy link

openshift-ci bot commented Sep 20, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: rohanKanojia, tolusha

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

@tolusha
chore: Sync with options
fa89960 
Signed-off-by: Anatolii Bazko <[email protected]>
@openshift-ci openshift-ci bot removed the lgtm label Sep 22, 2025
@openshift-ci
Copy link

openshift-ci bot commented Sep 22, 2025

New changes are detected. LGTM label has been removed.

@tolusha
chore: fixup
0fb2226 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha tolusha mentioned this pull request Sep 22, 2025
Closed
@tolusha tolusha changed the title chore: udate sigs.k8s.io/controller-runtime to v0.22.1 chore: update sigs.k8s.io/controller-runtime to v0.22.1 Sep 22, 2025
@tolusha
Fixup
4e95546 
Signed-off-by: Anatolii Bazko <[email protected]>
@tolusha tolusha merged commit 536e4df into main Sep 24, 2025
21 checks passed
@tolusha tolusha deleted the updatecontrollerruntime branch September 24, 2025 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rohanKanojia rohanKanojia rohanKanojia approved these changes

@SDawley SDawley Awaiting requested review from SDawley SDawley is a code owner

@ibuziuk ibuziuk Awaiting requested review from ibuziuk ibuziuk is a code owner

@mkuznyetsov mkuznyetsov Awaiting requested review from mkuznyetsov mkuznyetsov is a code owner

@dkwon17 dkwon17 Awaiting requested review from dkwon17 dkwon17 is a code owner

Assignees

@rohanKanojia rohanKanojia

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@tolusha @rohanKanojia