From 5fbbe9972523e46740de8097004b3a9c64010bf8 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 20 Oct 2025 10:46:38 +0800 Subject: [PATCH] using info as default log level Signed-off-by: Wei Liu --- Makefile | 2 +- cmd/maestro/main.go | 10 +++------- go.mod | 4 ++-- go.sum | 8 ++++---- templates/agent-template-aro-hcp.yml | 2 +- templates/agent-template-rosa.yml | 2 +- templates/agent-template.yml | 2 +- templates/agent-tls-template.yml | 2 +- templates/service-template-aro-hcp.yml | 2 +- templates/service-template-rosa.yml | 2 +- templates/service-template.yml | 2 +- templates/service-tls-template.yml | 2 +- 12 files changed, 18 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index dff01ec4..de3dff94 100755 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ mqtt_client_cert ?= "" mqtt_client_key ?= "" # Log verbosity level -klog_v:=4 +klog_v:=2 # Location of the JSON web key set used to verify tokens: jwks_url:=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/certs diff --git a/cmd/maestro/main.go b/cmd/maestro/main.go index 4eb52e77..45aa907b 100755 --- a/cmd/maestro/main.go +++ b/cmd/maestro/main.go @@ -44,20 +44,16 @@ func main() { // set the logging config file viper.SetConfigFile(logConfigFile) // default log level is info - viper.SetDefault(varLogLevel, "info") + logger.SetLogLevel("info") if err := viper.ReadInConfig(); err != nil { - if _, ok := err.(*os.PathError); ok { - log.Infof("no config file '%s'", logConfigFile) - } else { - log.Errorf("failed to read the config file '%s': %v", logConfigFile, err) - } + log.Warnf("failed to read the log config file '%s', using info as default log level, %v", logConfigFile, err) } else { logger.SetLogLevel(viper.GetString(varLogLevel)) } // monitor the changes in the config file viper.WatchConfig() viper.OnConfigChange(func(e fsnotify.Event) { - log.Infof("config file changed: %s, new log level: %s", e.Name, viper.GetString(varLogLevel)) + log.Infof("log config file changed: %s, new log level: %s", e.Name, viper.GetString(varLogLevel)) logger.SetLogLevel(viper.GetString(varLogLevel)) }) diff --git a/go.mod b/go.mod index 9b2c81ac..9627394f 100755 --- a/go.mod +++ b/go.mod @@ -59,9 +59,9 @@ require ( k8s.io/component-base v0.33.4 k8s.io/klog/v2 v2.130.1 k8s.io/utils v0.0.0-20241210054802-24370beab758 - open-cluster-management.io/api v1.0.1-0.20251009064814-48b723491429 + open-cluster-management.io/api v1.1.0 open-cluster-management.io/ocm v1.0.1-0.20251017020440-daa9b2fa5467 - open-cluster-management.io/sdk-go v1.0.1-0.20251016065040-b82d34b3c2c2 + open-cluster-management.io/sdk-go v1.0.1-0.20251020023450-e3c5205637d2 sigs.k8s.io/yaml v1.6.0 ) diff --git a/go.sum b/go.sum index 73bf33a1..7729baa5 100644 --- a/go.sum +++ b/go.sum @@ -957,12 +957,12 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8= k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -open-cluster-management.io/api v1.0.1-0.20251009064814-48b723491429 h1:jU4r3zijNA+Ab17oF7lBck0YHc7f7wM8r2RqZJw6ZSs= -open-cluster-management.io/api v1.0.1-0.20251009064814-48b723491429/go.mod h1:lEc5Wkc9ON5ym/qAtIqNgrE7NW7IEOCOC611iQMlnKM= +open-cluster-management.io/api v1.1.0 h1:fu5xst9T/Ya6o41kqdd0zbNiDU+D3nNMTvoRVeF8j+U= +open-cluster-management.io/api v1.1.0/go.mod h1:lEc5Wkc9ON5ym/qAtIqNgrE7NW7IEOCOC611iQMlnKM= open-cluster-management.io/ocm v1.0.1-0.20251017020440-daa9b2fa5467 h1:8ZnlbBeVqqRBQE6UR10O7ijGzRgBaOACbdI4ypUHAJ8= open-cluster-management.io/ocm v1.0.1-0.20251017020440-daa9b2fa5467/go.mod h1:GAanBImFCdlTjRqMcXu6i9ZyWamWerxaUIaumUL0PWk= -open-cluster-management.io/sdk-go v1.0.1-0.20251016065040-b82d34b3c2c2 h1:cQJuyf4p9VqqIbfpYkN8eRBrbyLpEc19WXeu8oyWpXA= -open-cluster-management.io/sdk-go v1.0.1-0.20251016065040-b82d34b3c2c2/go.mod h1:DH4EMNDMiousmaj+noHYQxm48T+dbogiAfALhDnrjMg= +open-cluster-management.io/sdk-go v1.0.1-0.20251020023450-e3c5205637d2 h1:W7mkuOGoBi4XRwqCHHk/icLqDwN0iD2cZ6twJ7q+skQ= +open-cluster-management.io/sdk-go v1.0.1-0.20251020023450-e3c5205637d2/go.mod h1:kkw5jJp4y8Ofqpdp1Dj4GKudb5QApwnXriOvEsgn/wE= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8= diff --git a/templates/agent-template-aro-hcp.yml b/templates/agent-template-aro-hcp.yml index a71ae161..e10043e1 100644 --- a/templates/agent-template-aro-hcp.yml +++ b/templates/agent-template-aro-hcp.yml @@ -41,7 +41,7 @@ parameters: - name: KLOG_V displayName: KLOG V Level description: Log verbosity level - value: "4" + value: "2" objects: - apiVersion: apiextensions.k8s.io/v1 diff --git a/templates/agent-template-rosa.yml b/templates/agent-template-rosa.yml index 99b37745..beb6876d 100644 --- a/templates/agent-template-rosa.yml +++ b/templates/agent-template-rosa.yml @@ -41,7 +41,7 @@ parameters: - name: KLOG_V displayName: KLOG V Level description: Log verbosity level - value: "4" + value: "2" - name: MQTT_HOST description: Hostname for the mqtt broker. diff --git a/templates/agent-template.yml b/templates/agent-template.yml index 035784b3..29cbc4a3 100644 --- a/templates/agent-template.yml +++ b/templates/agent-template.yml @@ -41,7 +41,7 @@ parameters: - name: KLOG_V displayName: KLOG V Level description: Log verbosity level - value: "4" + value: "2" - name: MESSAGE_DRIVER_TYPE displayName: Message Driver Type diff --git a/templates/agent-tls-template.yml b/templates/agent-tls-template.yml index 89891827..414bfac2 100644 --- a/templates/agent-tls-template.yml +++ b/templates/agent-tls-template.yml @@ -41,7 +41,7 @@ parameters: - name: KLOG_V displayName: KLOG V Level description: Log verbosity level - value: "4" + value: "2" - name: MESSAGE_DRIVER_TYPE displayName: Message Driver Type diff --git a/templates/service-template-aro-hcp.yml b/templates/service-template-aro-hcp.yml index c3e310fd..e476addc 100755 --- a/templates/service-template-aro-hcp.yml +++ b/templates/service-template-aro-hcp.yml @@ -38,7 +38,7 @@ parameters: - name: KLOG_V displayName: KLOG V Level description: Log verbosity level - value: "4" + value: "2" - name: MEMORY_REQUEST description: Memory request for the API pods. diff --git a/templates/service-template-rosa.yml b/templates/service-template-rosa.yml index d7fb8051..33b6f7cc 100644 --- a/templates/service-template-rosa.yml +++ b/templates/service-template-rosa.yml @@ -37,7 +37,7 @@ parameters: - name: KLOG_V displayName: KLOG V Level description: Log verbosity level - value: "4" + value: "2" - name: MEMORY_REQUEST description: Memory request for the API pods. diff --git a/templates/service-template.yml b/templates/service-template.yml index 6bfaadcf..4873b73e 100755 --- a/templates/service-template.yml +++ b/templates/service-template.yml @@ -47,7 +47,7 @@ parameters: - name: KLOG_V displayName: KLOG V Level description: Log verbosity level - value: "4" + value: "2" - name: MEMORY_REQUEST description: Memory request for the API pods. diff --git a/templates/service-tls-template.yml b/templates/service-tls-template.yml index 62ccf24e..50fe349b 100755 --- a/templates/service-tls-template.yml +++ b/templates/service-tls-template.yml @@ -34,7 +34,7 @@ parameters: - name: KLOG_V displayName: KLOG V Level description: Log verbosity level - value: "4" + value: "2" - name: MEMORY_REQUEST description: Memory request for the API pods.