Revert changes in sub modules

Author: anndono

cmd/cloud-controller-manager/app/controllermanager.go

@@ -214,7 +214,7 @@ func RunWrapper(s *options.CloudControllerManagerOptions, c *cloudcontrollerconf
 	logger := log.Background().WithName("RunWrapper")
 	return func(ctx context.Context) {
 		if !c.DynamicReloadingConfig.EnableDynamicReloading {
-			klog.V(1).Infof("using static initialization from config file %s", c.ComponentConfig.KubeCloudShared.CloudProvider.CloudConfigFile)
+			logger.V(1).Info("using static initialization from config file", "cloudConfigFile", c.ComponentConfig.KubeCloudShared.CloudProvider.CloudConfigFile)
 			if err := Run(ctx, c.Complete(), h); err != nil {
 				klog.Errorf("RunWrapper: failed to start cloud controller manager: %v", err)
 				os.Exit(1)
@@ -224,10 +224,10 @@ func RunWrapper(s *options.CloudControllerManagerOptions, c *cloudcontrollerconf
 
 		cloudConfigFile := c.ComponentConfig.KubeCloudShared.CloudProvider.CloudConfigFile
 		if cloudConfigFile != "" {
-			klog.V(1).Infof("RunWrapper: using dynamic initialization from config file %s, starting the file watcher", cloudConfigFile)
+			logger.V(1).Info("using dynamic initialization from config file, starting the file watcher", "cloudConfigFile", cloudConfigFile)
 			updateCh = dynamic.RunFileWatcherOrDie(cloudConfigFile)
 		} else {
-			klog.V(1).Infof("RunWrapper: using dynamic initialization from secret %s/%s, starting the secret watcher", c.DynamicReloadingConfig.CloudConfigSecretNamespace, c.DynamicReloadingConfig.CloudConfigSecretName)
+			logger.V(1).Info("using dynamic initialization from secret, starting the secret watcher", "namespace", c.DynamicReloadingConfig.CloudConfigSecretNamespace, "name", c.DynamicReloadingConfig.CloudConfigSecretName)
 			updateCh = dynamic.RunSecretWatcherOrDie(c)
 		}
 
@@ -236,7 +236,7 @@ func RunWrapper(s *options.CloudControllerManagerOptions, c *cloudcontrollerconf
 		for {
 			select {
 			case <-updateCh:
-				klog.V(2).Info("RunWrapper: detected the cloud config has been updated, re-constructing the cloud controller manager")
+				logger.V(2).Info("detected the cloud config has been updated, re-constructing the cloud controller manager")
 
 				// stop the previous goroutines
 				cancelFunc()
@@ -289,6 +289,7 @@ func shouldDisableCloudProvider(configFilePath string) (bool, error) {
 }
 
 func runAsync(s *options.CloudControllerManagerOptions, errCh chan error, h *controllerhealthz.MutableHealthzHandler) context.CancelFunc {
+	logger := log.Background().WithName("runAsync")
 	ctx, cancelFunc := context.WithCancel(context.Background())
 
 	go func() {
@@ -303,7 +304,7 @@ func runAsync(s *options.CloudControllerManagerOptions, errCh chan error, h *con
 			errCh <- err
 		}
 
-		klog.V(1).Infof("RunAsync: stopping")
+		logger.V(1).Info("stopping")
 	}()
 
 	return cancelFunc
@@ -415,7 +416,7 @@ func startControllers(ctx context.Context, controllerContext genericcontrollerma
 			continue
 		}
 
-		klog.V(1).Infof("Starting %q", controllerName)
+		logger.V(1).Info("Starting controller", "controller", controllerName)
 		ctrl, started, err := initFn(ctx, controllerContext, completedConfig, cloud)
 		if err != nil {
 			klog.Errorf("Error starting %q: %s", controllerName, err.Error())
@@ -448,11 +449,11 @@ func startControllers(ctx context.Context, controllerContext genericcontrollerma
 		klog.Fatalf("Failed to wait for apiserver being healthy: %v", err)
 	}
 
-	klog.V(2).Infof("startControllers: starting shared informers")
+	logger.V(2).Info("startControllers: starting shared informers")
 	completedConfig.SharedInformers.Start(ctx.Done())
 	controllerContext.InformerFactory.Start(ctx.Done())
 	<-ctx.Done()
-	klog.V(1).Infof("startControllers: received stopping signal, exiting")
+	logger.V(1).Info("startControllers: received stopping signal, exiting")
 
 	return nil
 }

cmd/cloud-controller-manager/app/dynamic/secret_watcher.go

@@ -30,6 +30,7 @@ import (
 
 	cloudcontrollerconfig "sigs.k8s.io/cloud-provider-azure/cmd/cloud-controller-manager/app/config"
 	"sigs.k8s.io/cloud-provider-azure/cmd/cloud-controller-manager/app/options"
+	"sigs.k8s.io/cloud-provider-azure/pkg/log"
 )
 
 type SecretWatcher struct {
@@ -64,6 +65,7 @@ func RunSecretWatcherOrDie(c *cloudcontrollerconfig.Config) chan struct{} {
 // NewSecretWatcher creates a SecretWatcher and a signal channel to indicate
 // the specific secret has been updated
 func NewSecretWatcher(informerFactory informers.SharedInformerFactory, secretName, secretNamespace string) (*SecretWatcher, chan struct{}) {
+	logger := log.Background().WithName("NewSecretWatcher")
 	secretInformer := informerFactory.Core().V1().Secrets()
 	updateSignal := make(chan struct{})
 
@@ -79,7 +81,7 @@ func NewSecretWatcher(informerFactory informers.SharedInformerFactory, secretNam
 
 				if strings.EqualFold(newSecret.Name, secretName) &&
 					strings.EqualFold(newSecret.Namespace, secretNamespace) {
-					klog.V(1).Infof("secret %s updated, sending the signal", newSecret.Name)
+					logger.V(1).Info("secret updated, sending the signal", "secretName", newSecret.Name)
 					updateSignal <- struct{}{}
 				}
 			},

cmd/cloud-node-manager/app/nodemanager.go

@@ -125,7 +125,7 @@ func Run(ctx context.Context, c *cloudnodeconfig.Config) error {
 // startControllers starts the cloud specific controller loops.
 func startControllers(ctx context.Context, c *cloudnodeconfig.Config, healthzHandler *controllerhealthz.MutableHealthzHandler) error {
 	logger := log.Background().WithName("startControllers")
-	klog.V(1).Infof("Starting cloud-node-manager...")
+	logger.V(1).Info("Starting cloud-node-manager...")
 
 	// Start the CloudNodeController
 	nodeController := nodemanager.NewCloudNodeController(

health-probe-proxy/main.go

@@ -32,6 +32,7 @@ import (
 )
 
 func main() {
+	logger := klog.Background().WithName("main")
 	logs.InitLogs()
 	defer logs.FlushLogs()
 
@@ -43,17 +44,17 @@ func main() {
 	targetUrl, _ := url.Parse(fmt.Sprintf("http://localhost:%s", strconv.Itoa(targetPort)))
 
 	proxy := httputil.NewSingleHostReverseProxy(targetUrl)
-	klog.Infof("target url: %s", targetUrl)
+	logger.Info("", "target url", targetUrl)
 
 	http.Handle("/", proxy)
-	klog.Infof("proxying from port %d to port %d", healthCheckPort, targetPort)
+	logger.Info("proxying between ports", "from", healthCheckPort, "to", targetPort)
 
 	listener, err := net.Listen("tcp", fmt.Sprintf("0.0.0.0:%s", strconv.Itoa(healthCheckPort)))
 	if err != nil {
 		klog.Errorf("failed to listen on port %d: %s", targetPort, err)
 		panic(err)
 	}
-	klog.Infof("listening on port %d", healthCheckPort)
+	logger.Info("listening on port", "port", healthCheckPort)
 
 	proxyListener := &proxyproto.Listener{Listener: listener}
 	defer func(proxyListener *proxyproto.Listener) {
@@ -64,7 +65,7 @@ func main() {
 		}
 	}(proxyListener)
 
-	klog.Infof("listening on port with proxy listener %d", healthCheckPort)
+	logger.Info("listening on port with proxy listener", "port", healthCheckPort)
 	err = http.Serve(proxyListener, nil)
 	if err != nil {
 		klog.Errorf("failed to serve: %s", err)

kubetest2-aks/deployer/build.go

@@ -22,7 +22,7 @@ import (
 
 	git "github.com/go-git/go-git/v5"
 	plumbing "github.com/go-git/go-git/v5/plumbing"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/kubetest2/pkg/exec"
 )
@@ -87,15 +87,17 @@ func (d *deployer) makeCloudProviderImages(path string) (string, error) {
 
 // makeCloudProviderImagesByPath makes CCM or CNM images with repo path.
 func (d *deployer) makeCloudProviderImagesByPath() (string, error) {
-	klog.Infof("Making Cloud provider images with repo path")
+	logger := klog.Background().WithName("makeCloudProviderImagesByPath")
+	logger.Info("Making Cloud provider images with repo path")
 
 	path := d.TargetPath
 	return d.makeCloudProviderImages(path)
 }
 
 // makeCloudProviderImagesByTag makes CCM or CNM images with repo refs.
 func (d *deployer) makeCloudProviderImagesByTag(url string) (string, error) {
-	klog.Infof("Making Cloud provider images with refs")
+	logger := klog.Background().WithName("makeCloudProviderImagesByTag")
+	logger.Info("Making Cloud provider images with refs")
 	ccmPath := fmt.Sprintf("%s/cloud-provider-azure", gitClonePath)
 
 	repo, err := git.PlainClone(ccmPath, false, &git.CloneOptions{
@@ -118,6 +120,7 @@ func (d *deployer) makeCloudProviderImagesByTag(url string) (string, error) {
 }
 
 func (d *deployer) Build() error {
+	logger := klog.Background().WithName("Build")
 	err := d.verifyBuildFlags()
 	if err != nil {
 		return fmt.Errorf("failed to verify build flags: %v", err)
@@ -134,7 +137,7 @@ func (d *deployer) Build() error {
 				return fmt.Errorf("failed to make Cloud provider image with tag %q: %v", d.TargetTag, err)
 			}
 		}
-		klog.Infof("cloud-provider-azure image with tag %q are ready", imageTag)
+		logger.Info("cloud-provider-azure image are ready", "imageTag", imageTag)
 	}
 
 	return nil

kubetest2-aks/deployer/down.go

@@ -22,11 +22,12 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 func (d *deployer) deleteResourceGroup(subscriptionID string, credential azcore.TokenCredential) error {
-	klog.Infof("Deleting resource group %q", d.ResourceGroupName)
+	logger := klog.Background().WithName("deleteResourceGroup")
+	logger.Info("Deleting resource group", "resourceGroup", d.ResourceGroupName)
 	rgClient, _ := armresources.NewResourceGroupsClient(subscriptionID, credential, nil)
 
 	poller, err := rgClient.BeginDelete(ctx, d.ResourceGroupName, nil)
@@ -40,6 +41,7 @@ func (d *deployer) deleteResourceGroup(subscriptionID string, credential azcore.
 }
 
 func (d *deployer) Down() error {
+	logger := klog.Background().WithName("Down")
 	// Create a credentials object.
 	cred, err := azidentity.NewDefaultAzureCredential(nil)
 	if err != nil {
@@ -51,6 +53,6 @@ func (d *deployer) Down() error {
 		klog.Fatalf("failed to delete resource group %q: %v", d.ResourceGroupName, err)
 	}
 
-	klog.Infof("Resource group %q deleted", d.ResourceGroupName)
+	logger.Info("Resource group deleted", "resourceGroup", d.ResourceGroupName)
 	return nil
 }

kubetest2-aks/deployer/up.go

@@ -36,7 +36,7 @@ import (
 	armcontainerservicev2 "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v2"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/utils/ptr"
 
 	"sigs.k8s.io/kubetest2/pkg/exec"
@@ -210,6 +210,7 @@ func (d *deployer) prepareCustomConfig() ([]byte, error) {
 
 // prepareClusterConfig generates cluster config.
 func (d *deployer) prepareClusterConfig(clusterID string) (*armcontainerservicev2.ManagedCluster, string, error) {
+	logger := klog.Background().WithName("prepareClusterConfig")
 	configFile, err := openPath(d.ConfigPath)
 	if err != nil {
 		return nil, "", fmt.Errorf("failed to read cluster config file at %q: %v", d.ConfigPath, err)
@@ -230,12 +231,12 @@ func (d *deployer) prepareClusterConfig(clusterID string) (*armcontainerservicev
 		return nil, "", fmt.Errorf("failed to prepare custom config: %v", err)
 	}
 
-	klog.Infof("Customized configurations are: %s", string(customConfig))
+	logger.Info("Customized configurations", "config", string(customConfig))
 
 	encodedCustomConfig := base64.StdEncoding.EncodeToString(customConfig)
 	clusterConfig = strings.ReplaceAll(clusterConfig, "{CUSTOM_CONFIG}", encodedCustomConfig)
 
-	klog.Infof("AKS cluster config without credential: %s", clusterConfig)
+	logger.Info("AKS cluster config without credential", "config", clusterConfig)
 
 	mcConfig := &armcontainerservicev2.ManagedCluster{}
 	err = json.Unmarshal([]byte(clusterConfig), mcConfig)
@@ -248,10 +249,11 @@ func (d *deployer) prepareClusterConfig(clusterID string) (*armcontainerservicev
 }
 
 func updateAzureCredential(mcConfig *armcontainerservicev2.ManagedCluster) {
-	klog.Infof("Updating Azure credentials to manage cluster resource group")
+	logger := klog.Background().WithName("updateAzureCredential")
+	logger.Info("Updating Azure credentials to manage cluster resource group")
 
 	if len(clientID) != 0 && len(clientSecret) != 0 {
-		klog.Infof("Service principal is used to manage cluster resource group")
+		logger.Info("Service principal is used to manage cluster resource group")
 		// Reset `Identity` in case managed identity is defined in templates while service principal is used.
 		mcConfig.Identity = nil
 		mcConfig.Properties.ServicePrincipalProfile = &armcontainerservicev2.ManagedClusterServicePrincipalProfile{
@@ -262,7 +264,7 @@ func updateAzureCredential(mcConfig *armcontainerservicev2.ManagedCluster) {
 	}
 	// Managed identity is preferable over service principal and picked by default when creating an AKS cluster.
 	// TODO(mainred): we can consider supporting user-assigned managed identity.
-	klog.Infof("System assigned managed identity is used to manage cluster resource group")
+	logger.Info("System assigned managed identity is used to manage cluster resource group")
 	// Reset `ServicePrincipalProfile` in case service principal is defined in templates while managed identity is used.
 	mcConfig.Properties.ServicePrincipalProfile = nil
 	systemAssignedIdentity := armcontainerservicev2.ResourceIdentityTypeSystemAssigned
@@ -273,7 +275,8 @@ func updateAzureCredential(mcConfig *armcontainerservicev2.ManagedCluster) {
 
 // createAKSWithCustomConfig creates an AKS cluster with custom configuration.
 func (d *deployer) createAKSWithCustomConfig() error {
-	klog.Infof("Creating the AKS cluster with custom config")
+	logger := klog.Background().WithName("createAKSWithCustomConfig")
+	logger.Info("Creating the AKS cluster with custom config")
 	clusterID := fmt.Sprintf("/subscriptions/%s/resourcegroups/%s/providers/Microsoft.ContainerService/managedClusters/%s", subscriptionID, d.ResourceGroupName, d.ClusterName)
 
 	mcConfig, encodedCustomConfig, err := d.prepareClusterConfig(clusterID)
@@ -307,13 +310,14 @@ func (d *deployer) createAKSWithCustomConfig() error {
 		return fmt.Errorf("failed to put resource: %v", err.Error())
 	}
 
-	klog.Infof("An AKS cluster %q in resource group %q is created", d.ClusterName, d.ResourceGroupName)
+	logger.Info("An AKS cluster is created", "clusterName", d.ClusterName, "resourceGroup", d.ResourceGroupName)
 	return nil
 }
 
 // getAKSKubeconfig gets kubeconfig of the AKS cluster and writes it to specific path.
 func (d *deployer) getAKSKubeconfig() error {
-	klog.Infof("Retrieving AKS cluster's kubeconfig")
+	logger := klog.Background().WithName("getAKSKubeconfig")
+	logger.Info("Retrieving AKS cluster's kubeconfig")
 	client, err := armcontainerservicev2.NewManagedClustersClient(subscriptionID, cred, nil)
 	if err != nil {
 		return fmt.Errorf("failed to new managed cluster client with sub ID %q: %v", subscriptionID, err)
@@ -324,7 +328,7 @@ func (d *deployer) getAKSKubeconfig() error {
 		resp, err = client.ListClusterUserCredentials(ctx, d.ResourceGroupName, d.ClusterName, nil)
 		if err != nil {
 			if strings.Contains(err.Error(), "404 Not Found") {
-				klog.Infof("failed to list cluster user credentials for 1 minute, retrying")
+				logger.Info("failed to list cluster user credentials for 1 minute, retrying")
 				return false, nil
 			}
 			return false, fmt.Errorf("failed to list cluster user credentials with resource group name %q, cluster ID %q: %v", d.ResourceGroupName, d.ClusterName, err)
@@ -349,7 +353,7 @@ func (d *deployer) getAKSKubeconfig() error {
 		return fmt.Errorf("failed to write kubeconfig to %s", destPath)
 	}
 
-	klog.Infof("Succeeded in getting kubeconfig of cluster %q in resource group %q", d.ClusterName, d.ResourceGroupName)
+	logger.Info("Succeeded in getting kubeconfig of cluster", "clusterName", d.ClusterName, "resourceGroup", d.ResourceGroupName)
 	return nil
 }
 
@@ -380,6 +384,7 @@ func (d *deployer) verifyUpFlags() error {
 }
 
 func (d *deployer) Up() error {
+	logger := klog.Background().WithName("Up")
 	if err := d.verifyUpFlags(); err != nil {
 		return fmt.Errorf("up flags are invalid: %v", err)
 	}
@@ -389,7 +394,7 @@ func (d *deployer) Up() error {
 	if err != nil {
 		return fmt.Errorf("failed to create the resource group: %v", err)
 	}
-	klog.Infof("Resource group %s created", *resourceGroup.ResourceGroup.ID)
+	logger.Info("Resource group created", "resourceGroupID", *resourceGroup.ResourceGroup.ID)
 
 	// Create the AKS cluster
 	if err := d.createAKSWithCustomConfig(); err != nil {

pkg/azclient/policy/retryaftermin/retryaftermin.go

@@ -23,6 +23,7 @@ import (
 	"time"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
+
 	"k8s.io/klog/v2"
 )
 
@@ -45,6 +46,7 @@ func (p *Policy) GetMinRetryAfter() time.Duration {
 
 // Do implements the policy.Policy interface
 func (p *Policy) Do(req *policy.Request) (*http.Response, error) {
+	logger := klog.Background().WithName("Do")
 	resp, err := req.Next()
 	// If the request failed or the status code is >= 300, return
 	if err != nil || resp == nil || resp.StatusCode >= 300 {
@@ -54,7 +56,7 @@ func (p *Policy) Do(req *policy.Request) (*http.Response, error) {
 	// Check if the response retry-after header is less than the minimum
 	overrideRetryAfter := func(header http.Header, headerName string, retryAfter time.Duration) {
 		if retryAfter < p.minRetryAfter {
-			klog.V(5).Infof("RetryAfterMinPolicy: retry-after value %s is less than minimum %s, removing retry-after header..", retryAfter, p.minRetryAfter)
+			logger.V(5).Info("RetryAfterMinPolicy: retry-after value is less than minimum, removing retry-after header", "retryAfter", retryAfter, "minimum", p.minRetryAfter)
 			header.Del(headerName)
 		}
 	}
@@ -76,7 +78,7 @@ func (p *Policy) Do(req *policy.Request) (*http.Response, error) {
 					// If the retry-after value is less than the minimum, remove it
 					overrideRetryAfter(resp.Header, headerName, retryDuration)
 				} else {
-					klog.V(5).Infof("RetryAfterMinPolicy: not modifying %s header with unrecognized format: %s", headerName, retryAfter)
+					logger.V(5).Info("RetryAfterMinPolicy: not modifying header with unrecognized format", "headerName", headerName, "unrecognized format", retryAfter)
 				}
 			}
 		}

pkg/credentialprovider/azure_acr_helper.go

@@ -58,7 +58,8 @@ import (
 	"unicode"
 
 	utilnet "k8s.io/apimachinery/pkg/util/net"
-	"k8s.io/klog/v2"
+
+	"sigs.k8s.io/cloud-provider-azure/pkg/log"
 )
 
 const (
@@ -144,6 +145,7 @@ func performTokenExchange(
 	directive *authDirective,
 	tenant string,
 	accessToken string) (string, error) {
+	logger := log.Background().WithName("performTokenExchange")
 	var err error
 	data := url.Values{
 		"service":       []string{directive.service},
@@ -176,7 +178,7 @@ func performTokenExchange(
 
 	if exchange.Header != nil {
 		if correlationID, ok := exchange.Header["X-Ms-Correlation-Request-Id"]; ok {
-			klog.V(4).Infof("correlationID: %s", correlationID)
+			logger.V(4).Info("", "correlationID", correlationID)
 		}
 	}