Merge branch 'master' into toolchainresources

codeready-toolchain · Apr 3, 2024 · a0b0c06 · a0b0c06
2 parents 2382595 + 183e7d4
commit a0b0c06
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...rollers/toolchaincluster/healthchecker.go → ...rs/toolchainclustercache/healthchecker.go b/...rollers/toolchaincluster/healthchecker.go → ...rs/toolchainclustercache/healthchecker.go
@@ -1,4 +1,4 @@
-package toolchaincluster
+package toolchainclustercache
 
 import (
 	"context"

diff --git a/...rs/toolchaincluster/healthchecker_test.go → ...olchainclustercache/healthchecker_test.go b/...rs/toolchaincluster/healthchecker_test.go → ...olchainclustercache/healthchecker_test.go
@@ -1,4 +1,4 @@
-package toolchaincluster
+package toolchainclustercache
 
 import (
 	"context"

diff --git a/...aincluster/toolchaincluster_controller.go → ...ache/toolchaincluster_cache_controller.go b/...aincluster/toolchaincluster_controller.go → ...ache/toolchaincluster_cache_controller.go
@@ -1,4 +1,4 @@
-package toolchaincluster
+package toolchainclustercache
 
 import (
 	"context"
@@ -46,7 +46,7 @@ type Reconciler struct {
 // The Controller will requeue the Request to be processed again if the returned error is non-nil or
 // Result.Requeue is true, otherwise upon completion it will remove the work from the queue.
 func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.Result, error) {
-	reqLogger := log.FromContext(ctx)
+	reqLogger := log.FromContext(ctx).WithName("cache")
 	reqLogger.Info("Reconciling ToolchainCluster")
 
 	// Fetch the ToolchainCluster instance

diff --git a/...uster/toolchaincluster_controller_test.go → ...toolchaincluster_cache_controller_test.go b/...uster/toolchaincluster_controller_test.go → ...toolchaincluster_cache_controller_test.go
@@ -1,4 +1,4 @@
-package toolchaincluster
+package toolchainclustercache
 
 import (
 	"context"