github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-08-23 22:26:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: should use klog.FromContext instead of log.FromContext (#537)

Browse Source 
Signed-off-by: GitHub <noreply@github.com>
This commit is contained in:
xuezhao
2024-06-24 07:39:14 +00:00
committed by GitHub
parent 84eaf5b3b8
commit 6767167ff8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registration/spoke/bootstrapkubeconfigs.go
+3 -3
View File
@@ -9,7 +9,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
"sigs.k8s.io/controller-runtime/pkg/log"
"k8s.io/klog/v2"
clusterv1client "open-cluster-management.io/api/client/cluster/clientset/versioned"
@@ -23,7 +23,7 @@ import (
// If no suitable kubeconfig is found, it returns -1 and an error indicating that no bootstrap kubeconfig is available for the specified managed cluster.
func selectBootstrapKubeConfigs(ctx context.Context,
managedCluster, hubKubeConfigFilePath string, bootstrapKubeConfigFilePaths []string) (int, error) {
logger := log.FromContext(ctx)
logger := klog.FromContext(ctx)
for index, fp := range bootstrapKubeConfigFilePaths {
equal, err := compareServerEndpoint(fp, hubKubeConfigFilePath)
@@ -52,7 +52,7 @@ func selectBootstrapKubeConfigs(ctx context.Context,
}
// TODO: return index because some legacy code depends on the file type. Change to return *rest.Config in the future. @xuezhaojun
return -1, fmt.Errorf("no bootstrap kubeconfig is available for managed cluster %s", managedCluster)
return -1, fmt.Errorf("no bootstrap kubeconfig in %v is available for managed cluster %s", bootstrapKubeConfigFilePaths, managedCluster)
}
func compareServerEndpoint(bootstrapKubeConfigFilePath, hubKubeConfigFilePath string) (bool, error) {