github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #34533 from yuexiao-wang/fix-commends

Browse Source 
Automatic merge from submit-queue

Update function name for public function in commend

**What this PR does / why we need it**:
Update function name for public function in commend and fix some typos in log information.

Signed-off-by: yuexiao-wang wang.yuexiao@zte.com.cn
This commit is contained in:
Kubernetes Submit Queue 2017-01-30 09:05:22 -08:00 committed by GitHub
commit 1b9f89691a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/fieldpath/fieldpath.go
View File

@ -63,7 +63,7 @@ func ExtractFieldPathAsString(obj interface{}, fieldPath string) (string, error)
return accessor.GetNamespace(), nil return accessor.GetNamespace(), nil
} }
return "", fmt.Errorf("Unsupported fieldPath: %v", fieldPath) return "", fmt.Errorf("unsupported fieldPath: %v", fieldPath)
} }
// TODO: move the functions below to pkg/api/util/resources // TODO: move the functions below to pkg/api/util/resources
@ -146,7 +146,7 @@ func InternalExtractContainerResourceValue(fs *api.ResourceFieldSelector, contai
return convertResourceMemoryToString(container.Resources.Requests.Memory(), divisor) return convertResourceMemoryToString(container.Resources.Requests.Memory(), divisor)
} }
return "", fmt.Errorf("Unsupported container resource : %v", fs.Resource) return "", fmt.Errorf("unsupported container resource : %v", fs.Resource)
} }
// findContainerInPod finds a container by its name in the provided pod // findContainerInPod finds a container by its name in the provided pod
@ -159,7 +159,7 @@ func findContainerInPod(pod *v1.Pod, containerName string) (*v1.Container, error
return nil, fmt.Errorf("container %s not found", containerName) return nil, fmt.Errorf("container %s not found", containerName)
} }
// convertResourceCPUTOString converts cpu value to the format of divisor and returns // convertResourceCPUToString converts cpu value to the format of divisor and returns
// ceiling of the value. // ceiling of the value.
func convertResourceCPUToString(cpu *resource.Quantity, divisor resource.Quantity) (string, error) { func convertResourceCPUToString(cpu *resource.Quantity, divisor resource.Quantity) (string, error) {
c := int64(math.Ceil(float64(cpu.MilliValue()) / float64(divisor.MilliValue()))) c := int64(math.Ceil(float64(cpu.MilliValue()) / float64(divisor.MilliValue())))

6
pkg/fieldpath/fieldpath_test.go
View File

@ -100,7 +100,7 @@ func TestExtractFieldPathAsString(t *testing.T) {
Namespace: "object-namespace", Namespace: "object-namespace",
}, },
}, },
expectedMessageFragment: "Unsupported fieldPath", expectedMessageFragment: "unsupported fieldPath",
}, },
} }
@ -109,13 +109,13 @@ func TestExtractFieldPathAsString(t *testing.T) {
if err != nil { if err != nil {
if tc.expectedMessageFragment != "" { if tc.expectedMessageFragment != "" {
if !strings.Contains(err.Error(), tc.expectedMessageFragment) { if !strings.Contains(err.Error(), tc.expectedMessageFragment) {
t.Errorf("%v: Unexpected error message: %q, expected to contain %q", tc.name, err, tc.expectedMessageFragment) t.Errorf("%v: unexpected error message: %q, expected to contain %q", tc.name, err, tc.expectedMessageFragment)
} }
} else { } else {
t.Errorf("%v: unexpected error: %v", tc.name, err) t.Errorf("%v: unexpected error: %v", tc.name, err)
} }
} else if e := tc.expectedValue; e != "" && e != actual { } else if e := tc.expectedValue; e != "" && e != actual {
t.Errorf("%v: Unexpected result; got %q, expected %q", tc.name, actual, e) t.Errorf("%v: unexpected result; got %q, expected %q", tc.name, actual, e)
} }
} }
} }