Merge pull request kubernetes#5095 from x13n/patch-3

Fix error logging when waiting for GCE operation
navinjoy · Aug 16, 2022 · 668d94f · 668d94f
2 parents 3f27f6f + b6e3d56
commit 668d94f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/cluster-autoscaler/cloudprovider/gce/autoscaling_gce_client.go b/cluster-autoscaler/cloudprovider/gce/autoscaling_gce_client.go
@@ -234,7 +234,11 @@ func (client *autoscalingGceClientV1) waitForOp(operation *gce.Operation, projec
 			klog.V(4).Infof("Operation %s %s %s status: %s", project, zone, operation.Name, op.Status)
 			if op.Status == "DONE" {
 				if op.Error != nil {
-					return fmt.Errorf("error while getting operation %s on %s: %v", operation.Name, operation.TargetLink, err)
+					errBytes, err := op.Error.MarshalJSON()
+					if err != nil {
+						errBytes = []byte(fmt.Sprintf("operation failed, but error couldn't be recovered: %v", err))
+					}
+					return fmt.Errorf("error while getting operation %s on %s: %v", operation.Name, operation.TargetLink, errBytes)
 				}
 
 				return nil