Merge pull request #12441 from vlajos/typofixes-vlajos-20150807
typofix - https://github.com/vlajos/misspell_fixer
This commit is contained in:
@@ -91,7 +91,7 @@ func expectPodUpdate(t *testing.T, ch <-chan kubelet.PodUpdate, expected ...kube
|
||||
for i := range expected {
|
||||
update := <-ch
|
||||
sort.Sort(sortedPods(update.Pods))
|
||||
// Clear the annotation field before the comparision.
|
||||
// Clear the annotation field before the comparison.
|
||||
// TODO: consider mock out recordFirstSeen in config.go
|
||||
for _, pod := range update.Pods {
|
||||
delete(pod.Annotations, kubelet.ConfigFirstSeenAnnotationKey)
|
||||
|
@@ -39,7 +39,7 @@ func recordOperation(operation string, start time.Time) {
|
||||
metrics.DockerOperationsLatency.WithLabelValues(operation).Observe(metrics.SinceInMicroseconds(start))
|
||||
}
|
||||
|
||||
// Record error for metric if an error occured.
|
||||
// Record error for metric if an error occurred.
|
||||
func recordError(operation string, err error) {
|
||||
if err != nil {
|
||||
metrics.DockerErrors.WithLabelValues(operation).Inc()
|
||||
|
@@ -1298,7 +1298,7 @@ func (dm *DockerManager) runContainerInPod(pod *api.Pod, container *api.Containe
|
||||
}
|
||||
|
||||
// currently, Docker does not have a flag by which the ndots option can be passed.
|
||||
// (A seperate issue has been filed with Docker to add a ndots flag)
|
||||
// (A separate issue has been filed with Docker to add a ndots flag)
|
||||
// The addNDotsOption call appends the ndots option to the resolv.conf file generated by docker.
|
||||
// This resolv.conf file is shared by all containers of the same pod, and needs to be modified only once per pod.
|
||||
// we modify it when the pause container is created since it is the first container created in the pod since it holds
|
||||
|
@@ -217,7 +217,7 @@ func (im *realImageManager) GarbageCollect() error {
|
||||
|
||||
// Tries to free bytesToFree worth of images on the disk.
|
||||
//
|
||||
// Returns the number of bytes free and an error if any occured. The number of
|
||||
// Returns the number of bytes free and an error if any occurred. The number of
|
||||
// bytes freed is always returned.
|
||||
// Note that error may be nil and the number of bytes free may be less
|
||||
// than bytesToFree.
|
||||
|
@@ -1709,7 +1709,7 @@ func (kl *Kubelet) handleNotFittingPods(pods []*api.Pod) []*api.Pod {
|
||||
// that don't fit on the node, and may reject pods if node is overcommitted.
|
||||
func (kl *Kubelet) admitPods(allPods []*api.Pod, podSyncTypes map[types.UID]SyncPodType) []*api.Pod {
|
||||
// Pod phase progresses monotonically. Once a pod has reached a final state,
|
||||
// it should never leave irregardless of the restart policy. The statuses
|
||||
// it should never leave regardless of the restart policy. The statuses
|
||||
// of such pods should not be changed, and there is no need to sync them.
|
||||
// TODO: the logic here does not handle two cases:
|
||||
// 1. If the containers were removed immediately after they died, kubelet
|
||||
|
@@ -409,7 +409,7 @@ func TestMountExternalVolumes(t *testing.T) {
|
||||
}
|
||||
podVolumes, err := kubelet.mountExternalVolumes(&pod)
|
||||
if err != nil {
|
||||
t.Errorf("Expected sucess: %v", err)
|
||||
t.Errorf("Expected success: %v", err)
|
||||
}
|
||||
expectedPodVolumes := []string{"vol1"}
|
||||
if len(expectedPodVolumes) != len(podVolumes) {
|
||||
|
@@ -22,7 +22,7 @@ limitations under the License.
|
||||
// plugin-name/<other-files>
|
||||
// where, 'executable' has the following requirements:
|
||||
// - should have exec permissions
|
||||
// - should give non-zero exit code on failure, and zero on sucess
|
||||
// - should give non-zero exit code on failure, and zero on success
|
||||
// - the arguments will be <action> <pod_namespace> <pod_name> <docker_id_of_infra_container>
|
||||
// whereupon, <action> will be one of:
|
||||
// - init, called when the kubelet loads the plugin
|
||||
|
@@ -636,7 +636,7 @@ func (r *runtime) makeRuntimePod(unitName string, podInfos map[string]*podInfo)
|
||||
}
|
||||
|
||||
// GetPods runs 'systemctl list-unit' and 'rkt list' to get the list of rkt pods.
|
||||
// Then it will use the result to contruct a list of container runtime pods.
|
||||
// Then it will use the result to construct a list of container runtime pods.
|
||||
// If all is false, then only running pods will be returned, otherwise all pods will be
|
||||
// returned.
|
||||
func (r *runtime) GetPods(all bool) ([]*kubecontainer.Pod, error) {
|
||||
|
@@ -686,11 +686,11 @@ type StatsRequest struct {
|
||||
NumStats int `json:"num_stats,omitempty"`
|
||||
|
||||
// Start time for which to query information.
|
||||
// If ommitted, the beginning of time is assumed.
|
||||
// If omitted, the beginning of time is assumed.
|
||||
Start time.Time `json:"start,omitempty"`
|
||||
|
||||
// End time for which to query information.
|
||||
// If ommitted, current time is assumed.
|
||||
// If omitted, current time is assumed.
|
||||
End time.Time `json:"end,omitempty"`
|
||||
|
||||
// Whether to also include information from subcontainers.
|
||||
|
Reference in New Issue
Block a user