Skip to content

Commit 588628f

Browse files
authored
update to the new toolchain-common and configure the fieldmanager of the toolchainclusterresources controller (#713)
1 parent 91ef108 commit 588628f

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

cmd/main.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
goruntime "runtime"
88
"time"
99

10+
"github.com/codeready-toolchain/member-operator/pkg/constants"
1011
"github.com/codeready-toolchain/member-operator/pkg/host"
1112
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
1213

@@ -224,9 +225,10 @@ func main() {
224225

225226
// Setup all Controllers
226227
if err = (&toolchainclusterresources.Reconciler{
227-
Client: mgr.GetClient(),
228-
Scheme: mgr.GetScheme(),
229-
Templates: &deploy.ToolchainClusterTemplateFS,
228+
Client: mgr.GetClient(),
229+
Scheme: mgr.GetScheme(),
230+
Templates: &deploy.ToolchainClusterTemplateFS,
231+
FieldManager: constants.MemberOperatorFieldManager,
230232
}).SetupWithManager(mgr, namespace); err != nil {
231233
setupLog.Error(err, "unable to create controller", "controller", "ToolchainClusterResources")
232234
os.Exit(1)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/codeready-toolchain/member-operator
22

33
require (
44
github.com/codeready-toolchain/api v0.0.0-20251008084914-06282b83d4cd
5-
github.com/codeready-toolchain/toolchain-common v0.0.0-20251103123811-4066619e5740
5+
github.com/codeready-toolchain/toolchain-common v0.0.0-20251125180949-6ed5aeed75e4
66
github.com/go-logr/logr v1.4.2
77
github.com/google/go-cmp v0.7.0
88
// using latest commit from 'github.com/openshift/api branch release-4.19'

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ github.com/codeready-toolchain/api v0.0.0-20251008084914-06282b83d4cd h1:A6WOUwl
2424
github.com/codeready-toolchain/api v0.0.0-20251008084914-06282b83d4cd/go.mod h1:TiQ/yNv3cGL4nxo3fgRtcHyYYuRf+nAgs6B1IAqvxOU=
2525
github.com/codeready-toolchain/toolchain-common v0.0.0-20251103123811-4066619e5740 h1:cGl01Gakj69am0LopGJjWGpzcCngRqhcaFon/e90hMA=
2626
github.com/codeready-toolchain/toolchain-common v0.0.0-20251103123811-4066619e5740/go.mod h1:5i7k9O0yVftzJwsjSjJjoXMYtUPkiirVsEswuaC8/5I=
27+
github.com/codeready-toolchain/toolchain-common v0.0.0-20251125180949-6ed5aeed75e4 h1:OZd7C6PZMc3BL5CD2NAHxWc1VKtuSjRUJtvEuFBVDEE=
28+
github.com/codeready-toolchain/toolchain-common v0.0.0-20251125180949-6ed5aeed75e4/go.mod h1:5i7k9O0yVftzJwsjSjJjoXMYtUPkiirVsEswuaC8/5I=
2729
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
2830
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
2931
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

0 commit comments

Comments
 (0)