Merge pull request kubernetes-sigs#70 from dfajmon/rebase-v1.14.2

openshift-merge-bot[bot] · web-flow · commit 3e91f9103597 · 2024-10-10T05:59:23.000Z
STOR-2012: Rebase to upstream v1.14.2 for OCP 4.18
diff --git a/pkg/gce-cloud-provider/compute/gce-compute.go b/pkg/gce-cloud-provider/compute/gce-compute.go
@@ -1129,7 +1129,7 @@ func codeForGCEOpError(err computev1.OperationErrorErrors) codes.Code {
 		"RESOURCE_NOT_FOUND":                        codes.NotFound,
 		"RESOURCE_ALREADY_EXISTS":                   codes.AlreadyExists,
 		"RESOURCE_IN_USE_BY_ANOTHER_RESOURCE":       codes.InvalidArgument,
-		"OPERATION_CANCELED_BY_USER":                codes.Aborted,
+		"OPERATION_CANCELED_BY_USER":                codes.Canceled,
 		"QUOTA_EXCEEDED":                            codes.ResourceExhausted,
 		"ZONE_RESOURCE_POOL_EXHAUSTED":              codes.Unavailable,
 		"ZONE_RESOURCE_POOL_EXHAUSTED_WITH_DETAILS": codes.Unavailable,
diff --git a/pkg/gce-cloud-provider/compute/gce-compute_test.go b/pkg/gce-cloud-provider/compute/gce-compute_test.go
@@ -122,7 +122,7 @@ func TestCodeForGCEOpError(t *testing.T) {
 		{
 			name:     "OPERATION_CANCELED_BY_USER error",
 			inputErr: computev1.OperationErrorErrors{Code: "OPERATION_CANCELED_BY_USER"},
-			expCode:  codes.Aborted,
+			expCode:  codes.Canceled,
 		},
 		{
 			name:     "QUOTA_EXCEEDED error",

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ func TestCodeForGCEOpError(t *testing.T) {`
`122`	`122`	`{`
`123`	`123`	`name: "OPERATION_CANCELED_BY_USER error",`
`124`	`124`	`inputErr: computev1.OperationErrorErrors{Code: "OPERATION_CANCELED_BY_USER"},`
`125`		`- expCode: codes.Aborted,`
	`125`	`+ expCode: codes.Canceled,`
`126`	`126`	`},`
`127`	`127`	`{`
`128`	`128`	`name: "QUOTA_EXCEEDED error",`