github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-02-14 10:00:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce logging level of DumpSecret to v(4) (#1357)

Browse Source 
It generates a lot of noises otherwise

Signed-off-by: Jian Qiu <jqiu@redhat.com>
This commit is contained in:
Jian Qiu
2026-01-29 12:28:42 +08:00
committed by GitHub
parent 4ec68fd389
commit 2743547b40
4 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/common/options/options_test.go
View File

@@ -14,8 +14,6 @@ import (
kubefake "k8s.io/client-go/kubernetes/fake"
clocktesting "k8s.io/utils/clock/testing"
"open-cluster-management.io/sdk-go/pkg/basecontroller/events"
testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing"
"open-cluster-management.io/ocm/pkg/registration/register"
"open-cluster-management.io/ocm/pkg/registration/spoke/registration"
@@ -90,8 +88,8 @@ func TestComplete(t *testing.T) {
options.HubKubeconfigDir = dir
err = registration.DumpSecret(
kubeClient.CoreV1(), componentNamespace, "hub-kubeconfig-secret",
options.HubKubeconfigDir, context.TODO(), events.NewContextualLoggingEventRecorder(t.Name()))
context.TODO(), kubeClient.CoreV1(), componentNamespace, "hub-kubeconfig-secret",
options.HubKubeconfigDir)
if err != nil {
t.Error(err)
}

15
pkg/registration/spoke/registration/secret_controller.go
View File

@@ -16,7 +16,6 @@ import (
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/klog/v2"
"open-cluster-management.io/sdk-go/pkg/basecontroller/events"
"open-cluster-management.io/sdk-go/pkg/basecontroller/factory"
"open-cluster-management.io/ocm/pkg/common/queue"
@@ -62,21 +61,21 @@ func NewHubKubeconfigSecretController(
ToController("HubKubeconfigSecretController")
}
func (s *hubKubeconfigSecretController) sync(ctx context.Context, syncCtx factory.SyncContext, _ string) error {
func (s *hubKubeconfigSecretController) sync(ctx context.Context, _ factory.SyncContext, _ string) error {
logger := klog.FromContext(ctx)
logger.V(4).Info("Reconciling Hub KubeConfig secret", "hubKubeconfigSecretName", s.hubKubeconfigSecretName)
return DumpSecret(s.spokeCoreClient, s.hubKubeconfigSecretNamespace, s.hubKubeconfigSecretName, s.hubKubeconfigDir, ctx, syncCtx.Recorder())
return DumpSecret(ctx, s.spokeCoreClient, s.hubKubeconfigSecretNamespace, s.hubKubeconfigSecretName, s.hubKubeconfigDir)
}
// DumpSecret dumps the data in the given seccret into a directory in file system.
// The output directory will be created if not exists.
// TO DO: remove the file once the corresponding key is removed from secret.
func DumpSecret(
coreV1Client corev1client.CoreV1Interface,
secretNamespace, secretName, outputDir string,
ctx context.Context,
recorder events.Recorder) error {
coreV1Client corev1client.CoreV1Interface,
secretNamespace, secretName, outputDir string) error {
secret, err := coreV1Client.Secrets(secretNamespace).Get(ctx, secretName, metav1.GetOptions{})
logger := klog.FromContext(ctx).WithValues("secretNamespace", secretNamespace, "secretName", secretName)
if errors.IsNotFound(err) {
return nil
}
@@ -98,7 +97,7 @@ func DumpSecret(
if err := os.WriteFile(filename, data, 0600); err != nil {
return fmt.Errorf("unable to write file %q: %w", filename, err)
}
recorder.Event(ctx, "FileCreated", fmt.Sprintf("File %q is created from secret %s/%s", filename, secretNamespace, secretName))
logger.V(4).Info("Files is created from secret", "filename", filename)
case err != nil:
return fmt.Errorf("unable to read file %q: %w", filename, err)
case bytes.Equal(lastData, data):
@@ -109,7 +108,7 @@ func DumpSecret(
if err := os.WriteFile(path.Clean(filename), data, 0600); err != nil {
return fmt.Errorf("unable to write file %q: %w", filename, err)
}
recorder.Event(ctx, "FileUpdated", fmt.Sprintf("File %q is updated from secret %s/%s", filename, secretNamespace, secretName))
logger.V(4).Info("Files is updated from secret", "filename", filename)
}
}
return nil

5
pkg/registration/spoke/registration/secret_controller_test.go
View File

@@ -12,8 +12,6 @@ import (
"k8s.io/apimachinery/pkg/util/rand"
kubefake "k8s.io/client-go/kubernetes/fake"
"open-cluster-management.io/sdk-go/pkg/basecontroller/events"
testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing"
"open-cluster-management.io/ocm/pkg/registration/register"
"open-cluster-management.io/ocm/pkg/registration/register/csr"
@@ -118,8 +116,7 @@ func TestDumpSecret(t *testing.T) {
}
err = DumpSecret(
kubeClient.CoreV1(), testNamespace, testSecretName, hubKubeconfigDir, context.TODO(),
events.NewContextualLoggingEventRecorder(t.Name()))
context.TODO(), kubeClient.CoreV1(), testNamespace, testSecretName, hubKubeconfigDir)
if err != nil {
t.Errorf("unexpected err: %v", err)
}

4
pkg/registration/spoke/spokeagent.go
View File

@@ -177,8 +177,8 @@ func (o *SpokeAgentConfig) RunSpokeAgentWithSpokeInformers(ctx context.Context,
// dump data in hub kubeconfig secret into file system if it exists
err = registration.DumpSecret(
managementKubeClient.CoreV1(), o.agentOptions.ComponentNamespace, o.registrationOption.HubKubeconfigSecret,
o.agentOptions.HubKubeconfigDir, ctx, recorder)
ctx, managementKubeClient.CoreV1(), o.agentOptions.ComponentNamespace, o.registrationOption.HubKubeconfigSecret,
o.agentOptions.HubKubeconfigDir)
if err != nil {
return err
}