mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Merge pull request #31227 from pigmej/typos_englishify_pkg_kubelet
Automatic merge from submit-queue Fix various typos in pkg/kubelet Just fixed some typos + "englishify" pkg/kubelet.
This commit is contained in:
commit
b9481c18b4
@ -296,7 +296,7 @@ func TestNewPodAddedSetReconciled(t *testing.T) {
|
||||
// before touching to avoid data race.
|
||||
newTestPods := func(touchStatus, touchSpec bool) ([]*api.Pod, *api.Pod) {
|
||||
pods := []*api.Pod{
|
||||
CreateValidPod("changable-pod-0", "new"),
|
||||
CreateValidPod("changeable-pod-0", "new"),
|
||||
CreateValidPod("constant-pod-1", "new"),
|
||||
CreateValidPod("constant-pod-2", "new"),
|
||||
}
|
||||
|
@ -197,7 +197,7 @@ func parseSandboxName(name string) (string, string, string, uint32, error) {
|
||||
}
|
||||
|
||||
// buildContainerName creates a name which can be reversed to identify container name.
|
||||
// This function returns stable name, unique name and an unique id.
|
||||
// This function returns stable name, unique name and a unique id.
|
||||
func buildContainerName(sandboxConfig *runtimeApi.PodSandboxConfig, containerConfig *runtimeApi.ContainerConfig) string {
|
||||
containerName := fmt.Sprintf("%s.%d", containerConfig.Metadata.GetName(), containerConfig.Metadata.GetAttempt())
|
||||
return buildKubeGenericName(sandboxConfig, containerName)
|
||||
|
@ -56,7 +56,7 @@ func TestParallelPuller(t *testing.T) {
|
||||
pullerErr: nil,
|
||||
expectedErr: []error{nil}},
|
||||
|
||||
{ // image present, dont pull
|
||||
{ // image present, don't pull
|
||||
containerImage: "present_image",
|
||||
policy: api.PullIfNotPresent,
|
||||
calledFunctions: []string{"IsImagePresent"},
|
||||
|
@ -66,7 +66,7 @@ func (m *kubeGenericRuntimeManager) generateContainerConfig(container *api.Conta
|
||||
Linux: m.generateLinuxContainerConfig(container),
|
||||
}
|
||||
|
||||
// set priviledged and readonlyRootfs
|
||||
// set privileged and readonlyRootfs
|
||||
if container.SecurityContext != nil {
|
||||
securityContext := container.SecurityContext
|
||||
if securityContext.Privileged != nil {
|
||||
|
@ -78,7 +78,7 @@ func (r *RemoteImageService) ImageStatus(image *runtimeApi.ImageSpec) (*runtimeA
|
||||
return resp.Image, nil
|
||||
}
|
||||
|
||||
// PullImage pulls a image with authentication config.
|
||||
// PullImage pulls an image with authentication config.
|
||||
func (r *RemoteImageService) PullImage(image *runtimeApi.ImageSpec, auth *runtimeApi.AuthConfig) error {
|
||||
ctx, cancel := getContextWithTimeout(r.timeout)
|
||||
defer cancel()
|
||||
|
@ -387,7 +387,7 @@ type podVolume struct {
|
||||
}
|
||||
|
||||
// reconstructFromDisk scans the volume directories under the given pod directory. If the volume is not
|
||||
// in either actual or desired state of world, or pending operation, this function will reconstuct
|
||||
// in either actual or desired state of world, or pending operation, this function will reconstruct
|
||||
// the volume spec and put it in both the actual and desired state of worlds. If no running
|
||||
// container is mounting the volume, the volume will be removed by desired state of world's populator and
|
||||
// cleaned up by the reconciler.
|
||||
@ -407,7 +407,7 @@ func (rc *reconciler) reconstructStates(podsDir string) {
|
||||
|
||||
// Check if there is an pending operation for the given pod and volume.
|
||||
// Need to check pending operation before checking the actual and desired
|
||||
// states to avoid race condition during checking. For exmaple, the following
|
||||
// states to avoid race condition during checking. For example, the following
|
||||
// might happen if pending operation is checked after checking actual and desired states.
|
||||
// 1. Checking the pod and it does not exist in either actual or desired state.
|
||||
// 2. An operation for the given pod finishes and the actual state is updated.
|
||||
@ -425,7 +425,7 @@ func (rc *reconciler) reconstructStates(podsDir string) {
|
||||
"Could not find pod information in desired or actual states or pending operation, update it in both states: %+v",
|
||||
volumeToMount)
|
||||
if err = rc.updateStates(volumeToMount); err != nil {
|
||||
glog.Errorf("Error occured during reconstruct volume from disk: %v", err)
|
||||
glog.Errorf("Error occurred during reconstruct volume from disk: %v", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user