Merge pull request #1066 from stoneshi-yunify/master

stoneshi-yunify · web-flow · commit a4fe6260b501 · 2025-11-06T14:17:40.000+08:00
change log level for error
diff --git a/controllers/jenkins/devopscredential/devopscredential_controller.go b/controllers/jenkins/devopscredential/devopscredential_controller.go
@@ -266,14 +266,14 @@ func (c *Controller) syncHandler(key string) error {
 			if _, ok := copySecret.Annotations[devopsv1alpha3.CredentialAutoSyncAnnoKey]; ok {
 				_, err := c.devopsClient.UpdateCredentialInProject(nsName, copySecret)
 				if err != nil {
-					klog.V(8).Info(err, fmt.Sprintf("failed to update secret %s ", key))
+					klog.ErrorS(err, fmt.Sprintf("failed to update secret %s ", key))
 					return err
 				}
 			}
 		} else {
 			_, err = c.devopsClient.CreateCredentialInProject(nsName, copySecret)
 			if err != nil {
-				klog.V(8).Info(err, fmt.Sprintf("failed to create secret %s ", key))
+				klog.ErrorS(err, fmt.Sprintf("failed to create secret %s ", key))
 				return err
 			}
 		}
@@ -293,7 +293,7 @@ func (c *Controller) syncHandler(key string) error {
 					klog.Error(fmt.Sprintf("unexpected error type: %v, should be *restful.ServiceError", err))
 				}
 
-				klog.V(8).Info(err, fmt.Sprintf("failed to delete secret %s in devops", key))
+				klog.ErrorS(err, fmt.Sprintf("failed to delete secret %s in devops", key))
 			} else {
 				delSuccess = true
 			}
@@ -313,7 +313,7 @@ func (c *Controller) syncHandler(key string) error {
 	if !reflect.DeepEqual(secret, copySecret) {
 		_, err = c.client.CoreV1().Secrets(nsName).Update(context.Background(), copySecret, metav1.UpdateOptions{})
 		if err != nil {
-			klog.V(8).Info(err, fmt.Sprintf("failed to update secret %s ", key))
+			klog.ErrorS(err, fmt.Sprintf("failed to update secret %s ", key))
 			return err
 		}
 	}
diff --git a/controllers/jenkins/devopsproject/devopsproject_controller.go b/controllers/jenkins/devopsproject/devopsproject_controller.go
@@ -207,7 +207,7 @@ func (c *Controller) syncHandler(key string) error {
 			klog.Info(fmt.Sprintf("devopsproject '%s' in work queue no longer exists ", key))
 			return nil
 		}
-		klog.V(8).Info(err, fmt.Sprintf("could not get devopsproject %s ", key))
+		klog.ErrorS(err, fmt.Sprintf("could not get devopsproject %s ", key))
 		return err
 	}
 	copyProject := project.DeepCopy()
@@ -227,14 +227,14 @@ func (c *Controller) syncHandler(key string) error {
 		if project.Status.AdminNamespace != "" {
 			ns, err := c.namespaceLister.Get(project.Status.AdminNamespace)
 			if err != nil && !errors.IsNotFound(err) {
-				klog.V(8).Info(err, "failed to get namespace")
+				klog.ErrorS(err, "failed to get namespace")
 				return err
 			} else if errors.IsNotFound(err) {
 				// if admin ns is not found, clean project status, rerun reconcile
 				copyProject.Status.AdminNamespace = ""
 				_, err := c.kubesphereClient.DevopsV1alpha3().DevOpsProjects().Update(context.Background(), copyProject, metav1.UpdateOptions{})
 				if err != nil {
-					klog.V(8).Info(err, fmt.Sprintf("failed to update project %s ", key))
+					klog.ErrorS(err, fmt.Sprintf("failed to update project %s ", key))
 					return err
 				}
 				c.enqueueDevOpsProject(key)
@@ -250,7 +250,7 @@ func (c *Controller) syncHandler(key string) error {
 				copyNs.Labels[constants.DevOpsProjectLabelKey] = project.Name
 				_, err = c.client.CoreV1().Namespaces().Update(context.Background(), copyNs, metav1.UpdateOptions{})
 				if err != nil {
-					klog.V(8).Info(err, fmt.Sprintf("failed to update ns %s ", key))
+					klog.ErrorS(err, fmt.Sprintf("failed to update ns %s ", key))
 					return err
 				}
 			}
@@ -260,7 +260,7 @@ func (c *Controller) syncHandler(key string) error {
 			namespaces, err := c.namespaceLister.List(
 				labels.SelectorFromSet(labels.Set{constants.DevOpsProjectLabelKey: project.Name}))
 			if err != nil {
-				klog.V(8).Info(err, fmt.Sprintf("failed to list ns %s ", key))
+				klog.ErrorS(err, fmt.Sprintf("failed to list ns %s ", key))
 				return err
 			}
 			// if there is no ns, generate new one
@@ -274,7 +274,7 @@ func (c *Controller) syncHandler(key string) error {
 						c.eventRecorder.Event(project, v1.EventTypeWarning, "CreateAdminNamespaceFailed", err.Error())
 						return err
 					}
-					klog.V(8).Info(err, fmt.Sprintf("failed to create ns %s ", key))
+					klog.ErrorS(err, fmt.Sprintf("failed to create ns %s ", key))
 					return err
 				}
 				copyProject.Status.AdminNamespace = ns.Name
@@ -285,7 +285,7 @@ func (c *Controller) syncHandler(key string) error {
 					copyNs.Labels[constants.DevOpsProjectLabelKey] = project.Name
 					_, err = c.client.CoreV1().Namespaces().Update(context.Background(), copyNs, metav1.UpdateOptions{})
 					if err != nil {
-						klog.V(8).Info(err, fmt.Sprintf("failed to update ns %s ", key))
+						klog.ErrorS(err, fmt.Sprintf("failed to update ns %s ", key))
 						return err
 					}
 				}
@@ -304,7 +304,7 @@ func (c *Controller) syncHandler(key string) error {
 		if err != nil {
 			_, err := c.devopsClient.CreateDevOpsProject(copyProject.Status.AdminNamespace)
 			if err != nil {
-				klog.V(8).Info(err, fmt.Sprintf("failed to get project %s ", key))
+				klog.ErrorS(err, fmt.Sprintf("failed to get project %s ", key))
 				return err
 			}
 		}
@@ -317,7 +317,7 @@ func (c *Controller) syncHandler(key string) error {
 		if !reflect.DeepEqual(copyProject, project) {
 			_, err = c.kubesphereClient.DevopsV1alpha3().DevOpsProjects().Update(context.Background(), copyProject, metav1.UpdateOptions{})
 			if err != nil {
-				klog.V(8).Info(err, fmt.Sprintf("failed to update ns %s ", key))
+				klog.ErrorS(err, fmt.Sprintf("failed to update ns %s ", key))
 				return err
 			}
 		}
@@ -336,7 +336,7 @@ func (c *Controller) syncHandler(key string) error {
 					klog.Error(fmt.Sprintf("unexpected error type: %v, should be *restful.ServiceError", err))
 				}
 
-				klog.V(8).Info(err, fmt.Sprintf("failed to delete resource %s in devops", key))
+				klog.ErrorS(err, fmt.Sprintf("failed to delete resource %s in devops", key))
 			} else {
 				delSuccess = true
 			}
@@ -353,7 +353,7 @@ func (c *Controller) syncHandler(key string) error {
 
 			_, err = c.kubesphereClient.DevopsV1alpha3().DevOpsProjects().Update(context.Background(), project, metav1.UpdateOptions{})
 			if err != nil {
-				klog.V(8).Info(err, fmt.Sprintf("failed to update project %s ", key))
+				klog.ErrorS(err, fmt.Sprintf("failed to update project %s ", key))
 				return err
 			}
 		}
diff --git a/controllers/jenkins/pipeline/pipeline_controller.go b/controllers/jenkins/pipeline/pipeline_controller.go
@@ -214,7 +214,7 @@ func (c *Controller) syncHandler(key string) error {
 	//		klog.Info(fmt.Sprintf("namespace '%s' in work queue no longer exists ", key))
 	//		return nil
 	//	}
-	//	klog.V(8).Info(err, fmt.Sprintf("could not get namespace %s ", key))
+	//	klog.ErrorS(err, fmt.Sprintf("could not get namespace %s ", key))
 	//	return err
 	//}
 	// TODO this is the KubeSphere core part instead of the DevOps part
@@ -265,7 +265,7 @@ func (c *Controller) syncHandler(key string) error {
 			if !reflect.DeepEqual(jenkinsPipeline.Spec, copyPipeline.Spec) {
 				_, err := c.devopsClient.UpdateProjectPipeline(nsName, copyPipeline)
 				if err != nil {
-					klog.V(8).Info(err, fmt.Sprintf("failed to update pipeline config %s ", key))
+					klog.ErrorS(err, fmt.Sprintf("failed to update pipeline config %s ", key))
 					return err
 				}
 			} else {
@@ -274,7 +274,7 @@ func (c *Controller) syncHandler(key string) error {
 		} else {
 			_, err = c.devopsClient.CreateProjectPipeline(nsName, copyPipeline)
 			if err != nil {
-				klog.V(8).Info(err, fmt.Sprintf("failed to create copyPipeline %s ", key))
+				klog.ErrorS(err, fmt.Sprintf("failed to create copyPipeline %s ", key))
 				return err
 			}
 		}
@@ -295,7 +295,7 @@ func (c *Controller) syncHandler(key string) error {
 					klog.Error(fmt.Sprintf("unexpected error type: %v, should be *restful.ServiceError", err))
 				}
 
-				klog.V(8).Info(err, fmt.Sprintf("failed to delete pipeline %s in devops", key))
+				klog.ErrorS(err, fmt.Sprintf("failed to delete pipeline %s in devops", key))
 			} else {
 				delSuccess = true
 			}
diff --git a/pkg/client/devops/jenkins/pure_request.go b/pkg/client/devops/jenkins/pure_request.go
@@ -40,7 +40,7 @@ func (j *Jenkins) SendPureRequest(path string, httpParameters *devops.HttpParame
 func (j *Jenkins) SendPureRequestWithHeaderResp(path string, httpParameters *devops.HttpParameters) ([]byte, http.Header, error) {
 	apiURL, err := url.Parse(j.Server + path)
 	if err != nil {
-		klog.V(8).Info(err)
+		klog.ErrorS(err, "failed to parse url")
 		return nil, nil, err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -266,14 +266,14 @@ func (c *Controller) syncHandler(key string) error {`
`266`	`266`	`if _, ok := copySecret.Annotations[devopsv1alpha3.CredentialAutoSyncAnnoKey]; ok {`
`267`	`267`	`_, err := c.devopsClient.UpdateCredentialInProject(nsName, copySecret)`
`268`	`268`	`if err != nil {`
`269`		`- klog.V(8).Info(err, fmt.Sprintf("failed to update secret %s ", key))`
	`269`	`+ klog.ErrorS(err, fmt.Sprintf("failed to update secret %s ", key))`
`270`	`270`	`return err`
`271`	`271`	`}`
`272`	`272`	`}`
`273`	`273`	`} else {`
`274`	`274`	`_, err = c.devopsClient.CreateCredentialInProject(nsName, copySecret)`
`275`	`275`	`if err != nil {`
`276`		`- klog.V(8).Info(err, fmt.Sprintf("failed to create secret %s ", key))`
	`276`	`+ klog.ErrorS(err, fmt.Sprintf("failed to create secret %s ", key))`
`277`	`277`	`return err`
`278`	`278`	`}`
`279`	`279`	`}`
`@@ -293,7 +293,7 @@ func (c *Controller) syncHandler(key string) error {`
`293`	`293`	`klog.Error(fmt.Sprintf("unexpected error type: %v, should be *restful.ServiceError", err))`
`294`	`294`	`}`
`295`	`295`
`296`		`- klog.V(8).Info(err, fmt.Sprintf("failed to delete secret %s in devops", key))`
	`296`	`+ klog.ErrorS(err, fmt.Sprintf("failed to delete secret %s in devops", key))`
`297`	`297`	`} else {`
`298`	`298`	`delSuccess = true`
`299`	`299`	`}`
`@@ -313,7 +313,7 @@ func (c *Controller) syncHandler(key string) error {`
`313`	`313`	`if !reflect.DeepEqual(secret, copySecret) {`
`314`	`314`	`_, err = c.client.CoreV1().Secrets(nsName).Update(context.Background(), copySecret, metav1.UpdateOptions{})`
`315`	`315`	`if err != nil {`
`316`		`- klog.V(8).Info(err, fmt.Sprintf("failed to update secret %s ", key))`
	`316`	`+ klog.ErrorS(err, fmt.Sprintf("failed to update secret %s ", key))`
`317`	`317`	`return err`
`318`	`318`	`}`
`319`	`319`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ func (c *Controller) syncHandler(key string) error {`
`207`	`207`	`klog.Info(fmt.Sprintf("devopsproject '%s' in work queue no longer exists ", key))`
`208`	`208`	`return nil`
`209`	`209`	`}`
`210`		`- klog.V(8).Info(err, fmt.Sprintf("could not get devopsproject %s ", key))`
	`210`	`+ klog.ErrorS(err, fmt.Sprintf("could not get devopsproject %s ", key))`
`211`	`211`	`return err`
`212`	`212`	`}`
`213`	`213`	`copyProject := project.DeepCopy()`
`@@ -227,14 +227,14 @@ func (c *Controller) syncHandler(key string) error {`
`227`	`227`	`if project.Status.AdminNamespace != "" {`
`228`	`228`	`ns, err := c.namespaceLister.Get(project.Status.AdminNamespace)`
`229`	`229`	`if err != nil && !errors.IsNotFound(err) {`
`230`		`- klog.V(8).Info(err, "failed to get namespace")`
	`230`	`+ klog.ErrorS(err, "failed to get namespace")`
`231`	`231`	`return err`
`232`	`232`	`} else if errors.IsNotFound(err) {`
`233`	`233`	`// if admin ns is not found, clean project status, rerun reconcile`
`234`	`234`	`copyProject.Status.AdminNamespace = ""`
`235`	`235`	`_, err := c.kubesphereClient.DevopsV1alpha3().DevOpsProjects().Update(context.Background(), copyProject, metav1.UpdateOptions{})`
`236`	`236`	`if err != nil {`
`237`		`- klog.V(8).Info(err, fmt.Sprintf("failed to update project %s ", key))`
	`237`	`+ klog.ErrorS(err, fmt.Sprintf("failed to update project %s ", key))`
`238`	`238`	`return err`
`239`	`239`	`}`
`240`	`240`	`c.enqueueDevOpsProject(key)`
`@@ -250,7 +250,7 @@ func (c *Controller) syncHandler(key string) error {`
`250`	`250`	`copyNs.Labels[constants.DevOpsProjectLabelKey] = project.Name`
`251`	`251`	`_, err = c.client.CoreV1().Namespaces().Update(context.Background(), copyNs, metav1.UpdateOptions{})`
`252`	`252`	`if err != nil {`
`253`		`- klog.V(8).Info(err, fmt.Sprintf("failed to update ns %s ", key))`
	`253`	`+ klog.ErrorS(err, fmt.Sprintf("failed to update ns %s ", key))`
`254`	`254`	`return err`
`255`	`255`	`}`
`256`	`256`	`}`
`@@ -260,7 +260,7 @@ func (c *Controller) syncHandler(key string) error {`
`260`	`260`	`namespaces, err := c.namespaceLister.List(`
`261`	`261`	`labels.SelectorFromSet(labels.Set{constants.DevOpsProjectLabelKey: project.Name}))`
`262`	`262`	`if err != nil {`
`263`		`- klog.V(8).Info(err, fmt.Sprintf("failed to list ns %s ", key))`
	`263`	`+ klog.ErrorS(err, fmt.Sprintf("failed to list ns %s ", key))`
`264`	`264`	`return err`
`265`	`265`	`}`
`266`	`266`	`// if there is no ns, generate new one`
`@@ -274,7 +274,7 @@ func (c *Controller) syncHandler(key string) error {`
`274`	`274`	`c.eventRecorder.Event(project, v1.EventTypeWarning, "CreateAdminNamespaceFailed", err.Error())`
`275`	`275`	`return err`
`276`	`276`	`}`
`277`		`- klog.V(8).Info(err, fmt.Sprintf("failed to create ns %s ", key))`
	`277`	`+ klog.ErrorS(err, fmt.Sprintf("failed to create ns %s ", key))`
`278`	`278`	`return err`
`279`	`279`	`}`
`280`	`280`	`copyProject.Status.AdminNamespace = ns.Name`
`@@ -285,7 +285,7 @@ func (c *Controller) syncHandler(key string) error {`
`285`	`285`	`copyNs.Labels[constants.DevOpsProjectLabelKey] = project.Name`
`286`	`286`	`_, err = c.client.CoreV1().Namespaces().Update(context.Background(), copyNs, metav1.UpdateOptions{})`
`287`	`287`	`if err != nil {`
`288`		`- klog.V(8).Info(err, fmt.Sprintf("failed to update ns %s ", key))`
	`288`	`+ klog.ErrorS(err, fmt.Sprintf("failed to update ns %s ", key))`
`289`	`289`	`return err`
`290`	`290`	`}`
`291`	`291`	`}`
`@@ -304,7 +304,7 @@ func (c *Controller) syncHandler(key string) error {`
`304`	`304`	`if err != nil {`
`305`	`305`	`_, err := c.devopsClient.CreateDevOpsProject(copyProject.Status.AdminNamespace)`
`306`	`306`	`if err != nil {`
`307`		`- klog.V(8).Info(err, fmt.Sprintf("failed to get project %s ", key))`
	`307`	`+ klog.ErrorS(err, fmt.Sprintf("failed to get project %s ", key))`
`308`	`308`	`return err`
`309`	`309`	`}`
`310`	`310`	`}`
`@@ -317,7 +317,7 @@ func (c *Controller) syncHandler(key string) error {`
`317`	`317`	`if !reflect.DeepEqual(copyProject, project) {`
`318`	`318`	`_, err = c.kubesphereClient.DevopsV1alpha3().DevOpsProjects().Update(context.Background(), copyProject, metav1.UpdateOptions{})`
`319`	`319`	`if err != nil {`
`320`		`- klog.V(8).Info(err, fmt.Sprintf("failed to update ns %s ", key))`
	`320`	`+ klog.ErrorS(err, fmt.Sprintf("failed to update ns %s ", key))`
`321`	`321`	`return err`
`322`	`322`	`}`
`323`	`323`	`}`
`@@ -336,7 +336,7 @@ func (c *Controller) syncHandler(key string) error {`
`336`	`336`	`klog.Error(fmt.Sprintf("unexpected error type: %v, should be *restful.ServiceError", err))`
`337`	`337`	`}`
`338`	`338`
`339`		`- klog.V(8).Info(err, fmt.Sprintf("failed to delete resource %s in devops", key))`
	`339`	`+ klog.ErrorS(err, fmt.Sprintf("failed to delete resource %s in devops", key))`
`340`	`340`	`} else {`
`341`	`341`	`delSuccess = true`
`342`	`342`	`}`
`@@ -353,7 +353,7 @@ func (c *Controller) syncHandler(key string) error {`
`353`	`353`
`354`	`354`	`_, err = c.kubesphereClient.DevopsV1alpha3().DevOpsProjects().Update(context.Background(), project, metav1.UpdateOptions{})`
`355`	`355`	`if err != nil {`
`356`		`- klog.V(8).Info(err, fmt.Sprintf("failed to update project %s ", key))`
	`356`	`+ klog.ErrorS(err, fmt.Sprintf("failed to update project %s ", key))`
`357`	`357`	`return err`
`358`	`358`	`}`
`359`	`359`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func (j Jenkins) SendPureRequest(path string, httpParameters devops.HttpParame`
`40`	`40`	`func (j Jenkins) SendPureRequestWithHeaderResp(path string, httpParameters devops.HttpParameters) ([]byte, http.Header, error) {`
`41`	`41`	`apiURL, err := url.Parse(j.Server + path)`
`42`	`42`	`if err != nil {`
`43`		`- klog.V(8).Info(err)`
	`43`	`+ klog.ErrorS(err, "failed to parse url")`
`44`	`44`	`return nil, nil, err`
`45`	`45`	`}`
`46`	`46`