Merge pull request #1408 from amacaskill/automated-cherry-pick-of-#1406-upstream-release-1.11

Automated cherry pick of #1406: Change Unavailable error codes that signal a problem with the

Author: k8s-ci-robot

pkg/gce-cloud-provider/compute/gce-compute.go

@@ -886,7 +886,8 @@ func wrapOpErr(name string, opErr *computev1.OperationErrorErrors) error {
 }
 
 // codeForGCEOpError return the grpc error code for the passed in
-// gce operation error.
+// gce operation error. All of these error codes are filtered out from our SLO,
+// but will be monitored by the stockout reporting dashboard.
 func codeForGCEOpError(err computev1.OperationErrorErrors) codes.Code {
 	userErrors := map[string]codes.Code{
 		"RESOURCE_NOT_FOUND":                        codes.NotFound,

pkg/gce-pd-csi-driver/controller.go

@@ -1902,7 +1902,7 @@ func (b *csiErrorBackoff) code(id csiErrorBackoffId) codes.Code {
 	// If we haven't recorded a code, return unavailable, which signals a problem with the driver
 	// (ie, next() wasn't called correctly).
 	klog.Errorf("using default code for %s", id)
-	return codes.Unavailable
+	return codes.Internal
 }
 
 func (b *csiErrorBackoff) next(id csiErrorBackoffId, code codes.Code) {

pkg/gce-pd-csi-driver/identity.go

@@ -29,7 +29,7 @@ type GCEIdentityServer struct {
 // GetPluginInfo(context.Context, *GetPluginInfoRequest) (*GetPluginInfoResponse, error)
 func (gceIdentity *GCEIdentityServer) GetPluginInfo(ctx context.Context, req *csi.GetPluginInfoRequest) (*csi.GetPluginInfoResponse, error) {
 	if gceIdentity.Driver.name == "" {
-		return nil, status.Error(codes.Unavailable, "Driver name not configured")
+		return nil, status.Error(codes.Internal, "Driver name not configured")
 	}
 
 	return &csi.GetPluginInfoResponse{