From 4699343bcfde9607a8c581875f5bb1036780809b Mon Sep 17 00:00:00 2001 From: chen zechun Date: Thu, 29 Dec 2022 17:53:26 +0800 Subject: [PATCH] Remove unnecessary fmt.Sprintf for logging Signed-off-by: chen zechun --- test/e2e/mcs_test.go | 2 +- test/e2e/resourceinterpreter_test.go | 13 ++++++------- test/e2e/scheduling_test.go | 28 ++++++++++++++-------------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/test/e2e/mcs_test.go b/test/e2e/mcs_test.go index a94d06bb7..218ed2b12 100644 --- a/test/e2e/mcs_test.go +++ b/test/e2e/mcs_test.go @@ -419,7 +419,7 @@ var _ = ginkgo.Describe("Multi-Cluster Service testing", func() { }, pollTimeout, pollInterval).Should(gomega.Equal(1)) }) - klog.Infof(fmt.Sprintf("Update Deployment's replicas in %s cluster", serviceExportClusterName)) + klog.Infof("Update Deployment's replicas in %s cluster", serviceExportClusterName) framework.UpdateDeploymentReplicas(exportClusterClient, &demoDeployment, 2) ginkgo.By(fmt.Sprintf("Wait EndpointSlice update in %s cluster", serviceImportClusterName), func() { diff --git a/test/e2e/resourceinterpreter_test.go b/test/e2e/resourceinterpreter_test.go index 548f824ca..9f409b66d 100644 --- a/test/e2e/resourceinterpreter_test.go +++ b/test/e2e/resourceinterpreter_test.go @@ -3,7 +3,6 @@ package e2e import ( "context" "encoding/json" - "fmt" "reflect" "time" @@ -73,8 +72,8 @@ var _ = ginkgo.Describe("Resource interpreter webhook testing", func() { resourceBinding, err := karmadaClient.WorkV1alpha2().ResourceBindings(workload.Namespace).Get(context.TODO(), resourceBindingName, metav1.GetOptions{}) g.Expect(err).NotTo(gomega.HaveOccurred()) - klog.Infof(fmt.Sprintf("ResourceBinding(%s/%s)'s replicas is %d, expected: %d.", - resourceBinding.Namespace, resourceBinding.Name, resourceBinding.Spec.Replicas, expectedReplicas)) + klog.Infof("ResourceBinding(%s/%s)'s replicas is %d, expected: %d.", + resourceBinding.Namespace, resourceBinding.Name, resourceBinding.Spec.Replicas, expectedReplicas) return resourceBinding.Spec.Replicas, nil }, pollTimeout, pollInterval).Should(gomega.Equal(expectedReplicas)) }) @@ -351,14 +350,14 @@ var _ = framework.SerialDescribe("Resource interpreter customization testing", f resourceBinding, err := karmadaClient.WorkV1alpha2().ResourceBindings(deployment.Namespace).Get(context.TODO(), resourceBindingName, metav1.GetOptions{}) g.Expect(err).NotTo(gomega.HaveOccurred()) - klog.Infof(fmt.Sprintf("ResourceBinding(%s/%s)'s replicas is %d, expected: %d.", - resourceBinding.Namespace, resourceBinding.Name, resourceBinding.Spec.Replicas, expectedReplicas)) + klog.Infof("ResourceBinding(%s/%s)'s replicas is %d, expected: %d.", + resourceBinding.Namespace, resourceBinding.Name, resourceBinding.Spec.Replicas, expectedReplicas) if resourceBinding.Spec.Replicas != expectedReplicas { return false, nil } - klog.Infof(fmt.Sprintf("ResourceBinding(%s/%s)'s replicaRequirements is %+v, expected: %+v.", - resourceBinding.Namespace, resourceBinding.Name, resourceBinding.Spec.ReplicaRequirements, expectedReplicaRequirements)) + klog.Infof("ResourceBinding(%s/%s)'s replicaRequirements is %+v, expected: %+v.", + resourceBinding.Namespace, resourceBinding.Name, resourceBinding.Spec.ReplicaRequirements, expectedReplicaRequirements) return reflect.DeepEqual(resourceBinding.Spec.ReplicaRequirements, expectedReplicaRequirements), nil }, pollTimeout, pollInterval).Should(gomega.Equal(true)) }) diff --git a/test/e2e/scheduling_test.go b/test/e2e/scheduling_test.go index 2a2fec8c9..0feff6147 100644 --- a/test/e2e/scheduling_test.go +++ b/test/e2e/scheduling_test.go @@ -397,8 +397,8 @@ var _ = ginkgo.Describe("[ReplicaScheduling] ReplicaSchedulingStrategy testing", klog.Infof("check if deployment's replicas are duplicate on member clusters") framework.WaitDeploymentPresentOnClustersFitWith(framework.ClusterNames(), deployment.Namespace, deployment.Name, func(deploy *appsv1.Deployment) bool { - klog.Infof(fmt.Sprintf("Deployment(%s/%s)'s replcas is %d, expected: %d.", - deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, *deployment.Spec.Replicas)) + klog.Infof("Deployment(%s/%s)'s replcas is %d, expected: %d.", + deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, *deployment.Spec.Replicas) return *deploy.Spec.Replicas == *deployment.Spec.Replicas }) }) @@ -417,8 +417,8 @@ var _ = ginkgo.Describe("[ReplicaScheduling] ReplicaSchedulingStrategy testing", klog.Infof("check if deployment's replicas have been updated on member clusters") framework.WaitDeploymentPresentOnClustersFitWith(framework.ClusterNames(), deployment.Namespace, deployment.Name, func(deploy *appsv1.Deployment) bool { - klog.Infof(fmt.Sprintf("Deployment(%s/%s)'s replcas is %d, expected: %d.", - deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, *deployment.Spec.Replicas)) + klog.Infof("Deployment(%s/%s)'s replcas is %d, expected: %d.", + deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, *deployment.Spec.Replicas) return *deploy.Spec.Replicas == *deployment.Spec.Replicas }) }) @@ -443,8 +443,8 @@ var _ = ginkgo.Describe("[ReplicaScheduling] ReplicaSchedulingStrategy testing", klog.Infof("check if deployment's replicas are divided equally on member clusters") framework.WaitDeploymentPresentOnClustersFitWith(framework.ClusterNames(), deployment.Namespace, deployment.Name, func(deploy *appsv1.Deployment) bool { - klog.Infof(fmt.Sprintf("Deployment(%s/%s)'s replcas is %d, expected: %d.", - deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, expectedReplicas)) + klog.Infof("Deployment(%s/%s)'s replcas is %d, expected: %d.", + deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, expectedReplicas) return *deploy.Spec.Replicas == expectedReplicas }) }) @@ -474,8 +474,8 @@ var _ = ginkgo.Describe("[ReplicaScheduling] ReplicaSchedulingStrategy testing", klog.Infof("check if deployment's replicas are divided equally on member clusters") framework.WaitDeploymentPresentOnClustersFitWith(framework.ClusterNames(), deployment.Namespace, deployment.Name, func(deploy *appsv1.Deployment) bool { - klog.Infof(fmt.Sprintf("Deployment(%s/%s)'s replcas is %d, expected: %d.", - deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, expectedReplicas)) + klog.Infof("Deployment(%s/%s)'s replcas is %d, expected: %d.", + deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, expectedReplicas) return *deploy.Spec.Replicas == expectedReplicas }) }) @@ -523,8 +523,8 @@ var _ = ginkgo.Describe("[ReplicaScheduling] ReplicaSchedulingStrategy testing", memberDeployment, err := clusterClient.AppsV1().Deployments(deploymentNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{}) g.Expect(err).NotTo(gomega.HaveOccurred()) - klog.Infof(fmt.Sprintf("Deployment(%s/%s)'s replcas is %d on cluster(%s), expected: %d.", - deploymentNamespace, deploymentName, *memberDeployment.Spec.Replicas, cluster.Name, expectedReplicas)) + klog.Infof("Deployment(%s/%s)'s replcas is %d on cluster(%s), expected: %d.", + deploymentNamespace, deploymentName, *memberDeployment.Spec.Replicas, cluster.Name, expectedReplicas) return *memberDeployment.Spec.Replicas, nil }, pollTimeout, pollInterval).Should(gomega.Equal(expectedReplicas)) } @@ -582,8 +582,8 @@ var _ = ginkgo.Describe("[ReplicaScheduling] ReplicaSchedulingStrategy testing", memberDeployment, err := clusterClient.AppsV1().Deployments(deploymentNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{}) g.Expect(err).NotTo(gomega.HaveOccurred()) - klog.Infof(fmt.Sprintf("Deployment(%s/%s)'s replcas is %d on cluster(%s), expected: %d.", - deploymentNamespace, deploymentName, *memberDeployment.Spec.Replicas, cluster.Name, expectedReplicas)) + klog.Infof("Deployment(%s/%s)'s replcas is %d on cluster(%s), expected: %d.", + deploymentNamespace, deploymentName, *memberDeployment.Spec.Replicas, cluster.Name, expectedReplicas) return *memberDeployment.Spec.Replicas, nil }, pollTimeout, pollInterval).Should(gomega.Equal(expectedReplicas)) } @@ -666,8 +666,8 @@ var _ = ginkgo.Describe("[JobReplicaScheduling] JobReplicaSchedulingStrategy tes memberJob, err := clusterClient.BatchV1().Jobs(jobNamespace).Get(context.TODO(), jobName, metav1.GetOptions{}) g.Expect(err).NotTo(gomega.HaveOccurred()) - klog.Infof(fmt.Sprintf("Job(%s/%s)'s parallelism is %d on cluster(%s), expected: %d.", - jobNamespace, jobName, *memberJob.Spec.Parallelism, cluster.Name, expectedReplicas)) + klog.Infof("Job(%s/%s)'s parallelism is %d on cluster(%s), expected: %d.", + jobNamespace, jobName, *memberJob.Spec.Parallelism, cluster.Name, expectedReplicas) return *memberJob.Spec.Parallelism, nil }, pollTimeout, pollInterval).Should(gomega.Equal(expectedReplicas)) }