Extra logging

Signed-off-by: Kimmo Lehto <[email protected]>
k0sproject · May 8, 2023 · 4736aeb · 4736aeb
1 parent a757931
commit 4736aeb
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/pkg/config/cfgvars.go b/pkg/config/cfgvars.go
@@ -28,6 +28,7 @@ import (
 	"github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	"github.com/k0sproject/k0s/pkg/constant"
 	kubeutil "github.com/k0sproject/k0s/pkg/kubernetes"
+	"github.com/sirupsen/logrus"
 
 	"github.com/avast/retry-go"
 	"github.com/imdario/mergo"
@@ -251,11 +252,14 @@ func (c *CfgVars) NodeConfig() (*v1beta1.ClusterConfig, error) {
 
 func (c *CfgVars) FetchDynamicConfig(ctx context.Context, kubeClientFactory kubeutil.ClientFactoryInterface) (*v1beta1.ClusterConfig, error) {
 	if !c.EnableDynamicConfig {
+		logrus.Debug("Dynamic config is disabled, returning static config")
 		return c.NodeConfig()
 	}
 
 	var apiConfig *v1beta1.ClusterConfig
 
+	logrus.Debug("Building config client to fetch dynamic config from API")
+
 	client, err := kubeClientFactory.GetConfigClient()
 	if err != nil {
 		return nil, err
@@ -265,17 +269,22 @@ func (c *CfgVars) FetchDynamicConfig(ctx context.Context, kubeClientFactory kube
 		func() (err error) {
 			ctx, cancel := context.WithTimeout(ctx, 2*time.Second)
 			defer cancel()
+			logrus.Debug("Trying to fetch dynamic config from API")
 			c, err := client.Get(ctx, constant.ClusterConfigObjectName, metav1.GetOptions{})
 			if err != nil {
 				return err
 			}
+			logrus.Debug("Successfully fetched dynamic config from API")
 
 			apiConfig = c.GetClusterWideConfig()
 			return nil
 		},
 		retry.Context(ctx),
 		retry.LastErrorOnly(true),
 		retry.Delay(1*time.Second),
+		retry.OnRetry(func(attempt uint, err error) {
+			logrus.WithError(err).Debugf("Failed to get cluster config from API - attempt #%d", attempt+1)
+		}),
 	); err != nil {
 		return nil, err
 	}
@@ -296,5 +305,6 @@ func (c *CfgVars) FetchDynamicConfig(ctx context.Context, kubeClientFactory kube
 		return nil, fmt.Errorf("cluster config: merge nodeconfig: %w", err)
 	}
 
+	logrus.Debug("Using dynamic config from API")
 	return clusterConfig, nil
 }