Merge pull request #913 from k8s-infra-cherrypick-robot/cherry-pick-9…

…12-to-release-1.6

[release-1.6] Map filestore system limit error to ResourceExhausted error code

pkg/cloud_provider/file/file.go

@@ -672,6 +672,19 @@ func containsUserErrStr(err error) *codes.Code {
 	return nil
 }
 
+// isFilestoreLimitError returns a pointer to the grpc error code
+// ResourceExhausted if the passed in error contains the
+// "System limit for internal resources has been reached" string.
+func isFilestoreLimitError(err error) *codes.Code {
+	if err == nil {
+		return nil
+	}
+	if strings.Contains(err.Error(), "System limit for internal resources has been reached") {
+		return util.ErrCodePtr(codes.ResourceExhausted)
+	}
+	return nil
+}
+
 // isContextError returns a pointer to the grpc error code DeadlineExceeded
 // if the passed in error contains the "context deadline exceeded" string and returns
 // the grpc error code Canceled if the error contains the "context canceled" string.
@@ -763,6 +776,9 @@ func codeForError(err error) *codes.Code {
 	if errCode := isContextError(err); errCode != nil {
 		return errCode
 	}
+	if errCode := isFilestoreLimitError(err); errCode != nil {
+		return errCode
+	}
 	if errCode := isGoogleAPIError(err); errCode != nil {
 		return errCode
 	}

pkg/cloud_provider/file/file_test.go

@@ -648,6 +648,11 @@ func TestCodeForError(t *testing.T) {
 			err:             nil,
 			expectedErrCode: nil,
 		},
+		{
+			name:            "Filestore system limit error",
+			err:             fmt.Errorf("got error: System limit for internal resources has been reached"),
+			expectedErrCode: util.ErrCodePtr(codes.ResourceExhausted),
+		},
 	}
 
 	for _, test := range cases {