rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-06-01 11:46:17 +00:00
Code Issues Releases Wiki Activity

Add logging structs/file content to trace loglevel

Browse Source
This commit is contained in:
Sebastiaan van Steenis 2020-03-05 19:42:05 +01:00
parent b9b29be0e5
commit 5c7daf4fb1
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/cluster.go
View File

@ -621,7 +621,7 @@ func parseNodeDrainInput(clusterFile string, rkeConfig *v3.RancherKubernetesEngi
} }
func ParseConfig(clusterFile string) (*v3.RancherKubernetesEngineConfig, error) { func ParseConfig(clusterFile string) (*v3.RancherKubernetesEngineConfig, error) {
logrus.Debugf("Parsing cluster file [%v]", clusterFile) logrus.Tracef("Parsing cluster file [%v]", clusterFile)
var rkeConfig v3.RancherKubernetesEngineConfig var rkeConfig v3.RancherKubernetesEngineConfig
// the customConfig is mapped to a k8s type, which doesn't unmarshal well because it has a // the customConfig is mapped to a k8s type, which doesn't unmarshal well because it has a

2
cluster/reconcile.go
View File

@ -28,7 +28,7 @@ const (
) )
func ReconcileCluster(ctx context.Context, kubeCluster, currentCluster *Cluster, flags ExternalFlags, svcOptionData map[string]*v3.KubernetesServicesOptions) error { func ReconcileCluster(ctx context.Context, kubeCluster, currentCluster *Cluster, flags ExternalFlags, svcOptionData map[string]*v3.KubernetesServicesOptions) error {
logrus.Debugf("[reconcile] currentCluster: %+v\n", currentCluster) logrus.Tracef("[reconcile] currentCluster: %+v\n", currentCluster)
log.Infof(ctx, "[reconcile] Reconciling cluster state") log.Infof(ctx, "[reconcile] Reconciling cluster state")
kubeCluster.UpdateWorkersOnly = flags.UpdateOnly kubeCluster.UpdateWorkersOnly = flags.UpdateOnly
if currentCluster == nil { if currentCluster == nil {

2
cluster/state.go
View File

@ -190,7 +190,7 @@ func (s *FullState) WriteStateFile(ctx context.Context, statePath string) error
if err != nil { if err != nil {
return fmt.Errorf("Failed to Marshal state object: %v", err) return fmt.Errorf("Failed to Marshal state object: %v", err)
} }
logrus.Debugf("Writing state file: %s", stateFile) logrus.Tracef("Writing state file: %s", stateFile)
if err := ioutil.WriteFile(statePath, stateFile, 0640); err != nil { if err := ioutil.WriteFile(statePath, stateFile, 0640); err != nil {
return fmt.Errorf("Failed to write state file: %v", err) return fmt.Errorf("Failed to write state file: %v", err)
} }

2
docker/docker.go
View File

@ -262,7 +262,7 @@ func pullImage(ctx context.Context, dClient *client.Client, hostname string, con
continue continue
} }
defer out.Close() defer out.Close()
if logrus.GetLevel() == logrus.DebugLevel { if logrus.GetLevel() == logrus.TraceLevel {
io.Copy(os.Stdout, out) io.Copy(os.Stdout, out)
} else { } else {
io.Copy(ioutil.Discard, out) io.Copy(ioutil.Discard, out)

10
metadata/metadata.go
View File

@ -2,6 +2,7 @@ package metadata
import ( import (
"context" "context"
"crypto/sha256"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
@ -54,25 +55,26 @@ func InitMetadata(ctx context.Context) error {
return nil return nil
} }
// this method loads metadata from three place, if RANCHER_METADATA_URL is provided then load data from specified location. Otherwise load data from bindata. // this method loads metadata, if RANCHER_METADATA_URL is provided then load data from specified location. Otherwise load data from bindata.
func loadData() (kdm.Data, error) { func loadData() (kdm.Data, error) {
var b []byte var b []byte
var err error var err error
u := os.Getenv(RancherMetadataURLEnv) u := os.Getenv(RancherMetadataURLEnv)
if u != "" { if u != "" {
logrus.Debugf("Loading data.json from %s, timestamp: %s", u, time.Now().Format(time.RFC822)) logrus.Debugf("Loading data.json from %s", u)
b, err = readFile(u) b, err = readFile(u)
if err != nil { if err != nil {
return kdm.Data{}, err return kdm.Data{}, err
} }
} else { } else {
logrus.Debugf("Logging data.json from local source, timestamp: %s", time.Now().Format(time.RFC822)) logrus.Debug("Loading data.json from local source")
b, err = data.Asset("data/data.json") b, err = data.Asset("data/data.json")
if err != nil { if err != nil {
return kdm.Data{}, err return kdm.Data{}, err
} }
} }
logrus.Debugf("data.json content: %v", string(b)) logrus.Debugf("data.json SHA256 checksum: %x", sha256.Sum256(b))
logrus.Tracef("data.json content: %v", string(b))
return kdm.FromData(b) return kdm.FromData(b)
} }

3
pki/deploy.go
View File

@ -156,7 +156,8 @@ func DeployAdminConfig(ctx context.Context, kubeConfig, localConfigPath string)
if len(kubeConfig) == 0 { if len(kubeConfig) == 0 {
return nil return nil
} }
logrus.Debugf("Deploying admin Kubeconfig locally: %s", kubeConfig) logrus.Debugf("Deploying admin Kubeconfig locally at [%s]", localConfigPath)
logrus.Tracef("Deploying admin Kubeconfig locally: %s", kubeConfig)
err := ioutil.WriteFile(localConfigPath, []byte(kubeConfig), 0640) err := ioutil.WriteFile(localConfigPath, []byte(kubeConfig), 0640)
if err != nil { if err != nil {
return fmt.Errorf("Failed to create local admin kubeconfig file: %v", err) return fmt.Errorf("Failed to create local admin kubeconfig file: %v", err)