From d280700e543255651346d0ec7119cccde57079c8 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Wed, 3 Apr 2024 15:03:04 +0530 Subject: [PATCH] KUBESAW-10: Rename the ToolchainCluster controller to ToolchainCluster_cache controller (#999) * Rename the ToolchainCluster controller to ToolchainCluster_cache controller Signed-off-by: Feny Mehta * removing underscore in package name Signed-off-by: Feny Mehta * Updating the error msg Signed-off-by: Feny Mehta * Updating toolchaincommon Signed-off-by: Feny Mehta --------- Signed-off-by: Feny Mehta --- go.mod | 2 +- go.sum | 4 ++-- main.go | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index d7fd37b7f..2b1284fb1 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeready-toolchain/host-operator require ( github.com/codeready-toolchain/api v0.0.0-20240322110702-5ab3840476e9 - github.com/codeready-toolchain/toolchain-common v0.0.0-20240322131000-8d44f7428e83 + github.com/codeready-toolchain/toolchain-common v0.0.0-20240403070054-183e7d407080 github.com/davecgh/go-spew v1.1.1 // indirect github.com/ghodss/yaml v1.0.0 github.com/go-bindata/go-bindata v3.1.2+incompatible diff --git a/go.sum b/go.sum index 5b673a9f8..98ce59e69 100644 --- a/go.sum +++ b/go.sum @@ -138,8 +138,8 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/codeready-toolchain/api v0.0.0-20240322110702-5ab3840476e9 h1:Lm7bFLrzfJzrUiRGVqtsSaZMpj+akLiR/fvAFjjE9gM= github.com/codeready-toolchain/api v0.0.0-20240322110702-5ab3840476e9/go.mod h1:cfNN6YPX4TORvhhZXMSjSPesqAHlB3nD/WAfGe4WLKQ= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240322131000-8d44f7428e83 h1:j+3snE8RGTyB5MdwPUqIfmAm9C2aScCni+ma1EveC4c= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240322131000-8d44f7428e83/go.mod h1:OJ3L9aaTRMGjxr2WeH/9l6m5OjExwEK3Bp/+P+efoGg= +github.com/codeready-toolchain/toolchain-common v0.0.0-20240403070054-183e7d407080 h1:2ZzjVjiEbQmJoLrGfY4A4VH4MEkYj030aZ1gnDUhLgs= +github.com/codeready-toolchain/toolchain-common v0.0.0-20240403070054-183e7d407080/go.mod h1:OJ3L9aaTRMGjxr2WeH/9l6m5OjExwEK3Bp/+P+efoGg= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= diff --git a/main.go b/main.go index d69accafd..08056db72 100644 --- a/main.go +++ b/main.go @@ -33,7 +33,7 @@ import ( "github.com/codeready-toolchain/host-operator/pkg/templates/nstemplatetiers" "github.com/codeready-toolchain/host-operator/pkg/templates/usertiers" "github.com/codeready-toolchain/host-operator/version" - "github.com/codeready-toolchain/toolchain-common/controllers/toolchaincluster" + "github.com/codeready-toolchain/toolchain-common/controllers/toolchainclustercache" commonclient "github.com/codeready-toolchain/toolchain-common/pkg/client" commoncluster "github.com/codeready-toolchain/toolchain-common/pkg/cluster" commonconfig "github.com/codeready-toolchain/toolchain-common/pkg/configuration" @@ -215,12 +215,12 @@ func main() { // nolint:gocyclo } // Setup all Controllers - if err = toolchaincluster.NewReconciler( + if err = toolchainclustercache.NewReconciler( mgr, namespace, memberClientTimeout, ).SetupWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create controller", "controller", "ToolchainCluster") + setupLog.Error(err, "unable to create controller", "controller", "ToolchainClusterCache") os.Exit(1) } if err := (&deactivation.Reconciler{ @@ -382,7 +382,7 @@ func main() { // nolint:gocyclo } setupLog.Info("Starting ToolchainCluster health checks.") - toolchaincluster.StartHealthChecks(ctx, mgr, namespace, 10*time.Second) + toolchainclustercache.StartHealthChecks(ctx, mgr, namespace, 10*time.Second) // create or update Toolchain status during the operator deployment setupLog.Info("Creating/updating the ToolchainStatus resource")