SANDBOX-559 K8s 1 27 member #551

ranakan19 · 2024-03-25T20:55:06Z

Updates k8s dependencies to 0.27 and controller-runtime to v0.15.
With the update to controller-runtime v0.15 (changes in release detailed here), this PR has following changes to combat the breaking changes:

carry forward changes from api and toolchain-common - adding context in event handlers, change from runtime.Object to client.Object, and SubStatusResources
updated fakeClient behaviour - ⚠ Update fake client deletionTimestamp behavior kubernetes-sigs/controller-runtime#2316
handle finalizers in fake client - ⚠ Handle finalizers in the fake client kubernetes-sigs/controller-runtime#1399
Watches signature has changed, For source.Source, now use WatchesRawSource - ⚠ Improve builder's capabilities and general UX kubernetes-sigs/controller-runtime#2135

Changes wrt - https://issues.redhat.com/browse/SANDBOX-559
DO NOT MERGE (All the PRs related to version updates need to be merged at once, but these PR are for early feedback so that there are not a lot of changes to review at once)

controllers/nstemplateset/nstemplateset_controller_test.go

controllers/idler/idler_controller_test.go

controllers/nstemplateset/cluster_resources.go

controllers/nstemplateset/nstemplateset_controller.go

controllers/useraccount/useraccount_controller_test.go

ranakan19 · 2024-03-27T22:23:57Z

pkg/consoleplugin/consolepluginserver_test.go

@@ -51,7 +52,7 @@ func TestConsolePluginServer(t *testing.T) {
 func waitForReady(t *testing.T) {
 	cl := http.Client{}

-	err := wait.Poll(DefaultRetryInterval, DefaultTimeout, func() (done bool, err error) {
+	err := wait.PollUntilContextTimeout(context.TODO(), DefaultRetryInterval, DefaultTimeout, false, func(ctx context.Context) (done bool, err error) {


Poll is being deprecated and the linter was complaining. However to fix this there was a typo in the function name that was suggested as replacement, which was later fixed.
PTAL here if the context is used correctly - I'm not a 100% sure.
For reference please check - kubernetes/apimachinery#153 and the fix here - https://github.com/kubernetes/kubernetes/pull/117143/files

codecov · 2024-03-28T00:41:45Z

Codecov Report

Attention: Patch coverage is 20.00000% with 8 lines in your changes missing coverage. Please review.

Project coverage is 82.17%. Comparing base (56327d5) to head (35f5fff).
Report is 1 commits behind head on master.

Files with missing lines	Patch %	Lines
...trollers/nstemplateset/nstemplateset_controller.go	0.00%	4 Missing ⚠️
controllers/useraccount/useraccount_controller.go	0.00%	3 Missing ⚠️
...roperatorconfig/memberoperatorconfig_controller.go	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #551      +/-   ##
==========================================
- Coverage   82.30%   82.17%   -0.13%     
==========================================
  Files          28       28              
  Lines        3243     3243              
==========================================
- Hits         2669     2665       -4     
- Misses        434      437       +3     
- Partials      140      141       +1

Files with missing lines	Coverage Δ
controllers/memberoperatorconfig/mapper.go	`100.00% <100.00%> (ø)`
...roperatorconfig/memberoperatorconfig_controller.go	`75.00% <0.00%> (ø)`
controllers/useraccount/useraccount_controller.go	`82.17% <0.00%> (ø)`
...trollers/nstemplateset/nstemplateset_controller.go	`70.58% <0.00%> (-2.62%)`	⬇️

controllers/nstemplateset/cluster_resources.go

controllers/idler/idler_controller_test.go

controllers/nstemplateset/nstemplateset_controller_test.go

sonarqubecloud · 2024-04-15T16:52:48Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
10.7% Duplication on New Code

See analysis details on SonarCloud

MatousJobanek

Looks good, but I have a few comments on the versions in go.mod file.

Also, is there a reason why you picked the v0.27.2 specifically, and not the latest v0.27.x patch version that is available at the time when we are doing the update? This is just a detail since we are going to bump the version to the next minor one soon again.

MatousJobanek · 2024-05-03T08:49:20Z

go.mod

 	k8s.io/klog v1.0.0
-	k8s.io/klog/v2 v2.70.1
+	k8s.io/klog/v2 v2.90.1
 	k8s.io/metrics v0.25.0


why isn't this dependency k8s.io/metrics updated to v0.27.2 as well?

MatousJobanek · 2024-05-03T08:50:35Z

go.mod

-	k8s.io/apimachinery v0.25.0
+	github.com/prometheus/client_golang v1.15.1
+	k8s.io/apiextensions-apiserver v0.27.2
+	k8s.io/apimachinery v0.27.2
 	k8s.io/kubectl v0.24.0


the same - it should use

Suggested change

k8s.io/kubectl v0.24.0

k8s.io/kubectl v0.27.2

MatousJobanek · 2024-05-03T08:50:57Z

go.mod

@@ -3,77 +3,67 @@ module github.com/codeready-toolchain/member-operator
 require (
 	github.com/codeready-toolchain/api v0.0.0-20240322110702-5ab3840476e9
 	github.com/codeready-toolchain/toolchain-common v0.0.0-20240404090512-046d250d7d78
-	github.com/go-logr/logr v1.2.3
+	github.com/go-logr/logr v1.2.4
 	github.com/google/go-cmp v0.5.9
 	// using latest commit from 'github.com/openshift/api branch release-4.12'


Suggested change

// using latest commit from 'github.com/openshift/api branch release-4.12'

// using latest commit from 'github.com/openshift/api branch release-4.14'

MatousJobanek · 2024-05-03T08:56:28Z

go.mod

 	github.com/google/go-cmp v0.5.9
 	// using latest commit from 'github.com/openshift/api branch release-4.12'
-	github.com/openshift/api v0.0.0-20230213134911-7ba313770556
+	github.com/openshift/api v0.0.0-20231117205818-971e4ba78c9a
 	github.com/pkg/errors v0.9.1
 	github.com/redhat-cop/operator-utils v1.3.3-0.20220121120056-862ef22b8cdf


let's update this dependency as well to match the version of k8s v.0.27.x - it should be the version v1.3.6 https://github.com/redhat-cop/operator-utils/releases/tag/v1.3.6

openshift-ci · 2024-08-05T19:06:29Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexeykazakov, ranakan19

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:

~~OWNERS~~ [alexeykazakov,ranakan19]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

sonarqubecloud · 2024-11-14T22:11:05Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
10.8% Duplication on New Code

See analysis details on SonarQube Cloud

ranakan19 added 2 commits March 5, 2024 16:22

fixes for controller-runtime upgrade and breaking changes

05068f7

unit test changes with deletionTimestamp and fakeClient

db372af

ranakan19 requested review from MatousJobanek, xcoulon, alexeykazakov, rajivnathan, sbryzak and mfrancisc as code owners March 25, 2024 20:55

openshift-ci bot requested a review from michaelkleinhenz March 25, 2024 20:55

openshift-merge-robot added the needs-rebase label Mar 25, 2024

ranakan19 commented Mar 25, 2024

View reviewed changes

controllers/nstemplateset/nstemplateset_controller_test.go Show resolved Hide resolved

Merge branch 'master' into k8s_1_27_member

9e9790a

openshift-merge-robot removed the needs-rebase label Mar 25, 2024

mod tidy, fix toolchain common replace version

6e167ba

alexeykazakov reviewed Mar 25, 2024

View reviewed changes

ranakan19 added 3 commits March 27, 2024 16:51

remove commented out code

0b5289e

remove unused function lint check

0674acb

replace deprecated Poll function to fix linter error

60a3477

ranakan19 commented Mar 27, 2024

View reviewed changes

correct replace fork version, should fix snyk error too

6376380

Merge branch 'master' into k8s_1_27_member

b06b7a5

openshift-merge-robot added the needs-rebase label Apr 4, 2024

Merge branch 'master' into k8s_1_27_member

0987ad3

openshift-merge-robot removed the needs-rebase label Apr 5, 2024

ranakan19 and others added 2 commits April 9, 2024 23:17

add finalizer, fix lint

b1816ef

Merge branch 'master' into k8s_1_27_member

c169584

alexeykazakov reviewed Apr 10, 2024

View reviewed changes

remove emoty status in test

525e1e4

alexeykazakov approved these changes Apr 15, 2024

View reviewed changes

openshift-ci bot added the approved label Apr 15, 2024

openshift-merge-robot added the needs-rebase label Apr 18, 2024

MatousJobanek reviewed May 3, 2024

View reviewed changes

merge conflict resolve

8d817d7

openshift-merge-robot removed the needs-rebase label Aug 5, 2024

ranakan19 added 3 commits August 20, 2024 16:44

update api and common as in master

fa0b6c6

merge conflict resolve

c4ce6ed

update versions

dbb501e

This comment was marked as outdated.

Sign in to view

ranakan19 and others added 10 commits November 11, 2024 00:45

Merge branch 'master' into k8s_1_27_member

8fabc1a

update api and common latest version

2d10436

format

6c107bb

update redhat-cop/operator-utils

d8ff43e

update common version

ff31b2f

update kustome and controller-gen version in makefile

70fe12d

v5

b2198e9

Merge branch 'master' into k8s_1_27_member

8658a94

remove replace, update versions after merge

0aeb383

remove replace

35f5fff

ranakan19 merged commit ca053bf into codeready-toolchain:master Nov 15, 2024
10 of 13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SANDBOX-559 K8s 1 27 member #551

SANDBOX-559 K8s 1 27 member #551

ranakan19 commented Mar 25, 2024 •

edited

Loading

ranakan19 Mar 27, 2024

codecov bot commented Mar 28, 2024 •

edited

Loading

sonarqubecloud bot commented Apr 15, 2024

MatousJobanek left a comment

MatousJobanek May 3, 2024

MatousJobanek May 3, 2024

MatousJobanek May 3, 2024

MatousJobanek May 3, 2024

openshift-ci bot commented Aug 5, 2024

This comment was marked as outdated.

sonarqubecloud bot commented Nov 14, 2024

	// using latest commit from 'github.com/openshift/api branch release-4.12'
	// using latest commit from 'github.com/openshift/api branch release-4.14'

SANDBOX-559 K8s 1 27 member #551

SANDBOX-559 K8s 1 27 member #551

Conversation

ranakan19 commented Mar 25, 2024 • edited Loading

ranakan19 Mar 27, 2024

Choose a reason for hiding this comment

codecov bot commented Mar 28, 2024 • edited Loading

Codecov Report

sonarqubecloud bot commented Apr 15, 2024

Quality Gate passed

MatousJobanek left a comment

Choose a reason for hiding this comment

MatousJobanek May 3, 2024

Choose a reason for hiding this comment

MatousJobanek May 3, 2024

Choose a reason for hiding this comment

MatousJobanek May 3, 2024

Choose a reason for hiding this comment

MatousJobanek May 3, 2024

Choose a reason for hiding this comment

openshift-ci bot commented Aug 5, 2024

This comment was marked as outdated.

sonarqubecloud bot commented Nov 14, 2024

Quality Gate passed

ranakan19 commented Mar 25, 2024 •

edited

Loading

codecov bot commented Mar 28, 2024 •

edited

Loading