From 48388fec7eaad4ac8d84fbe20673ffacf41964a1 Mon Sep 17 00:00:00 2001 From: Di Xu Date: Fri, 9 Feb 2018 14:53:53 +0800 Subject: [PATCH 1/2] fix all the typos across the project --- .gitignore | 2 +- CHANGELOG-1.10.md | 2 +- CHANGELOG-1.9.md | 2 +- build/copy-output.sh | 2 +- cluster/gce/gci/configure-helper.sh | 2 +- .../kubernetes-e2e/reactive/kubernetes_e2e.py | 2 +- .../reactive/kubernetes_master.py | 4 +-- .../templates/default-http-backend.yaml | 2 +- cluster/restore-from-backup.sh | 2 +- cluster/validate-cluster.sh | 2 +- cmd/kube-apiserver/app/options/options.go | 2 +- cmd/kubeadm/app/cmd/reset_test.go | 6 ++--- cmd/kubeadm/app/phases/certs/certs.go | 2 +- cmd/kubelet/app/options/options.go | 4 +-- .../events.k8s.io/v1beta1/definitions.html | 2 +- docs/api-reference/v1/definitions.html | 4 +-- examples/https-nginx/index2.html | 2 +- examples/newrelic-infrastructure/README.md | 2 +- hack/make-rules/test-cmd-util.sh | 6 ++--- hack/make-rules/verify.sh | 2 +- pkg/api/pod/util.go | 2 +- pkg/api/v1/pod/util.go | 2 +- pkg/api/v1/pod/util_test.go | 2 +- pkg/apis/apps/validation/validation_test.go | 4 +-- pkg/apis/certificates/types.go | 2 +- pkg/apis/core/types.go | 2 +- pkg/auth/authorizer/abac/abac.go | 2 +- pkg/cloudprovider/cloud.go | 2 +- .../azure/azure_blobDiskController.go | 2 +- .../providers/azure/azure_test.go | 2 +- .../providers/cloudstack/metadata.go | 2 +- .../providers/gce/gce_addresses_fakes.go | 2 +- pkg/cloudprovider/providers/gce/gce_disks.go | 2 +- .../providers/gce/gce_forwardingrule_fakes.go | 2 +- .../openstack/openstack_loadbalancer.go | 12 ++++----- .../providers/openstack/openstack_volumes.go | 2 +- pkg/cloudprovider/providers/photon/photon.go | 2 +- pkg/controller/bootstrap/jws.go | 2 +- pkg/controller/controller_ref_manager.go | 2 +- pkg/controller/controller_utils.go | 2 +- pkg/controller/cronjob/cronjob_controller.go | 2 +- pkg/controller/daemon/util/daemonset_util.go | 2 +- pkg/controller/disruption/disruption.go | 2 +- .../endpoint/endpoints_controller.go | 2 +- .../garbagecollector/garbagecollector.go | 4 +-- pkg/controller/nodeipam/ipam/controller.go | 4 +-- .../scheduler/taint_manager_test.go | 8 +++--- .../service/service_controller_test.go | 4 +-- .../cache/actual_state_of_world.go | 4 +-- .../desired_state_of_world_populator.go | 2 +- .../attachdetach/reconciler/reconciler.go | 2 +- .../volume/persistentvolume/provision_test.go | 2 +- .../volume/persistentvolume/pv_controller.go | 6 ++--- .../persistentvolume/pv_controller_base.go | 2 +- .../scheduler_binder_cache_test.go | 2 +- pkg/features/kube_features.go | 6 ++--- pkg/kubectl/cmd/apply.go | 2 +- pkg/kubectl/cmd/diff.go | 2 +- pkg/kubectl/cmd/drain_test.go | 2 +- pkg/kubectl/cmd/set/set_image_test.go | 2 +- pkg/kubectl/cmd/util/factory.go | 6 ++--- pkg/kubectl/env_file.go | 2 +- pkg/kubectl/scale.go | 2 +- pkg/kubectl/scale_test.go | 4 +-- pkg/kubelet/apis/cri/services.go | 2 +- .../apis/deviceplugin/v1alpha/constants.go | 2 +- .../apis/kubeletconfig/helpers_test.go | 2 +- .../apis/kubeletconfig/scheme/scheme.go | 2 +- pkg/kubelet/apis/kubeletconfig/types.go | 4 +-- .../apis/kubeletconfig/v1alpha1/types.go | 4 +-- pkg/kubelet/cadvisor/testing/cadvisor_fake.go | 2 +- .../cm/cpumanager/policy_static_test.go | 4 +-- .../cm/cpumanager/state/state_file_test.go | 4 +-- pkg/kubelet/cm/devicemanager/manager_test.go | 4 +-- pkg/kubelet/container/helpers.go | 2 +- .../dockershim/docker_legacy_service.go | 4 +-- pkg/kubelet/dockershim/docker_service.go | 2 +- pkg/kubelet/dockershim/helpers_test.go | 2 +- pkg/kubelet/dockershim/helpers_windows.go | 2 +- pkg/kubelet/kubelet_network.go | 2 +- pkg/kubelet/kubeletconfig/util/equal/equal.go | 2 +- pkg/kubelet/kubeletconfig/watch.go | 2 +- .../kuberuntime/kuberuntime_manager.go | 2 +- pkg/kubelet/kuberuntime/labels.go | 2 +- pkg/kubelet/kuberuntime/logs/logs.go | 4 +-- pkg/kubelet/network/dns/dns.go | 2 +- pkg/kubelet/network/kubenet/kubenet_linux.go | 2 +- pkg/kubelet/preemption/preemption_test.go | 2 +- pkg/kubelet/prober/worker_test.go | 2 +- pkg/kubelet/server/portforward/websocket.go | 2 +- .../server/remotecommand/httpstream.go | 2 +- pkg/kubelet/util/format/pod.go | 2 +- .../volumemanager/reconciler/reconciler.go | 4 +-- pkg/kubelet/winstats/version.go | 2 +- pkg/master/client_ca_hook.go | 2 +- pkg/master/ports/ports.go | 2 +- pkg/printers/internalversion/describe.go | 2 +- pkg/proxy/healthcheck/healthcheck.go | 2 +- pkg/proxy/ipvs/proxier.go | 2 +- pkg/proxy/ipvs/proxier_test.go | 2 +- pkg/proxy/userspace/proxier.go | 2 +- pkg/proxy/userspace/proxysocket.go | 2 +- pkg/proxy/winkernel/proxier.go | 2 +- pkg/proxy/winuserspace/proxysocket.go | 4 +-- .../core/persistent_volume_claims.go | 2 +- pkg/quota/generic/evaluator.go | 2 +- pkg/quota/resources.go | 2 +- .../apps/deployment/storage/storage_test.go | 2 +- .../apps/replicaset/storage/storage_test.go | 2 +- .../core/node/storage/storage_test.go | 2 +- pkg/registry/core/pod/storage/eviction.go | 2 +- pkg/registry/core/pod/storage/storage_test.go | 2 +- .../storage/storage_test.go | 2 +- .../resourcequota/storage/storage_test.go | 2 +- .../core/service/storage/storage_test.go | 2 +- pkg/registry/rbac/rest/storage_rbac.go | 2 +- .../algorithm/predicates/predicates.go | 2 +- .../priorities/resource_allocation.go | 2 +- .../priorities/selector_spreading_test.go | 2 +- pkg/scheduler/factory/factory_test.go | 2 +- .../podsecuritypolicy/group/mustrunas_test.go | 4 +-- .../podsecuritypolicy/provider_test.go | 8 +++--- .../seccomp/strategy_test.go | 16 ++++++------ .../podsecuritypolicy/util/util_test.go | 2 +- pkg/util/async/bounded_frequency_runner.go | 2 +- pkg/util/file/file_test.go | 2 +- pkg/util/iptables/testing/fake.go | 4 +-- pkg/util/ipvs/testing/fake_test.go | 26 +++++++++---------- pkg/util/mount/exec_mount.go | 2 +- pkg/util/mount/mount.go | 2 +- pkg/util/mount/mount_linux.go | 4 +-- pkg/volume/azure_dd/attacher.go | 2 +- pkg/volume/azure_dd/azure_dd.go | 2 +- pkg/volume/csi/csi_attacher.go | 4 +-- pkg/volume/csi/csi_mounter.go | 8 +++--- pkg/volume/csi/fake/fake_client.go | 2 +- pkg/volume/fc/fc.go | 6 ++--- pkg/volume/fc/fc_util.go | 8 +++--- pkg/volume/flocker/flocker_test.go | 2 +- pkg/volume/gce_pd/attacher.go | 2 +- pkg/volume/iscsi/iscsi.go | 8 +++--- pkg/volume/iscsi/iscsi_test.go | 4 +-- pkg/volume/iscsi/iscsi_util.go | 6 ++--- pkg/volume/rbd/rbd.go | 4 +-- pkg/volume/scaleio/sio_client.go | 2 +- pkg/volume/scaleio/sio_volume_test.go | 2 +- pkg/volume/util.go | 2 +- pkg/volume/util/util.go | 4 +-- pkg/volume/util/volumehelper/volumehelper.go | 2 +- .../podsecuritypolicy/admission_test.go | 2 +- .../rbac/bootstrappolicy/controller_policy.go | 2 +- .../k8s.io/api/certificates/v1beta1/types.go | 2 +- .../src/k8s.io/api/core/v1/generated.proto | 4 +-- staging/src/k8s.io/api/core/v1/types.go | 6 ++--- .../k8s.io/api/events/v1beta1/generated.proto | 2 +- .../src/k8s.io/api/events/v1beta1/types.go | 2 +- .../apiextensions/validation/validation.go | 2 +- .../pkg/api/meta/restmapper_test.go | 2 +- .../pkg/api/resource/scale_int_test.go | 2 +- .../pkg/apimachinery/announced/announced.go | 2 +- .../pkg/apis/meta/fuzzer/fuzzer.go | 2 +- .../pkg/conversion/converter_test.go | 8 +++--- .../apimachinery/pkg/fields/selector.go | 2 +- .../k8s.io/apimachinery/pkg/runtime/codec.go | 2 +- .../apimachinery/pkg/util/errors/errors.go | 2 +- .../apimachinery/pkg/util/rand/rand_test.go | 2 +- .../apimachinery/pkg/util/runtime/runtime.go | 2 +- .../pkg/util/strategicpatch/patch.go | 4 +-- .../pkg/util/validation/field/errors_test.go | 2 +- .../pkg/util/waitgroup/waitgroup.go | 2 +- .../pkg/authorization/union/union.go | 2 +- .../pkg/endpoints/metrics/metrics.go | 2 +- .../value/encrypt/envelope/grpc_service.go | 4 +-- .../plugin/pkg/client/auth/gcp/gcp_test.go | 2 +- .../src/k8s.io/client-go/rest/client_test.go | 2 +- .../tools/clientcmd/client_config.go | 2 +- .../tools/clientcmd/client_config_test.go | 2 +- .../leaderelection/leaderelection_test.go | 2 +- .../tools/portforward/portforward_test.go | 2 +- .../client-go/util/jsonpath/jsonpath_test.go | 2 +- .../util/workqueue/delaying_queue.go | 2 +- .../cmd/go-to-protobuf/protobuf/generator.go | 2 +- staging/src/k8s.io/metrics/IMPLEMENTATIONS.md | 2 +- staging/src/k8s.io/metrics/README.md | 2 +- .../pkg/client/custom_metrics/client.go | 2 +- test/conformance/testdata/conformance.txt | 2 +- test/e2e/apps/cronjob.go | 4 +-- test/e2e/apps/statefulset.go | 2 +- test/e2e/autoscaling/dns_autoscaling.go | 4 +-- test/e2e/common/docker_containers.go | 2 +- test/e2e/common/downwardapi_volume.go | 4 +-- test/e2e/common/pods.go | 2 +- test/e2e/common/projected.go | 8 +++--- test/e2e/framework/test_context.go | 2 +- test/e2e/framework/util.go | 2 +- test/e2e/framework/volume_util.go | 2 +- test/e2e/generated/gobindata_util.go | 2 +- .../instrumentation/logging/generic_soak.go | 2 +- test/e2e/network/networking_perf.go | 4 +-- test/e2e/scalability/load.go | 2 +- test/e2e/scheduling/taints_test.go | 4 +-- test/e2e/storage/persistent_volumes-local.go | 2 +- test/e2e/storage/pvc_protection.go | 2 +- .../vsphere/vsphere_volume_vsan_policy.go | 2 +- test/e2e_node/apparmor_test.go | 2 +- test/e2e_node/dockershim_checkpoint_test.go | 2 +- test/e2e_node/garbage_collector_test.go | 2 +- test/e2e_node/jenkins/cos-init-docker.yaml | 2 +- test/e2e_node/jenkins/ubuntu-init-docker.yaml | 2 +- test/e2e_node/node_problem_detector_linux.go | 2 +- test/e2e_node/remote/node_conformance.go | 2 +- test/e2e_node/remote/node_e2e.go | 2 +- test/e2e_node/runner/remote/run_remote.go | 2 +- .../controller/controller.go | 6 ++--- .../resource_consumer_handler.go | 6 ++--- test/integration/client/client_test.go | 2 +- .../etcd/etcd_storage_path_test.go | 2 +- .../garbage_collector_test.go | 2 +- .../scheduler/local-pv-neg-affinity_test.go | 2 +- test/integration/scheduler/taint_test.go | 2 +- .../scheduler_perf/scheduler_test.go | 2 +- test/test_owners.csv | 2 +- 222 files changed, 320 insertions(+), 320 deletions(-) diff --git a/.gitignore b/.gitignore index aad2fb8ba2..269a9d0abe 100644 --- a/.gitignore +++ b/.gitignore @@ -114,7 +114,7 @@ zz_generated.openapi.go # make-related metadata /.make/ -# Just in time generated data in the source, should never be commited +# Just in time generated data in the source, should never be committed /test/e2e/generated/bindata.go # This file used by some vendor repos (e.g. github.com/go-openapi/...) to store secret variables and should not be ignored diff --git a/CHANGELOG-1.10.md b/CHANGELOG-1.10.md index 6914da682e..52e7ba668e 100644 --- a/CHANGELOG-1.10.md +++ b/CHANGELOG-1.10.md @@ -95,7 +95,7 @@ filename | sha256 hash * CRI: Add a call to reopen log file for a container. ([#58899](https://github.com/kubernetes/kubernetes/pull/58899), [@yujuhong](https://github.com/yujuhong)) * The alpha KubeletConfigFile feature gate has been removed, because it was redundant with the Kubelet's --config flag. It is no longer necessary to set this gate to use the flag. The --config flag is still considered alpha. ([#58978](https://github.com/kubernetes/kubernetes/pull/58978), [@mtaufen](https://github.com/mtaufen)) * `kubectl scale` can now scale any resource (kube, CRD, aggregate) conforming to the standard scale endpoint ([#58298](https://github.com/kubernetes/kubernetes/pull/58298), [@p0lyn0mial](https://github.com/p0lyn0mial)) -* kube-apiserver flag --tls-ca-file has had no effect for some time. It is now deprecated and slated for removal in 1.11. If you are specifying this flag, you must remove it from your launch config before ugprading to 1.11. ([#58968](https://github.com/kubernetes/kubernetes/pull/58968), [@deads2k](https://github.com/deads2k)) +* kube-apiserver flag --tls-ca-file has had no effect for some time. It is now deprecated and slated for removal in 1.11. If you are specifying this flag, you must remove it from your launch config before upgrading to 1.11. ([#58968](https://github.com/kubernetes/kubernetes/pull/58968), [@deads2k](https://github.com/deads2k)) * Fix regression in the CRI: do not add a default hostname on short image names ([#58955](https://github.com/kubernetes/kubernetes/pull/58955), [@runcom](https://github.com/runcom)) * Get windows kernel version directly from registry ([#58498](https://github.com/kubernetes/kubernetes/pull/58498), [@feiskyer](https://github.com/feiskyer)) * Remove deprecated --require-kubeconfig flag, remove default --kubeconfig value ([#58367](https://github.com/kubernetes/kubernetes/pull/58367), [@zhangxiaoyu-zidif](https://github.com/zhangxiaoyu-zidif)) diff --git a/CHANGELOG-1.9.md b/CHANGELOG-1.9.md index 49eb99540f..e416b60c13 100644 --- a/CHANGELOG-1.9.md +++ b/CHANGELOG-1.9.md @@ -1516,7 +1516,7 @@ filename | sha256 hash * fix a bug where disk pressure could trigger prematurely when using overlay2 ([#53684](https://github.com/kubernetes/kubernetes/pull/53684), [@dashpole](https://github.com/dashpole)) * "kubectl cp" updated to honor destination names ([#51215](https://github.com/kubernetes/kubernetes/pull/51215), [@juanvallejo](https://github.com/juanvallejo)) * kubeadm: Strip bootstrap tokens from the `kubeadm-config` ConfigMap ([#53559](https://github.com/kubernetes/kubernetes/pull/53559), [@fabriziopandini](https://github.com/fabriziopandini)) -* Skip podpreset test if the alpha feature setttings/v1alpha1 is disabled ([#53080](https://github.com/kubernetes/kubernetes/pull/53080), [@jennybuckley](https://github.com/jennybuckley)) +* Skip podpreset test if the alpha feature settings/v1alpha1 is disabled ([#53080](https://github.com/kubernetes/kubernetes/pull/53080), [@jennybuckley](https://github.com/jennybuckley)) * Log when node is successfully initialized by Cloud Controller Manager ([#53517](https://github.com/kubernetes/kubernetes/pull/53517), [@andrewsykim](https://github.com/andrewsykim)) * apiserver: --etcd-quorum-read now defaults to true, to ensure correct operation with HA etcd clusters ([#53717](https://github.com/kubernetes/kubernetes/pull/53717), [@liggitt](https://github.com/liggitt)) * The Kubelet's feature gates are now specified as a map when provided via a JSON or YAML KubeletConfiguration, rather than as a string of key-value pairs. ([#53025](https://github.com/kubernetes/kubernetes/pull/53025), [@mtaufen](https://github.com/mtaufen)) diff --git a/build/copy-output.sh b/build/copy-output.sh index c4429cfbf0..842cf0a5fb 100755 --- a/build/copy-output.sh +++ b/build/copy-output.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Copies any built binaries (and other generated files) out of the Docker build contianer. +# Copies any built binaries (and other generated files) out of the Docker build container. set -o errexit set -o nounset set -o pipefail diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index b80d868f26..868f4001a9 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -1934,7 +1934,7 @@ function start-cluster-autoscaler { # # $1: addon category under /etc/kubernetes # $2: manifest source dir -# $3: (optional) auxilary manifest source dir +# $3: (optional) auxiliary manifest source dir function setup-addon-manifests { local -r src_dir="${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty" local -r dst_dir="/etc/kubernetes/$1/$2" diff --git a/cluster/juju/layers/kubernetes-e2e/reactive/kubernetes_e2e.py b/cluster/juju/layers/kubernetes-e2e/reactive/kubernetes_e2e.py index 0cede67439..c573ef78eb 100644 --- a/cluster/juju/layers/kubernetes-e2e/reactive/kubernetes_e2e.py +++ b/cluster/juju/layers/kubernetes-e2e/reactive/kubernetes_e2e.py @@ -48,7 +48,7 @@ def report_status(): def messaging(): - ''' Probe our relations to determine the propper messaging to the + ''' Probe our relations to determine the proper messaging to the end user ''' missing_services = [] diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py index c5becf00c9..45c88dbc0f 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -463,7 +463,7 @@ def start_master(etcd): def etcd_data_change(etcd): ''' Etcd scale events block master reconfiguration due to the kubernetes-master.components.started state. We need a way to - handle these events consistenly only when the number of etcd + handle these events consistently only when the number of etcd units has actually changed ''' # key off of the connection string @@ -1169,7 +1169,7 @@ def configure_controller_manager(): layer_options = layer.options('tls-client') ca_cert_path = layer_options.get('ca_certificate_path') - # Default to 3 minute resync. TODO: Make this configureable? + # Default to 3 minute resync. TODO: Make this configurable? controller_opts['min-resync-period'] = '3m' controller_opts['v'] = '2' controller_opts['root-ca-file'] = ca_cert_path diff --git a/cluster/juju/layers/kubernetes-worker/templates/default-http-backend.yaml b/cluster/juju/layers/kubernetes-worker/templates/default-http-backend.yaml index 91b800ab75..dbef52093c 100644 --- a/cluster/juju/layers/kubernetes-worker/templates/default-http-backend.yaml +++ b/cluster/juju/layers/kubernetes-worker/templates/default-http-backend.yaml @@ -14,7 +14,7 @@ spec: terminationGracePeriodSeconds: 60 containers: - name: default-http-backend - # Any image is permissable as long as: + # Any image is permissible as long as: # 1. It serves a 404 page at / # 2. It serves 200 on a /healthz endpoint image: {{ defaultbackend_image }} diff --git a/cluster/restore-from-backup.sh b/cluster/restore-from-backup.sh index d4283fcef1..1ef4d86195 100755 --- a/cluster/restore-from-backup.sh +++ b/cluster/restore-from-backup.sh @@ -217,7 +217,7 @@ mkdir -p "${MNT_DISK}/var/etcd-corrupted" echo "Saving corrupted data to ${MNT_DISK}/var/etcd-corrupted" mv /var/etcd/data "${MNT_DISK}/var/etcd-corrupted" -# Replace the corrupted data dir with the resotred data. +# Replace the corrupted data dir with the restored data. echo "Copying restored data to /var/etcd/data" mv "${BACKUP_DIR}" /var/etcd/data diff --git a/cluster/validate-cluster.sh b/cluster/validate-cluster.sh index 77e2755c0d..ec495069fe 100755 --- a/cluster/validate-cluster.sh +++ b/cluster/validate-cluster.sh @@ -97,7 +97,7 @@ while true; do # available and then get restarted as the kubelet configures the docker bridge. # # We are assigning the result of kubectl_retry get nodes operation to the res - # varaible in that way, to prevent stopping the whole script on an error. + # variable in that way, to prevent stopping the whole script on an error. node=$(kubectl_retry get nodes) && res="$?" || res="$?" if [ "${res}" -ne "0" ]; then if [[ "${attempt}" -gt "${last_run:-$MAX_ATTEMPTS}" ]]; then diff --git a/cmd/kube-apiserver/app/options/options.go b/cmd/kube-apiserver/app/options/options.go index 9e8e3e9d01..4dbd137047 100644 --- a/cmd/kube-apiserver/app/options/options.go +++ b/cmd/kube-apiserver/app/options/options.go @@ -221,7 +221,7 @@ func (s *ServerRunOptions) AddFlags(fs *pflag.FlagSet) { "api-server and calling out to webhook admission plugins. It is expected that this "+ "cert includes a signature from the CA in the --requestheader-client-ca-file flag. "+ "That CA is published in the 'extension-apiserver-authentication' configmap in "+ - "the kube-system namespace. Components recieving calls from kube-aggregator should "+ + "the kube-system namespace. Components receiving calls from kube-aggregator should "+ "use that CA to perform their half of the mutual TLS verification.") fs.StringVar(&s.ProxyClientKeyFile, "proxy-client-key-file", s.ProxyClientKeyFile, ""+ "Private key for the client certificate used to prove the identity of the aggregator or kube-apiserver "+ diff --git a/cmd/kubeadm/app/cmd/reset_test.go b/cmd/kubeadm/app/cmd/reset_test.go index 8159d70aaa..2fcfc232e3 100644 --- a/cmd/kubeadm/app/cmd/reset_test.go +++ b/cmd/kubeadm/app/cmd/reset_test.go @@ -235,7 +235,7 @@ func TestResetWithDocker(t *testing.T) { func TestResetWithCrictl(t *testing.T) { fcmd := fakeexec.FakeCmd{ CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{ - // 2: socket path provided, not runnning with crictl (1x CombinedOutput, 2x Run) + // 2: socket path provided, not running with crictl (1x CombinedOutput, 2x Run) func() ([]byte, error) { return []byte("1"), nil }, // 3: socket path provided, crictl fails, reset with docker (1x CombinedOuput fail, 1x Run) func() ([]byte, error) { return nil, errors.New("crictl list err") }, @@ -243,7 +243,7 @@ func TestResetWithCrictl(t *testing.T) { RunScript: []fakeexec.FakeRunAction{ // 1: socket path not provided, running with docker func() ([]byte, []byte, error) { return nil, nil, nil }, - // 2: socket path provided, now runnning with crictl (1x CombinedOutput, 2x Run) + // 2: socket path provided, now running with crictl (1x CombinedOutput, 2x Run) func() ([]byte, []byte, error) { return nil, nil, nil }, func() ([]byte, []byte, error) { return nil, nil, nil }, // 3: socket path provided, crictl fails, reset with docker (1x CombinedOuput, 1x Run) @@ -273,7 +273,7 @@ func TestResetWithCrictl(t *testing.T) { t.Errorf("expected a call to docker, got %v", fcmd.RunLog[0]) } - // 2: socket path provided, now runnning with crictl (1x CombinedOutput, 2x Run) + // 2: socket path provided, now running with crictl (1x CombinedOutput, 2x Run) resetWithCrictl(&fexec, newFakeDockerChecker(nil, nil), "/test.sock", "crictl") if fcmd.RunCalls != 3 { t.Errorf("expected 3 calls to Run, got %d", fcmd.RunCalls) diff --git a/cmd/kubeadm/app/phases/certs/certs.go b/cmd/kubeadm/app/phases/certs/certs.go index 1bccf2f7db..57742a7a31 100644 --- a/cmd/kubeadm/app/phases/certs/certs.go +++ b/cmd/kubeadm/app/phases/certs/certs.go @@ -140,7 +140,7 @@ func CreateServiceAccountKeyAndPublicKeyFiles(cfg *kubeadmapi.MasterConfiguratio // CreateFrontProxyCACertAndKeyFiles create a self signed front proxy CA certificate and key files. // Front proxy CA and client certs are used to secure a front proxy authenticator which is used to assert identity -// without the client cert; This is a separte CA, so that front proxy identities cannot hit the API and normal client certs cannot be used +// without the client cert; This is a separate CA, so that front proxy identities cannot hit the API and normal client certs cannot be used // as front proxies. // If the front proxy CA certificate and key files already exists in the target folder, they are used only if evaluated equals; otherwise an error is returned. func CreateFrontProxyCACertAndKeyFiles(cfg *kubeadmapi.MasterConfiguration) error { diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index ce663dbb7e..598160e396 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -351,7 +351,7 @@ func (f *KubeletFlags) AddFlags(fs *pflag.FlagSet) { fs.BoolVar(&f.ExperimentalKernelMemcgNotification, "experimental-kernel-memcg-notification", f.ExperimentalKernelMemcgNotification, "If enabled, the kubelet will integrate with the kernel memcg notification to determine if memory eviction thresholds are crossed rather than polling.") fs.StringVar(&f.RemoteRuntimeEndpoint, "container-runtime-endpoint", f.RemoteRuntimeEndpoint, "[Experimental] The endpoint of remote runtime service. Currently unix socket is supported on Linux, and tcp is supported on windows. Examples:'unix:///var/run/dockershim.sock', 'tcp://localhost:3735'") fs.StringVar(&f.RemoteImageEndpoint, "image-service-endpoint", f.RemoteImageEndpoint, "[Experimental] The endpoint of remote image service. If not specified, it will be the same with container-runtime-endpoint by default. Currently unix socket is supported on Linux, and tcp is supported on windows. Examples:'unix:///var/run/dockershim.sock', 'tcp://localhost:3735'") - fs.BoolVar(&f.ExperimentalCheckNodeCapabilitiesBeforeMount, "experimental-check-node-capabilities-before-mount", f.ExperimentalCheckNodeCapabilitiesBeforeMount, "[Experimental] if set true, the kubelet will check the underlying node for required componenets (binaries, etc.) before performing the mount") + fs.BoolVar(&f.ExperimentalCheckNodeCapabilitiesBeforeMount, "experimental-check-node-capabilities-before-mount", f.ExperimentalCheckNodeCapabilitiesBeforeMount, "[Experimental] if set true, the kubelet will check the underlying node for required components (binaries, etc.) before performing the mount") fs.BoolVar(&f.ExperimentalNodeAllocatableIgnoreEvictionThreshold, "experimental-allocatable-ignore-eviction", f.ExperimentalNodeAllocatableIgnoreEvictionThreshold, "When set to 'true', Hard Eviction Thresholds will be ignored while calculating Node Allocatable. See https://kubernetes.io/docs/tasks/administer-cluster/reserve-compute-resources/ for more details. [default=false]") fs.Var(flag.NewMapStringString(&f.ExperimentalQOSReserved), "experimental-qos-reserved", "A set of ResourceName=Percentage (e.g. memory=50%) pairs that describe how pod resource requests are reserved at the QoS level. Currently only memory is supported. [default=none]") bindableNodeLabels := flag.ConfigurationMap(f.NodeLabels) @@ -510,7 +510,7 @@ func AddKubeletConfigFlags(fs *pflag.FlagSet, c *kubeletconfig.KubeletConfigurat // Node Allocatable Flags fs.Var(flag.NewMapStringString(&c.SystemReserved), "system-reserved", "A set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=500Mi,ephemeral-storage=1Gi) pairs that describe resources reserved for non-kubernetes components. Currently only cpu and memory are supported. See http://kubernetes.io/docs/user-guide/compute-resources for more detail. [default=none]") fs.Var(flag.NewMapStringString(&c.KubeReserved), "kube-reserved", "A set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=500Mi,ephemeral-storage=1Gi) pairs that describe resources reserved for kubernetes system components. Currently cpu, memory and local ephemeral storage for root file system are supported. See http://kubernetes.io/docs/user-guide/compute-resources for more detail. [default=none]") - fs.StringSliceVar(&c.EnforceNodeAllocatable, "enforce-node-allocatable", c.EnforceNodeAllocatable, "A comma separated list of levels of node allocatable enforcement to be enforced by kubelet. Acceptible options are 'none', 'pods', 'system-reserved', and 'kube-reserved'. If the latter two options are specified, '--system-reserved-cgroup' and '--kube-reserved-cgroup' must also be set, respectively. If 'none' is specified, no additional options should be set. See https://kubernetes.io/docs/tasks/administer-cluster/reserve-compute-resources/ for more details.") + fs.StringSliceVar(&c.EnforceNodeAllocatable, "enforce-node-allocatable", c.EnforceNodeAllocatable, "A comma separated list of levels of node allocatable enforcement to be enforced by kubelet. Acceptable options are 'none', 'pods', 'system-reserved', and 'kube-reserved'. If the latter two options are specified, '--system-reserved-cgroup' and '--kube-reserved-cgroup' must also be set, respectively. If 'none' is specified, no additional options should be set. See https://kubernetes.io/docs/tasks/administer-cluster/reserve-compute-resources/ for more details.") fs.StringVar(&c.SystemReservedCgroup, "system-reserved-cgroup", c.SystemReservedCgroup, "Absolute name of the top level cgroup that is used to manage non-kubernetes components for which compute resources were reserved via '--system-reserved' flag. Ex. '/system-reserved'. [default='']") fs.StringVar(&c.KubeReservedCgroup, "kube-reserved-cgroup", c.KubeReservedCgroup, "Absolute name of the top level cgroup that is used to manage kubernetes components for which compute resources were reserved via '--kube-reserved' flag. Ex. '/kube-reserved'. [default='']") } diff --git a/docs/api-reference/events.k8s.io/v1beta1/definitions.html b/docs/api-reference/events.k8s.io/v1beta1/definitions.html index b3fd61ea23..7398752cf2 100755 --- a/docs/api-reference/events.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/events.k8s.io/v1beta1/definitions.html @@ -1046,7 +1046,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

v1beta1.EventSeries

-

EventSeries contain information on series of events, i.e. thing that was/is happening continously for some time.

+

EventSeries contain information on series of events, i.e. thing that was/is happening continuously for some time.

diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index ff90e1d21f..35ec4b84a9 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -3754,7 +3754,7 @@ Examples:

v1.EventSeries

-

EventSeries contain information on series of events, i.e. thing that was/is happening continously for some time.

+

EventSeries contain information on series of events, i.e. thing that was/is happening continuously for some time.

@@ -3783,7 +3783,7 @@ Examples:
- + diff --git a/examples/https-nginx/index2.html b/examples/https-nginx/index2.html index 86280c9867..99a96085f4 100644 --- a/examples/https-nginx/index2.html +++ b/examples/https-nginx/index2.html @@ -12,7 +12,7 @@

Nginx has been reloaded!

-

If you see this page, the nginx web server has been automaticly reloaded, since the config file has been updated using Kubernetes.

+

If you see this page, the nginx web server has been automatically reloaded, since the config file has been updated using Kubernetes.

For online documentation and support please refer to diff --git a/examples/newrelic-infrastructure/README.md b/examples/newrelic-infrastructure/README.md index df27b5cbee..c86a194d0f 100644 --- a/examples/newrelic-infrastructure/README.md +++ b/examples/newrelic-infrastructure/README.md @@ -28,7 +28,7 @@ translates to NRIA_LOG_FILE=/var/log/nr-infra.log ``` -Edit examples/newrelic-infrastructure/nrconfig.env and configure relevant environment variables for your NewRelic Infrastructure agent. There are a few defauts defined, but the only required variable is the New Relic license key. +Edit examples/newrelic-infrastructure/nrconfig.env and configure relevant environment variables for your NewRelic Infrastructure agent. There are a few defaults defined, but the only required variable is the New Relic license key. Now, let's vendor the config into a secret. diff --git a/hack/make-rules/test-cmd-util.sh b/hack/make-rules/test-cmd-util.sh index 0734ec051b..010814761b 100755 --- a/hack/make-rules/test-cmd-util.sh +++ b/hack/make-rules/test-cmd-util.sh @@ -3473,13 +3473,13 @@ run_kubectl_config_set_tests() { cert_data=$(echo "#Comment" && cat "${TMPDIR:-/tmp}/apiserver.crt") kubectl config set clusters.test-cluster.certificate-authority-data "$cert_data" --set-raw-bytes - r_writen=$(kubectl config view --raw -o jsonpath='{.clusters[?(@.name == "test-cluster")].cluster.certificate-authority-data}') + r_written=$(kubectl config view --raw -o jsonpath='{.clusters[?(@.name == "test-cluster")].cluster.certificate-authority-data}') encoded=$(echo -n "$cert_data" | base64) kubectl config set clusters.test-cluster.certificate-authority-data "$encoded" - e_writen=$(kubectl config view --raw -o jsonpath='{.clusters[?(@.name == "test-cluster")].cluster.certificate-authority-data}') + e_written=$(kubectl config view --raw -o jsonpath='{.clusters[?(@.name == "test-cluster")].cluster.certificate-authority-data}') - test "$e_writen" == "$r_writen" + test "$e_written" == "$r_written" set +o nounset set +o errexit diff --git a/hack/make-rules/verify.sh b/hack/make-rules/verify.sh index 1af7f2cfff..8e81a62404 100755 --- a/hack/make-rules/verify.sh +++ b/hack/make-rules/verify.sh @@ -87,7 +87,7 @@ function run-cmd { return ${tr} } -# Collect Failed tests in this Array , initalize it to nil +# Collect Failed tests in this Array , initialize it to nil FAILED_TESTS=() function print-failed-tests { diff --git a/pkg/api/pod/util.go b/pkg/api/pod/util.go index 3cb7d69f39..4a71f89627 100644 --- a/pkg/api/pod/util.go +++ b/pkg/api/pod/util.go @@ -172,7 +172,7 @@ func IsPodReady(pod *api.Pod) bool { return IsPodReadyConditionTrue(pod.Status) } -// IsPodReadyConditionTrue retruns true if a pod is ready; false otherwise. +// IsPodReadyConditionTrue returns true if a pod is ready; false otherwise. func IsPodReadyConditionTrue(status api.PodStatus) bool { condition := GetPodReadyCondition(status) return condition != nil && condition.Status == api.ConditionTrue diff --git a/pkg/api/v1/pod/util.go b/pkg/api/v1/pod/util.go index 67fc6e5ed0..aa79c7250d 100644 --- a/pkg/api/v1/pod/util.go +++ b/pkg/api/v1/pod/util.go @@ -238,7 +238,7 @@ func IsPodReady(pod *v1.Pod) bool { return IsPodReadyConditionTrue(pod.Status) } -// IsPodReady retruns true if a pod is ready; false otherwise. +// IsPodReady returns true if a pod is ready; false otherwise. func IsPodReadyConditionTrue(status v1.PodStatus) bool { condition := GetPodReadyCondition(status) return condition != nil && condition.Status == v1.ConditionTrue diff --git a/pkg/api/v1/pod/util_test.go b/pkg/api/v1/pod/util_test.go index 14df2e0ba8..5310bc3285 100644 --- a/pkg/api/v1/pod/util_test.go +++ b/pkg/api/v1/pod/util_test.go @@ -434,7 +434,7 @@ func TestGetContainerStatus(t *testing.T) { status: []v1.ContainerStatus{{Name: "test3", Ready: false, Image: "image3"}}, name: "", expected: ExpectedStruct{status: v1.ContainerStatus{}, exists: false}, - desc: "retrieve an empty ContainerStatus with contianer name empty", + desc: "retrieve an empty ContainerStatus with container name empty", }, { status: nil, diff --git a/pkg/apis/apps/validation/validation_test.go b/pkg/apis/apps/validation/validation_test.go index 4b8303bb99..35b67f0182 100644 --- a/pkg/apis/apps/validation/validation_test.go +++ b/pkg/apis/apps/validation/validation_test.go @@ -270,7 +270,7 @@ func TestValidateStatefulSet(t *testing.T) { UpdateStrategy: apps.StatefulSetUpdateStrategy{Type: apps.RollingUpdateStatefulSetStrategyType}, }, }, - "invalid udpate strategy": { + "invalid update strategy": { ObjectMeta: metav1.ObjectMeta{Name: "abc-123", Namespace: metav1.NamespaceDefault}, Spec: apps.StatefulSetSpec{ PodManagementPolicy: apps.OrderedReadyPodManagement, @@ -280,7 +280,7 @@ func TestValidateStatefulSet(t *testing.T) { UpdateStrategy: apps.StatefulSetUpdateStrategy{Type: "foo"}, }, }, - "empty udpate strategy": { + "empty update strategy": { ObjectMeta: metav1.ObjectMeta{Name: "abc-123", Namespace: metav1.NamespaceDefault}, Spec: apps.StatefulSetSpec{ PodManagementPolicy: apps.OrderedReadyPodManagement, diff --git a/pkg/apis/certificates/types.go b/pkg/apis/certificates/types.go index 1300380f29..77420687b0 100644 --- a/pkg/apis/certificates/types.go +++ b/pkg/apis/certificates/types.go @@ -122,7 +122,7 @@ type KeyUsage string const ( UsageSigning KeyUsage = "signing" UsageDigitalSignature KeyUsage = "digital signature" - UsageContentCommittment KeyUsage = "content committment" + UsageContentCommittment KeyUsage = "content commitment" UsageKeyEncipherment KeyUsage = "key encipherment" UsageKeyAgreement KeyUsage = "key agreement" UsageDataEncipherment KeyUsage = "data encipherment" diff --git a/pkg/apis/core/types.go b/pkg/apis/core/types.go index f6982d0d82..ce86f48f3e 100644 --- a/pkg/apis/core/types.go +++ b/pkg/apis/core/types.go @@ -4065,7 +4065,7 @@ type Event struct { type EventSeries struct { // Number of occurrences in this series up to the last heartbeat time Count int32 - // Time of the last occurence observed + // Time of the last occurrence observed LastObservedTime metav1.MicroTime // State of this Series: Ongoing or Finished State EventSeriesState diff --git a/pkg/auth/authorizer/abac/abac.go b/pkg/auth/authorizer/abac/abac.go index f3132740d2..86e7f8ed3e 100644 --- a/pkg/auth/authorizer/abac/abac.go +++ b/pkg/auth/authorizer/abac/abac.go @@ -53,7 +53,7 @@ type policyList []*abac.Policy // TODO: Have policies be created via an API call and stored in REST storage. func NewFromFile(path string) (policyList, error) { - // File format is one map per line. This allows easy concatentation of files, + // File format is one map per line. This allows easy concatenation of files, // comments in files, and identification of errors by line number. file, err := os.Open(path) if err != nil { diff --git a/pkg/cloudprovider/cloud.go b/pkg/cloudprovider/cloud.go index 83f743c180..9ca91ebf31 100644 --- a/pkg/cloudprovider/cloud.go +++ b/pkg/cloudprovider/cloud.go @@ -193,7 +193,7 @@ type Zone struct { // Zones is an abstract, pluggable interface for zone enumeration. type Zones interface { // GetZone returns the Zone containing the current failure zone and locality region that the program is running in - // In most cases, this method is called from the kubelet querying a local metadata service to aquire its zone. + // In most cases, this method is called from the kubelet querying a local metadata service to acquire its zone. // For the case of external cloud providers, use GetZoneByProviderID or GetZoneByNodeName since GetZone // can no longer be called from the kubelets. GetZone(ctx context.Context) (Zone, error) diff --git a/pkg/cloudprovider/providers/azure/azure_blobDiskController.go b/pkg/cloudprovider/providers/azure/azure_blobDiskController.go index 0d22ff8492..a2b562c4c3 100644 --- a/pkg/cloudprovider/providers/azure/azure_blobDiskController.go +++ b/pkg/cloudprovider/providers/azure/azure_blobDiskController.go @@ -383,7 +383,7 @@ func (c *BlobDiskController) ensureDefaultContainer(storageAccountName string) e counter = counter + 1 // check if we passed the max sleep if counter >= 20 { - return fmt.Errorf("azureDisk - timeout waiting to aquire lock to validate account:%s readiness", storageAccountName) + return fmt.Errorf("azureDisk - timeout waiting to acquire lock to validate account:%s readiness", storageAccountName) } } diff --git a/pkg/cloudprovider/providers/azure/azure_test.go b/pkg/cloudprovider/providers/azure/azure_test.go index 21fcf0bbe9..d1eaba3785 100644 --- a/pkg/cloudprovider/providers/azure/azure_test.go +++ b/pkg/cloudprovider/providers/azure/azure_test.go @@ -1243,7 +1243,7 @@ func validatePublicIP(t *testing.T, publicIP *network.PublicIPAddress, service * } // We cannot use service.Spec.LoadBalancerIP to compare with // Public IP's IPAddress - // Becuase service properties are updated outside of cloudprovider code + // Because service properties are updated outside of cloudprovider code } func contains(ruleValues []string, targetValue string) bool { diff --git a/pkg/cloudprovider/providers/cloudstack/metadata.go b/pkg/cloudprovider/providers/cloudstack/metadata.go index d1529912b7..bffeb49cf9 100644 --- a/pkg/cloudprovider/providers/cloudstack/metadata.go +++ b/pkg/cloudprovider/providers/cloudstack/metadata.go @@ -196,7 +196,7 @@ func findDHCPServer() (string, error) { offerPacket, err := client.GetOffer(&discoverPacket) if err != nil { - return "", fmt.Errorf("error recieving DHCP offer package: %v", err) + return "", fmt.Errorf("error receiving DHCP offer package: %v", err) } offerPacketOptions := offerPacket.ParseOptions() diff --git a/pkg/cloudprovider/providers/gce/gce_addresses_fakes.go b/pkg/cloudprovider/providers/gce/gce_addresses_fakes.go index 1fd8e91a8c..e9ed209e4f 100644 --- a/pkg/cloudprovider/providers/gce/gce_addresses_fakes.go +++ b/pkg/cloudprovider/providers/gce/gce_addresses_fakes.go @@ -49,7 +49,7 @@ func NewFakeCloudAddressService() *FakeCloudAddressService { } } -// SetRegionalAddresses sets the addresses of ther region. This is used for +// SetRegionalAddresses sets the addresses of there region. This is used for // setting the test environment. func (cas *FakeCloudAddressService) SetRegionalAddresses(region string, addrs []*computealpha.Address) { // Reset addresses in the region. diff --git a/pkg/cloudprovider/providers/gce/gce_disks.go b/pkg/cloudprovider/providers/gce/gce_disks.go index d982ee6ffd..7fb0c0dcb7 100644 --- a/pkg/cloudprovider/providers/gce/gce_disks.go +++ b/pkg/cloudprovider/providers/gce/gce_disks.go @@ -1021,7 +1021,7 @@ func (gce *GCECloud) GetDiskByNameUnknownZone(diskName string) (*GCEDisk, error) // Note: this is the gotcha right now with GCE PD support: // disk names are not unique per-region. // (I can create two volumes with name "myvol" in e.g. us-central1-b & us-central1-f) - // For now, this is simply undefined behvaiour. + // For now, this is simply undefined behaviour. // // In future, we will have to require users to qualify their disk // "us-central1-a/mydisk". We could do this for them as part of diff --git a/pkg/cloudprovider/providers/gce/gce_forwardingrule_fakes.go b/pkg/cloudprovider/providers/gce/gce_forwardingrule_fakes.go index 780012791f..9c61295250 100644 --- a/pkg/cloudprovider/providers/gce/gce_forwardingrule_fakes.go +++ b/pkg/cloudprovider/providers/gce/gce_forwardingrule_fakes.go @@ -41,7 +41,7 @@ func NewFakeCloudForwardingRuleService() *FakeCloudForwardingRuleService { } } -// SetRegionalForwardingRulees sets the fwdRuleesses of ther region. This is used for +// SetRegionalForwardingRulees sets the fwdRuleesses of there region. This is used for // setting the test environment. func (f *FakeCloudForwardingRuleService) SetRegionalForwardingRulees(region string, fwdRules []*computealpha.ForwardingRule) { // Reset fwdRuleesses in the region. diff --git a/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go b/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go index 56aff5b0b4..1d894db22d 100644 --- a/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go +++ b/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go @@ -1057,7 +1057,7 @@ func (lbaas *LbaasV2) ensureSecurityGroup(clusterName string, apiService *v1.Ser _, err = rules.Create(lbaas.network, lbSecGroupRuleCreateOpts).Extract() if err != nil { - return fmt.Errorf("error occured creating rule for SecGroup %s: %v", lbSecGroup.ID, err) + return fmt.Errorf("error occurred creating rule for SecGroup %s: %v", lbSecGroup.ID, err) } } } @@ -1075,7 +1075,7 @@ func (lbaas *LbaasV2) ensureSecurityGroup(clusterName string, apiService *v1.Ser _, err = rules.Create(lbaas.network, lbSecGroupRuleCreateOpts).Extract() if err != nil { - return fmt.Errorf("error occured creating rule for SecGroup %s: %v", lbSecGroup.ID, err) + return fmt.Errorf("error occurred creating rule for SecGroup %s: %v", lbSecGroup.ID, err) } lbSecGroupRuleCreateOpts = rules.CreateOpts{ @@ -1090,7 +1090,7 @@ func (lbaas *LbaasV2) ensureSecurityGroup(clusterName string, apiService *v1.Ser _, err = rules.Create(lbaas.network, lbSecGroupRuleCreateOpts).Extract() if err != nil { - return fmt.Errorf("error occured creating rule for SecGroup %s: %v", lbSecGroup.ID, err) + return fmt.Errorf("error occurred creating rule for SecGroup %s: %v", lbSecGroup.ID, err) } // get security groups of port @@ -1115,7 +1115,7 @@ func (lbaas *LbaasV2) ensureSecurityGroup(clusterName string, apiService *v1.Ser updateOpts := neutronports.UpdateOpts{SecurityGroups: &port.SecurityGroups} res := neutronports.Update(lbaas.network, portID, updateOpts) if res.Err != nil { - msg := fmt.Sprintf("Error occured updating port %s for loadbalancer service %s/%s: %v", portID, apiService.Namespace, apiService.Name, res.Err) + msg := fmt.Sprintf("Error occurred updating port %s for loadbalancer service %s/%s: %v", portID, apiService.Namespace, apiService.Name, res.Err) return fmt.Errorf(msg) } } @@ -1145,7 +1145,7 @@ func (lbaas *LbaasV2) ensureSecurityGroup(clusterName string, apiService *v1.Ser // Add the rules in the Node Security Group err = createNodeSecurityGroup(lbaas.network, nodeSecurityGroupID, int(port.NodePort), port.Protocol, lbSecGroupID) if err != nil { - return fmt.Errorf("error occured creating security group for loadbalancer service %s/%s: %v", apiService.Namespace, apiService.Name, err) + return fmt.Errorf("error occurred creating security group for loadbalancer service %s/%s: %v", apiService.Namespace, apiService.Name, err) } } } @@ -1366,7 +1366,7 @@ func (lbaas *LbaasV2) updateSecurityGroup(clusterName string, apiService *v1.Ser // Add the rules in the Node Security Group err = createNodeSecurityGroup(lbaas.network, nodeSecurityGroupID, int(port.NodePort), port.Protocol, lbSecGroupID) if err != nil { - return fmt.Errorf("error occured creating security group for loadbalancer service %s/%s: %v", apiService.Namespace, apiService.Name, err) + return fmt.Errorf("error occurred creating security group for loadbalancer service %s/%s: %v", apiService.Namespace, apiService.Name, err) } } } diff --git a/pkg/cloudprovider/providers/openstack/openstack_volumes.go b/pkg/cloudprovider/providers/openstack/openstack_volumes.go index b8036dde59..8b7277afe1 100644 --- a/pkg/cloudprovider/providers/openstack/openstack_volumes.go +++ b/pkg/cloudprovider/providers/openstack/openstack_volumes.go @@ -704,7 +704,7 @@ func (os *OpenStack) GetLabelsForVolume(ctx context.Context, pv *v1.PersistentVo return nil, err } - // Contruct Volume Labels + // Construct Volume Labels labels := make(map[string]string) labels[kubeletapis.LabelZoneFailureDomain] = volume.AvailabilityZone labels[kubeletapis.LabelZoneRegion] = os.region diff --git a/pkg/cloudprovider/providers/photon/photon.go b/pkg/cloudprovider/providers/photon/photon.go index 0081b30711..424b6f91af 100644 --- a/pkg/cloudprovider/providers/photon/photon.go +++ b/pkg/cloudprovider/providers/photon/photon.go @@ -51,7 +51,7 @@ const ( MAC_OUI_ESX = "00:0c:29" ) -// overrideIP indicates if the hostname is overriden by IP address, such as when +// overrideIP indicates if the hostname is overridden by IP address, such as when // running multi-node kubernetes using docker. In this case the user should set // overrideIP = true in cloud config file. Default value is false. var overrideIP bool = false diff --git a/pkg/controller/bootstrap/jws.go b/pkg/controller/bootstrap/jws.go index 273a002c20..b2da4ee54b 100644 --- a/pkg/controller/bootstrap/jws.go +++ b/pkg/controller/bootstrap/jws.go @@ -60,7 +60,7 @@ func computeDetachedSig(content, tokenID, tokenSecret string) (string, error) { // stripContent will remove the content part of a compact JWS // -// The `go-jose` library doesn't support generating signatures with "detatched" +// The `go-jose` library doesn't support generating signatures with "detached" // content. To make up for this we take the full compact signature, break it // apart and put it back together without the content section. func stripContent(fullSig string) (string, error) { diff --git a/pkg/controller/controller_ref_manager.go b/pkg/controller/controller_ref_manager.go index 564a67ca54..4f0fd93a7f 100644 --- a/pkg/controller/controller_ref_manager.go +++ b/pkg/controller/controller_ref_manager.go @@ -429,7 +429,7 @@ func NewControllerRevisionControllerRefManager( // * Adopt orphans if the selector matches. // * Release owned objects if the selector no longer matches. // -// A non-nil error is returned if some form of reconciliation was attemped and +// A non-nil error is returned if some form of reconciliation was attempted and // failed. Usually, controllers should try again later in case reconciliation // is still needed. // diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index b662fa6fb5..d7d755ebfd 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -64,7 +64,7 @@ const ( // latency/pod at the scale of 3000 pods over 100 nodes. ExpectationsTimeout = 5 * time.Minute // When batching pod creates, SlowStartInitialBatchSize is the size of the - // inital batch. The size of each successive batch is twice the size of + // initial batch. The size of each successive batch is twice the size of // the previous batch. For example, for a value of 1, batch sizes would be // 1, 2, 4, 8, ... and for a value of 10, batch sizes would be // 10, 20, 40, 80, ... Setting the value higher means that quota denials diff --git a/pkg/controller/cronjob/cronjob_controller.go b/pkg/controller/cronjob/cronjob_controller.go index 679895e85d..5d4d7dc3d8 100644 --- a/pkg/controller/cronjob/cronjob_controller.go +++ b/pkg/controller/cronjob/cronjob_controller.go @@ -297,7 +297,7 @@ func syncOne(sj *batchv1beta1.CronJob, js []batchv1.Job, now time.Time, jc jobCo // there is some risk that we won't see an active job when there is one. // (because we haven't seen the status update to the SJ or the created pod). // So it is theoretically possible to have concurrency with Forbid. - // As long the as the invokations are "far enough apart in time", this usually won't happen. + // As long the as the invocations are "far enough apart in time", this usually won't happen. // // TODO: for Forbid, we could use the same name for every execution, as a lock. // With replace, we could use a name that is deterministic per execution time. diff --git a/pkg/controller/daemon/util/daemonset_util.go b/pkg/controller/daemon/util/daemonset_util.go index 3c69e8a3a0..57101e2983 100644 --- a/pkg/controller/daemon/util/daemonset_util.go +++ b/pkg/controller/daemon/util/daemonset_util.go @@ -102,7 +102,7 @@ func IsPodUpdated(dsTemplateGeneration int64, pod *v1.Pod, hash string) bool { return hashMatches || templateMatches } -// SplitByAvailablePods splits provided daemon set pods by availabilty +// SplitByAvailablePods splits provided daemon set pods by availability func SplitByAvailablePods(minReadySeconds int32, pods []*v1.Pod) ([]*v1.Pod, []*v1.Pod) { unavailablePods := []*v1.Pod{} availablePods := []*v1.Pod{} diff --git a/pkg/controller/disruption/disruption.go b/pkg/controller/disruption/disruption.go index b234f5ca0b..6ec9663fd8 100644 --- a/pkg/controller/disruption/disruption.go +++ b/pkg/controller/disruption/disruption.go @@ -617,7 +617,7 @@ func (dc *DisruptionController) getExpectedScale(pdb *policy.PodDisruptionBudget func countHealthyPods(pods []*v1.Pod, disruptedPods map[string]metav1.Time, currentTime time.Time) (currentHealthy int32) { Pod: for _, pod := range pods { - // Pod is beeing deleted. + // Pod is being deleted. if pod.DeletionTimestamp != nil { continue } diff --git a/pkg/controller/endpoint/endpoints_controller.go b/pkg/controller/endpoint/endpoints_controller.go index f7d8f55f8d..a0ae0e4e89 100644 --- a/pkg/controller/endpoint/endpoints_controller.go +++ b/pkg/controller/endpoint/endpoints_controller.go @@ -269,7 +269,7 @@ func (e *EndpointController) updatePod(old, cur interface{}) { podChangedFlag := podChanged(oldPod, newPod) - // Check if the pod labels have changed, indicating a possibe + // Check if the pod labels have changed, indicating a possible // change in the service membership labelsChanged := false if !reflect.DeepEqual(newPod.Labels, oldPod.Labels) || diff --git a/pkg/controller/garbagecollector/garbagecollector.go b/pkg/controller/garbagecollector/garbagecollector.go index 957775177a..0f129b7e51 100644 --- a/pkg/controller/garbagecollector/garbagecollector.go +++ b/pkg/controller/garbagecollector/garbagecollector.go @@ -197,7 +197,7 @@ func (gc *GarbageCollector) Sync(discoveryClient discovery.DiscoveryInterface, p // discovered by restMapper during the call to Reset, since they are // distinct discovery clients invalidated at different times. For example, // newResources may contain resources not returned in the restMapper's - // discovery call if the resources appeared inbetween the calls. In that + // discovery call if the resources appeared in-between the calls. In that // case, the restMapper will fail to map some of newResources until the next // sync period. if err := gc.resyncMonitors(newResources); err != nil { @@ -214,7 +214,7 @@ func (gc *GarbageCollector) Sync(discoveryClient discovery.DiscoveryInterface, p // Finally, keep track of our new state. Do this after all preceding steps // have succeeded to ensure we'll retry on subsequent syncs if an error - // occured. + // occurred. oldResources = newResources glog.V(2).Infof("synced garbage collector") }, period, stopCh) diff --git a/pkg/controller/nodeipam/ipam/controller.go b/pkg/controller/nodeipam/ipam/controller.go index 6ab18d69f6..bf59418a48 100644 --- a/pkg/controller/nodeipam/ipam/controller.go +++ b/pkg/controller/nodeipam/ipam/controller.go @@ -96,7 +96,7 @@ func NewController( } // Start initializes the Controller with the existing list of nodes and -// registers the informers for node chnages. This will start synchronization +// registers the informers for node changes. This will start synchronization // of the node and cloud CIDR range allocations. func (c *Controller) Start(nodeInformer informers.NodeInformer) error { glog.V(0).Infof("Starting IPAM controller (config=%+v)", c.config) @@ -193,7 +193,7 @@ func (c *Controller) onUpdate(_, node *v1.Node) error { if sync, ok := c.syncers[node.Name]; ok { sync.Update(node) } else { - glog.Errorf("Received update for non-existant node %q", node.Name) + glog.Errorf("Received update for non-existent node %q", node.Name) return fmt.Errorf("unknown node %q", node.Name) } diff --git a/pkg/controller/nodelifecycle/scheduler/taint_manager_test.go b/pkg/controller/nodelifecycle/scheduler/taint_manager_test.go index 7e3fad26c9..926761b4fa 100644 --- a/pkg/controller/nodelifecycle/scheduler/taint_manager_test.go +++ b/pkg/controller/nodelifecycle/scheduler/taint_manager_test.go @@ -273,7 +273,7 @@ func TestCreateNode(t *testing.T) { expectDelete bool }{ { - description: "Creating Node maching already assigned Pod", + description: "Creating Node matching already assigned Pod", pods: []v1.Pod{ *testutil.NewPod("pod1", "node1"), }, @@ -281,7 +281,7 @@ func TestCreateNode(t *testing.T) { expectDelete: false, }, { - description: "Creating tainted Node maching already assigned Pod", + description: "Creating tainted Node matching already assigned Pod", pods: []v1.Pod{ *testutil.NewPod("pod1", "node1"), }, @@ -289,7 +289,7 @@ func TestCreateNode(t *testing.T) { expectDelete: true, }, { - description: "Creating tainted Node maching already assigned tolerating Pod", + description: "Creating tainted Node matching already assigned tolerating Pod", pods: []v1.Pod{ *addToleration(testutil.NewPod("pod1", "node1"), 1, -1), }, @@ -468,7 +468,7 @@ func TestUpdateNodeWithMultiplePods(t *testing.T) { }, }, { - description: "Evict all pods not maching all taints instantly", + description: "Evict all pods not matching all taints instantly", pods: []v1.Pod{ *testutil.NewPod("pod1", "node1"), *addToleration(testutil.NewPod("pod2", "node1"), 1, 1), diff --git a/pkg/controller/service/service_controller_test.go b/pkg/controller/service/service_controller_test.go index 0241cb1d22..cb6e16270b 100644 --- a/pkg/controller/service/service_controller_test.go +++ b/pkg/controller/service/service_controller_test.go @@ -319,7 +319,7 @@ func TestProcessServiceUpdate(t *testing.T) { key string updateFn func(*v1.Service) *v1.Service //Manipulate the structure svc *v1.Service - expectedFn func(*v1.Service, error) error //Error comparision function + expectedFn func(*v1.Service, error) error //Error comparison function }{ { testName: "If updating a valid service", @@ -489,7 +489,7 @@ func TestProcessServiceDeletion(t *testing.T) { expectedFn func(svcErr error) error // Function to check if the returned value is expected }{ { - testName: "If an non-existant service is deleted", + testName: "If an non-existent service is deleted", updateFn: func(controller *ServiceController) { // Does not do anything }, diff --git a/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go b/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go index 4d4a7523d8..377d9ba2d8 100644 --- a/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go +++ b/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go @@ -73,7 +73,7 @@ type ActualStateOfWorld interface { // SetNodeStatusUpdateNeeded sets statusUpdateNeeded for the specified // node to true indicating the AttachedVolume field in the Node's Status // object needs to be updated by the node updater again. - // If the specifed node does not exist in the nodesToUpdateStatusFor list, + // If the specified node does not exist in the nodesToUpdateStatusFor list, // log the error and return SetNodeStatusUpdateNeeded(nodeName types.NodeName) @@ -467,7 +467,7 @@ func (asw *actualStateOfWorld) addVolumeToReportAsAttached( // Update the flag statusUpdateNeeded to indicate whether node status is already updated or // needs to be updated again by the node status updater. -// If the specifed node does not exist in the nodesToUpdateStatusFor list, log the error and return +// If the specified node does not exist in the nodesToUpdateStatusFor list, log the error and return // This is an internal function and caller should acquire and release the lock func (asw *actualStateOfWorld) updateNodeStatusUpdateNeeded(nodeName types.NodeName, needed bool) error { nodeToUpdate, nodeToUpdateExists := asw.nodesToUpdateStatusFor[nodeName] diff --git a/pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go b/pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go index 379996b18e..4de8adc645 100644 --- a/pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go +++ b/pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go @@ -142,7 +142,7 @@ func (dswp *desiredStateOfWorldPopulator) findAndRemoveDeletedPods() { } } - // the pod from dsw does not exist in pod informer, or it does not match the unique identifer retrieved + // the pod from dsw does not exist in pod informer, or it does not match the unique identifier retrieved // from the informer, delete it from dsw glog.V(1).Infof("Removing pod %q (UID %q) from dsw because it does not exist in pod informer.", dswPodKey, dswPodUID) dswp.desiredStateOfWorld.DeletePod(dswPodUID, dswPodToAdd.VolumeName, dswPodToAdd.NodeName) diff --git a/pkg/controller/volume/attachdetach/reconciler/reconciler.go b/pkg/controller/volume/attachdetach/reconciler/reconciler.go index 32b529c27e..47c690f83a 100644 --- a/pkg/controller/volume/attachdetach/reconciler/reconciler.go +++ b/pkg/controller/volume/attachdetach/reconciler/reconciler.go @@ -147,7 +147,7 @@ func (rc *reconciler) isMultiAttachForbidden(volumeSpec *volume.Spec) bool { } } - // Only if this volume is a persistent volume, we have reliable information on wether it's allowed or not to + // Only if this volume is a persistent volume, we have reliable information on whether it's allowed or not to // multi-attach. We trust in the individual volume implementations to not allow unsupported access modes if volumeSpec.PersistentVolume != nil { // Check for persistent volume types which do not fail when trying to multi-attach diff --git a/pkg/controller/volume/persistentvolume/provision_test.go b/pkg/controller/volume/persistentvolume/provision_test.go index 4fa3cf2f36..93368a58d0 100644 --- a/pkg/controller/volume/persistentvolume/provision_test.go +++ b/pkg/controller/volume/persistentvolume/provision_test.go @@ -172,7 +172,7 @@ func TestProvisionSync(t *testing.T) { newClaimArray("claim11-6", "uid11-6", "1Gi", "volume11-6", v1.ClaimBound, &classGold, annBoundByController, annBindCompleted), noevents, noerrors, // No provisioning plugin confingure - makes the test fail when - // the controller errorneously tries to provision something + // the controller erroneously tries to provision something wrapTestWithProvisionCalls([]provisionCall{provision1Success}, testSyncClaim), }, { diff --git a/pkg/controller/volume/persistentvolume/pv_controller.go b/pkg/controller/volume/persistentvolume/pv_controller.go index 9dba23efdf..272b022285 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller.go +++ b/pkg/controller/volume/persistentvolume/pv_controller.go @@ -978,7 +978,7 @@ func (ctrl *PersistentVolumeController) bind(volume *v1.PersistentVolume, claim func (ctrl *PersistentVolumeController) unbindVolume(volume *v1.PersistentVolume) error { glog.V(4).Infof("updating PersistentVolume[%s]: rolling back binding from %q", volume.Name, claimrefToClaimKey(volume.Spec.ClaimRef)) - // Save the PV only when any modification is neccessary. + // Save the PV only when any modification is necessary. volumeClone := volume.DeepCopy() if metav1.HasAnnotation(volume.ObjectMeta, annBoundByController) { @@ -1058,7 +1058,7 @@ func (ctrl *PersistentVolumeController) recycleVolumeOperation(arg interface{}) // so read current volume state now. newVolume, err := ctrl.kubeClient.CoreV1().PersistentVolumes().Get(volume.Name, metav1.GetOptions{}) if err != nil { - glog.V(3).Infof("error reading peristent volume %q: %v", volume.Name, err) + glog.V(3).Infof("error reading persistent volume %q: %v", volume.Name, err) return } needsReclaim, err := ctrl.isVolumeReleased(newVolume) @@ -1148,7 +1148,7 @@ func (ctrl *PersistentVolumeController) deleteVolumeOperation(arg interface{}) e // read current volume state now. newVolume, err := ctrl.kubeClient.CoreV1().PersistentVolumes().Get(volume.Name, metav1.GetOptions{}) if err != nil { - glog.V(3).Infof("error reading peristent volume %q: %v", volume.Name, err) + glog.V(3).Infof("error reading persistent volume %q: %v", volume.Name, err) return nil } needsReclaim, err := ctrl.isVolumeReleased(newVolume) diff --git a/pkg/controller/volume/persistentvolume/pv_controller_base.go b/pkg/controller/volume/persistentvolume/pv_controller_base.go index a495a2750b..1b745ef937 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller_base.go +++ b/pkg/controller/volume/persistentvolume/pv_controller_base.go @@ -266,7 +266,7 @@ func (ctrl *PersistentVolumeController) Run(stopCh <-chan struct{}) { defer ctrl.volumeQueue.ShutDown() glog.Infof("Starting persistent volume controller") - defer glog.Infof("Shutting down peristent volume controller") + defer glog.Infof("Shutting down persistent volume controller") if !controller.WaitForCacheSync("persistent volume", stopCh, ctrl.volumeListerSynced, ctrl.claimListerSynced, ctrl.classListerSynced, ctrl.podListerSynced) { return diff --git a/pkg/controller/volume/persistentvolume/scheduler_binder_cache_test.go b/pkg/controller/volume/persistentvolume/scheduler_binder_cache_test.go index c73cea970d..d39d823c26 100644 --- a/pkg/controller/volume/persistentvolume/scheduler_binder_cache_test.go +++ b/pkg/controller/volume/persistentvolume/scheduler_binder_cache_test.go @@ -86,7 +86,7 @@ func TestDeleteBindings(t *testing.T) { // Get nil bindings bindings := cache.GetBindings(pod, "node1") if bindings != nil { - t.Errorf("Test failed: expected inital nil bindings, got %+v", bindings) + t.Errorf("Test failed: expected initial nil bindings, got %+v", bindings) } // Delete nothing diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index e312a250a5..f5ac56d34f 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -168,7 +168,7 @@ const ( // deprecated: v1.10 // // Enable the service proxy to contact external IP addresses. Note this feature is present - // only for backward compatability, it will be removed in the 1.11 release. + // only for backward compatibility, it will be removed in the 1.11 release. ServiceProxyAllowExternalIPs utilfeature.Feature = "ServiceProxyAllowExternalIPs" // owner: @jsafrane @@ -236,7 +236,7 @@ const ( // deprecated: v1.10 // // Mount secret, configMap, downwardAPI and projected volumes ReadOnly. Note: this feature - // gate is present only for backward compatability, it will be removed in the 1.11 release. + // gate is present only for backward compatibility, it will be removed in the 1.11 release. ReadOnlyAPIDataVolumes utilfeature.Feature = "ReadOnlyAPIDataVolumes" ) @@ -292,7 +292,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS // unintentionally on either side: apiextensionsfeatures.CustomResourceValidation: {Default: true, PreRelease: utilfeature.Beta}, - // features that enable backwards compatability but are scheduled to be removed + // features that enable backwards compatibility but are scheduled to be removed ServiceProxyAllowExternalIPs: {Default: false, PreRelease: utilfeature.Deprecated}, ReadOnlyAPIDataVolumes: {Default: true, PreRelease: utilfeature.Deprecated}, } diff --git a/pkg/kubectl/cmd/apply.go b/pkg/kubectl/cmd/apply.go index de09cbd6e5..d1dc63c880 100644 --- a/pkg/kubectl/cmd/apply.go +++ b/pkg/kubectl/cmd/apply.go @@ -708,7 +708,7 @@ func (p *patcher) deleteAndCreate(original runtime.Object, modified []byte, name // but still propagate and advertise error to user recreated, recreateErr := p.helper.Create(namespace, true, original) if recreateErr != nil { - err = fmt.Errorf("An error ocurred force-replacing the existing object with the newly provided one:\n\n%v.\n\nAdditionally, an error ocurred attempting to restore the original object:\n\n%v\n", err, recreateErr) + err = fmt.Errorf("An error occurred force-replacing the existing object with the newly provided one:\n\n%v.\n\nAdditionally, an error occurred attempting to restore the original object:\n\n%v\n", err, recreateErr) } else { createdObject = recreated } diff --git a/pkg/kubectl/cmd/diff.go b/pkg/kubectl/cmd/diff.go index 422ec70dc3..98fe4d6151 100644 --- a/pkg/kubectl/cmd/diff.go +++ b/pkg/kubectl/cmd/diff.go @@ -316,7 +316,7 @@ func (obj InfoObject) Merged() (map[string]interface{}, error) { } if live == nil || last == nil { - return local, nil // We probably don't have a live verison, merged is local. + return local, nil // We probably don't have a live version, merged is local. } elmt, err := obj.Parser.CreateElement(last, local, live) diff --git a/pkg/kubectl/cmd/drain_test.go b/pkg/kubectl/cmd/drain_test.go index 8efe31f8db..c4543ec2db 100644 --- a/pkg/kubectl/cmd/drain_test.go +++ b/pkg/kubectl/cmd/drain_test.go @@ -216,7 +216,7 @@ func TestCordon(t *testing.T) { t.Fatalf("%s: unexpected non-error", test.description) } if updated { - t.Fatalf("%s: unexpcted update", test.description) + t.Fatalf("%s: unexpected update", test.description) } } diff --git a/pkg/kubectl/cmd/set/set_image_test.go b/pkg/kubectl/cmd/set/set_image_test.go index ca27bbcdd9..3fe4796d31 100644 --- a/pkg/kubectl/cmd/set/set_image_test.go +++ b/pkg/kubectl/cmd/set/set_image_test.go @@ -122,7 +122,7 @@ func TestSetImageValidation(t *testing.T) { expectErr: "all containers are already specified by *, but saw more than one container_name=container_image pairs", }, { - name: "sucess case", + name: "success case", imageOptions: &ImageOptions{ Resources: []string{"a", "b", "c"}, FilenameOptions: resource.FilenameOptions{ diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index c2888da9c9..ad62bee1b1 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -153,11 +153,11 @@ type ClientAccessFactory interface { // Returns a Printer for formatting objects of the given type or an error. Printer(mapping *meta.RESTMapping, options printers.PrintOptions) (printers.ResourcePrinter, error) // Pauser marks the object in the info as paused. Currently supported only for Deployments. - // Returns the patched object in bytes and any error that occured during the encoding or + // Returns the patched object in bytes and any error that occurred during the encoding or // in case the object is already paused. Pauser(info *resource.Info) ([]byte, error) // Resumer resumes a paused object inside the info. Currently supported only for Deployments. - // Returns the patched object in bytes and any error that occured during the encoding or + // Returns the patched object in bytes and any error that occurred during the encoding or // in case the object is already resumed. Resumer(info *resource.Info) ([]byte, error) @@ -224,7 +224,7 @@ type ObjectMappingFactory interface { // Returns a schema that can validate objects stored on disk. Validator(validate bool) (validation.Schema, error) - // OpenAPISchema returns the schema openapi schema definiton + // OpenAPISchema returns the schema openapi schema definition OpenAPISchema() (openapi.Resources, error) } diff --git a/pkg/kubectl/env_file.go b/pkg/kubectl/env_file.go index 19598d5354..8221d5936c 100644 --- a/pkg/kubectl/env_file.go +++ b/pkg/kubectl/env_file.go @@ -81,7 +81,7 @@ func addFromEnvFile(filePath string, addTo func(key, value string) error) error scanner := bufio.NewScanner(f) currentLine := 0 for scanner.Scan() { - // Proccess the current line, retrieving a key/value pair if + // Process the current line, retrieving a key/value pair if // possible. scannedBytes := scanner.Bytes() key, value, err := proccessEnvFileLine(scannedBytes, filePath, currentLine) diff --git a/pkg/kubectl/scale.go b/pkg/kubectl/scale.go index 1d55d2a943..771648669e 100644 --- a/pkg/kubectl/scale.go +++ b/pkg/kubectl/scale.go @@ -214,7 +214,7 @@ func (scaler *ReplicationControllerScaler) Scale(namespace, name string, newSize return rc.Status.ObservedGeneration >= rc.Generation && rc.Status.Replicas == rc.Spec.Replicas } // If number of replicas doesn't change, then the update may not event - // be sent to underlying databse (we don't send no-op changes). + // be sent to underlying database (we don't send no-op changes). // In such case, will have value of the most // recent update (which may be far in the past) so we may get "too old // RV" error from watch or potentially no ReplicationController events diff --git a/pkg/kubectl/scale_test.go b/pkg/kubectl/scale_test.go index 417f7ee91a..65bf4beb8a 100644 --- a/pkg/kubectl/scale_test.go +++ b/pkg/kubectl/scale_test.go @@ -1430,7 +1430,7 @@ func TestGenericScaleSimple(t *testing.T) { resVersion, err := target.ScaleSimple("default", scenario.resName, &scenario.precondition, uint(scenario.newSize)) if scenario.expectError && err == nil { - t.Fatal("expeced an error but was not returned") + t.Fatal("expected an error but was not returned") } if !scenario.expectError && err != nil { t.Fatalf("unexpected error: %v", err) @@ -1527,7 +1527,7 @@ func TestGenericScale(t *testing.T) { err := target.Scale("default", scenario.resName, uint(scenario.newSize), &scenario.precondition, nil, scenario.waitForReplicas) if scenario.expectError && err == nil { - t.Fatal("expeced an error but was not returned") + t.Fatal("expected an error but was not returned") } if !scenario.expectError && err != nil { t.Fatalf("unexpected error: %v", err) diff --git a/pkg/kubelet/apis/cri/services.go b/pkg/kubelet/apis/cri/services.go index 45bc5ef323..6657f6f9e5 100644 --- a/pkg/kubelet/apis/cri/services.go +++ b/pkg/kubelet/apis/cri/services.go @@ -77,7 +77,7 @@ type PodSandboxManager interface { PortForward(*runtimeapi.PortForwardRequest) (*runtimeapi.PortForwardResponse, error) } -// ContainerStatsManager contains methods for retriving the container +// ContainerStatsManager contains methods for retrieving the container // statistics. type ContainerStatsManager interface { // ContainerStats returns stats of the container. If the container does not diff --git a/pkg/kubelet/apis/deviceplugin/v1alpha/constants.go b/pkg/kubelet/apis/deviceplugin/v1alpha/constants.go index 896354ab90..4ac85b9360 100644 --- a/pkg/kubelet/apis/deviceplugin/v1alpha/constants.go +++ b/pkg/kubelet/apis/deviceplugin/v1alpha/constants.go @@ -19,7 +19,7 @@ package deviceplugin const ( // Healthy means that the device is healty Healthy = "Healthy" - // UnHealthy means that the device is unhealty + // UnHealthy means that the device is unhealthy Unhealthy = "Unhealthy" // Current version of the API supported by kubelet diff --git a/pkg/kubelet/apis/kubeletconfig/helpers_test.go b/pkg/kubelet/apis/kubeletconfig/helpers_test.go index b0a8757fd3..defa6b4b98 100644 --- a/pkg/kubelet/apis/kubeletconfig/helpers_test.go +++ b/pkg/kubelet/apis/kubeletconfig/helpers_test.go @@ -29,7 +29,7 @@ func TestKubeletConfigurationPathFields(t *testing.T) { // ensure the intersection of kubeletConfigurationPathFieldPaths and KubeletConfigurationNonPathFields is empty if i := kubeletConfigurationPathFieldPaths.Intersection(kubeletConfigurationNonPathFieldPaths); len(i) > 0 { t.Fatalf("expect the intersection of kubeletConfigurationPathFieldPaths and "+ - "KubeletConfigurationNonPathFields to be emtpy, got:\n%s", + "KubeletConfigurationNonPathFields to be empty, got:\n%s", strings.Join(i.List(), "\n")) } diff --git a/pkg/kubelet/apis/kubeletconfig/scheme/scheme.go b/pkg/kubelet/apis/kubeletconfig/scheme/scheme.go index 76f042818e..9ccb9d39f8 100644 --- a/pkg/kubelet/apis/kubeletconfig/scheme/scheme.go +++ b/pkg/kubelet/apis/kubeletconfig/scheme/scheme.go @@ -25,7 +25,7 @@ import ( // Utility functions for the Kubelet's kubeletconfig API group -// NewSchemeAndCodecs is a utility funciton that returns a Scheme and CodecFactory +// NewSchemeAndCodecs is a utility function that returns a Scheme and CodecFactory // that understand the types in the kubeletconfig API group. func NewSchemeAndCodecs() (*runtime.Scheme, *serializer.CodecFactory, error) { scheme := runtime.NewScheme() diff --git a/pkg/kubelet/apis/kubeletconfig/types.go b/pkg/kubelet/apis/kubeletconfig/types.go index 25805431ab..af9940ec68 100644 --- a/pkg/kubelet/apis/kubeletconfig/types.go +++ b/pkg/kubelet/apis/kubeletconfig/types.go @@ -82,7 +82,7 @@ type KubeletConfiguration struct { // and key are generated for the public address and saved to the directory // passed to certDir. TLSCertFile string - // tlsPrivateKeyFile is the ile containing x509 private key matching + // tlsPrivateKeyFile is the file containing x509 private key matching // tlsCertFile. TLSPrivateKeyFile string // TLSCipherSuites is the list of allowed cipher suites for the server. @@ -184,7 +184,7 @@ type KubeletConfiguration struct { // "hairpin-veth": set the hairpin flag on container veth interfaces. // "none": do nothing. // Generally, one must set --hairpin-mode=hairpin-veth to achieve hairpin NAT, - // because promiscous-bridge assumes the existence of a container bridge named cbr0. + // because promiscuous-bridge assumes the existence of a container bridge named cbr0. HairpinMode string // maxPods is the number of pods that can run on this Kubelet. MaxPods int32 diff --git a/pkg/kubelet/apis/kubeletconfig/v1alpha1/types.go b/pkg/kubelet/apis/kubeletconfig/v1alpha1/types.go index 4b50e51b1f..27061d8894 100644 --- a/pkg/kubelet/apis/kubeletconfig/v1alpha1/types.go +++ b/pkg/kubelet/apis/kubeletconfig/v1alpha1/types.go @@ -82,7 +82,7 @@ type KubeletConfiguration struct { // and key are generated for the public address and saved to the directory // passed to certDir. TLSCertFile string `json:"tlsCertFile"` - // tlsPrivateKeyFile is the ile containing x509 private key matching + // tlsPrivateKeyFile is the file containing x509 private key matching // tlsCertFile. TLSPrivateKeyFile string `json:"tlsPrivateKeyFile"` // TLSCipherSuites is the list of allowed cipher suites for the server. @@ -181,7 +181,7 @@ type KubeletConfiguration struct { // "hairpin-veth": set the hairpin flag on container veth interfaces. // "none": do nothing. // Generally, one must set --hairpin-mode=hairpin-veth to achieve hairpin NAT, - // because promiscous-bridge assumes the existence of a container bridge named cbr0. + // because promiscuous-bridge assumes the existence of a container bridge named cbr0. HairpinMode string `json:"hairpinMode"` // maxPods is the number of pods that can run on this Kubelet. MaxPods int32 `json:"maxPods"` diff --git a/pkg/kubelet/cadvisor/testing/cadvisor_fake.go b/pkg/kubelet/cadvisor/testing/cadvisor_fake.go index fa7a229e61..53ab4afea3 100644 --- a/pkg/kubelet/cadvisor/testing/cadvisor_fake.go +++ b/pkg/kubelet/cadvisor/testing/cadvisor_fake.go @@ -51,7 +51,7 @@ func (c *Fake) DockerContainer(name string, req *cadvisorapi.ContainerInfoReques } func (c *Fake) MachineInfo() (*cadvisorapi.MachineInfo, error) { - // Simulate a matchin with 1 core and 3.75GB of memory. + // Simulate a matching with 1 core and 3.75GB of memory. // We set it to non-zero values to make non-zero-capacity machines in Kubemark. return &cadvisorapi.MachineInfo{ NumCores: 1, diff --git a/pkg/kubelet/cm/cpumanager/policy_static_test.go b/pkg/kubelet/cm/cpumanager/policy_static_test.go index f0e592ffd1..a1bc3517ba 100644 --- a/pkg/kubelet/cm/cpumanager/policy_static_test.go +++ b/pkg/kubelet/cm/cpumanager/policy_static_test.go @@ -93,10 +93,10 @@ func TestStaticPolicyStart(t *testing.T) { defer func() { if err := recover(); err != nil { if !testCase.expPanic { - t.Errorf("unexpected panic occured: %q", err) + t.Errorf("unexpected panic occurred: %q", err) } } else if testCase.expPanic { - t.Error("expected panic doesn't occured") + t.Error("expected panic doesn't occurred") } }() policy := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs).(*staticPolicy) diff --git a/pkg/kubelet/cm/cpumanager/state/state_file_test.go b/pkg/kubelet/cm/cpumanager/state/state_file_test.go index 93dd3910ad..b507884c42 100644 --- a/pkg/kubelet/cm/cpumanager/state/state_file_test.go +++ b/pkg/kubelet/cm/cpumanager/state/state_file_test.go @@ -45,7 +45,7 @@ func stateEqual(t *testing.T, sf State, sm State) { cpuassignmentSf := sf.GetCPUAssignments() cpuassignmentSm := sm.GetCPUAssignments() if !reflect.DeepEqual(cpuassignmentSf, cpuassignmentSm) { - t.Errorf("State CPU assigments mismatch. Have %s, want %s", cpuassignmentSf, cpuassignmentSm) + t.Errorf("State CPU assignments mismatch. Have %s, want %s", cpuassignmentSf, cpuassignmentSm) } } @@ -426,7 +426,7 @@ func TestHelpersStateFile(t *testing.T) { for containerName, containerCPUs := range tc.containers { state.SetCPUSet(containerName, containerCPUs) if cpus, _ := state.GetCPUSet(containerName); !cpus.Equals(containerCPUs) { - t.Errorf("state is inconsistant. Wants = %q Have = %q", containerCPUs, cpus) + t.Errorf("state is inconsistent. Wants = %q Have = %q", containerCPUs, cpus) } state.Delete(containerName) if cpus := state.GetCPUSetOrDefault(containerName); !cpus.Equals(tc.defaultCPUset) { diff --git a/pkg/kubelet/cm/devicemanager/manager_test.go b/pkg/kubelet/cm/devicemanager/manager_test.go index 28cb53e2d0..a1a2e74e3a 100644 --- a/pkg/kubelet/cm/devicemanager/manager_test.go +++ b/pkg/kubelet/cm/devicemanager/manager_test.go @@ -534,7 +534,7 @@ func TestPodContainerDeviceAllocation(t *testing.T) { expErr error }{ { - description: "Successfull allocation of two Res1 resources and one Res2 resource", + description: "Successful allocation of two Res1 resources and one Res2 resource", testPod: testPods[0], expectedContainerOptsLen: []int{3, 2, 2}, expectedAllocatedResName1: 2, @@ -550,7 +550,7 @@ func TestPodContainerDeviceAllocation(t *testing.T) { expErr: fmt.Errorf("requested number of devices unavailable for domain1.com/resource1. Requested: 1, Available: 0"), }, { - description: "Successfull allocation of all available Res1 resources and Res2 resources", + description: "Successful allocation of all available Res1 resources and Res2 resources", testPod: testPods[2], expectedContainerOptsLen: []int{0, 0, 1}, expectedAllocatedResName1: 2, diff --git a/pkg/kubelet/container/helpers.go b/pkg/kubelet/container/helpers.go index d16bb2171b..2320a192be 100644 --- a/pkg/kubelet/container/helpers.go +++ b/pkg/kubelet/container/helpers.go @@ -48,7 +48,7 @@ type HandlerRunner interface { type RuntimeHelper interface { GenerateRunContainerOptions(pod *v1.Pod, container *v1.Container, podIP string) (contOpts *RunContainerOptions, err error) GetPodDNS(pod *v1.Pod) (dnsConfig *runtimeapi.DNSConfig, err error) - // GetPodCgroupParent returns the CgroupName identifer, and its literal cgroupfs form on the host + // GetPodCgroupParent returns the CgroupName identifier, and its literal cgroupfs form on the host // of a pod. GetPodCgroupParent(pod *v1.Pod) string GetPodDir(podUID types.UID) string diff --git a/pkg/kubelet/dockershim/docker_legacy_service.go b/pkg/kubelet/dockershim/docker_legacy_service.go index 357e673622..df756a5f44 100644 --- a/pkg/kubelet/dockershim/docker_legacy_service.go +++ b/pkg/kubelet/dockershim/docker_legacy_service.go @@ -42,7 +42,7 @@ type DockerLegacyService interface { GetContainerLogs(*v1.Pod, kubecontainer.ContainerID, *v1.PodLogOptions, io.Writer, io.Writer) error // IsCRISupportedLogDriver checks whether the logging driver used by docker is - // suppoted by native CRI integration. + // supported by native CRI integration. // TODO(resouer): remove this when deprecating unsupported log driver IsCRISupportedLogDriver() (bool, error) @@ -108,7 +108,7 @@ func (d *dockerService) GetContainerLogTail(uid kubetypes.UID, name, namespace s var criSupportedLogDrivers = []string{"json-file"} // IsCRISupportedLogDriver checks whether the logging driver used by docker is -// suppoted by native CRI integration. +// supported by native CRI integration. func (d *dockerService) IsCRISupportedLogDriver() (bool, error) { info, err := d.client.Info() if err != nil { diff --git a/pkg/kubelet/dockershim/docker_service.go b/pkg/kubelet/dockershim/docker_service.go index 867ec7bc01..3c88a0e4e0 100644 --- a/pkg/kubelet/dockershim/docker_service.go +++ b/pkg/kubelet/dockershim/docker_service.go @@ -150,7 +150,7 @@ func (p *portMappingGetter) GetPodPortMappings(containerID string) ([]*hostport. } // dockerNetworkHost implements network.Host by wrapping the legacy host passed in by the kubelet -// and dockerServices which implementes the rest of the network host interfaces. +// and dockerServices which implements the rest of the network host interfaces. // The legacy host methods are slated for deletion. type dockerNetworkHost struct { network.LegacyHost diff --git a/pkg/kubelet/dockershim/helpers_test.go b/pkg/kubelet/dockershim/helpers_test.go index a88cfa0de8..1fdb185ed2 100644 --- a/pkg/kubelet/dockershim/helpers_test.go +++ b/pkg/kubelet/dockershim/helpers_test.go @@ -243,7 +243,7 @@ func TestMakePortsAndBindings(t *testing.T) { }, }, }, - "multipe port mappings": { + "multiple port mappings": { pm: []*runtimeapi.PortMapping{ { Protocol: runtimeapi.Protocol_TCP, diff --git a/pkg/kubelet/dockershim/helpers_windows.go b/pkg/kubelet/dockershim/helpers_windows.go index 4e3dbd0ba1..4636800b5f 100644 --- a/pkg/kubelet/dockershim/helpers_windows.go +++ b/pkg/kubelet/dockershim/helpers_windows.go @@ -114,7 +114,7 @@ func (ds *dockerService) determinePodIPBySandboxID(sandboxID string) string { // Windows version < Windows Server 2016 is Not Supported // Sandbox support in Windows mandates CNI Plugin. - // Presense of CONTAINER_NETWORK flag is considered as non-Sandbox cases here + // Presence of CONTAINER_NETWORK flag is considered as non-Sandbox cases here // Todo: Add a kernel version check for more validation diff --git a/pkg/kubelet/kubelet_network.go b/pkg/kubelet/kubelet_network.go index d70fa06a13..c33b5a7ed0 100644 --- a/pkg/kubelet/kubelet_network.go +++ b/pkg/kubelet/kubelet_network.go @@ -282,7 +282,7 @@ func getIPTablesMark(bit int) string { return fmt.Sprintf("%#08x/%#08x", value, value) } -// GetPodDNS returns DNS setttings for the pod. +// GetPodDNS returns DNS settings for the pod. // This function is defined in kubecontainer.RuntimeHelper interface so we // have to implement it. func (kl *Kubelet) GetPodDNS(pod *v1.Pod) (*runtimeapi.DNSConfig, error) { diff --git a/pkg/kubelet/kubeletconfig/util/equal/equal.go b/pkg/kubelet/kubeletconfig/util/equal/equal.go index ffd12cf6a4..2d22185ecc 100644 --- a/pkg/kubelet/kubeletconfig/util/equal/equal.go +++ b/pkg/kubelet/kubeletconfig/util/equal/equal.go @@ -30,7 +30,7 @@ func ConfigSourceEq(a, b *apiv1.NodeConfigSource) bool { if a.ConfigMapRef != b.ConfigMapRef { return ObjectRefEq(a.ConfigMapRef, b.ConfigMapRef) } - // all internal subfields of the config soruce are equal + // all internal subfields of the config source are equal return true } diff --git a/pkg/kubelet/kubeletconfig/watch.go b/pkg/kubelet/kubeletconfig/watch.go index ecc255b962..8c02e3c9a8 100644 --- a/pkg/kubelet/kubeletconfig/watch.go +++ b/pkg/kubelet/kubeletconfig/watch.go @@ -103,7 +103,7 @@ func (cc *Controller) onUpdateNodeEvent(oldObj interface{}, newObj interface{}) // if an unexpected DeletedFinalStateUnknown was received. // We allow the sync-loop to continue, because it is possible that the Kubelet detected // a Node with unexpected externalID and is attempting to delete and re-create the Node -// (see pkg/kubelet/kubelet_node_status.go), or that someone accidently deleted the Node +// (see pkg/kubelet/kubelet_node_status.go), or that someone accidentally deleted the Node // (the Kubelet will re-create it). func (cc *Controller) onDeleteNodeEvent(deletedObj interface{}) { node, ok := deletedObj.(*apiv1.Node) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go index dfce8b11d9..c34136b569 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go @@ -613,7 +613,7 @@ func (m *kubeGenericRuntimeManager) SyncPod(pod *v1.Pod, _ v1.PodStatus, podStat } // Keep terminated init containers fairly aggressively controlled - // This is an optmization because container removals are typically handled + // This is an optimization because container removals are typically handled // by container garbage collector. m.pruneInitContainersBeforeStart(pod, podStatus) diff --git a/pkg/kubelet/kuberuntime/labels.go b/pkg/kubelet/kuberuntime/labels.go index 6dd2b6f0d0..9adc0205a2 100644 --- a/pkg/kubelet/kuberuntime/labels.go +++ b/pkg/kubelet/kuberuntime/labels.go @@ -132,7 +132,7 @@ func newContainerAnnotations(container *v1.Container, pod *v1.Pod, restartCount } if container.Lifecycle != nil && container.Lifecycle.PreStop != nil { - // Using json enconding so that the PreStop handler object is readable after writing as a label + // Using json encoding so that the PreStop handler object is readable after writing as a label rawPreStop, err := json.Marshal(container.Lifecycle.PreStop) if err != nil { glog.Errorf("Unable to marshal lifecycle PreStop handler for container %q of pod %q: %v", container.Name, format.Pod(pod), err) diff --git a/pkg/kubelet/kuberuntime/logs/logs.go b/pkg/kubelet/kuberuntime/logs/logs.go index 3d61d40dac..8e9360914c 100644 --- a/pkg/kubelet/kuberuntime/logs/logs.go +++ b/pkg/kubelet/kuberuntime/logs/logs.go @@ -307,7 +307,7 @@ func ReadLogs(path, containerID string, opts *LogOptions, runtimeService interna return fmt.Errorf("failed to reset seek in log file %q: %v", path, err) } if watcher == nil { - // Intialize the watcher if it has not been initialized yet. + // Initialize the watcher if it has not been initialized yet. if watcher, err = fsnotify.NewWatcher(); err != nil { return fmt.Errorf("failed to create fsnotify watcher: %v", err) } @@ -330,7 +330,7 @@ func ReadLogs(path, containerID string, opts *LogOptions, runtimeService interna glog.Warningf("Incomplete line in log file %q: %q", path, l) } if parse == nil { - // Intialize the log parsing function. + // Initialize the log parsing function. parse, err = getParseFunc(l) if err != nil { return fmt.Errorf("failed to get parse function: %v", err) diff --git a/pkg/kubelet/network/dns/dns.go b/pkg/kubelet/network/dns/dns.go index 0fae93a72b..a3e42358c7 100644 --- a/pkg/kubelet/network/dns/dns.go +++ b/pkg/kubelet/network/dns/dns.go @@ -321,7 +321,7 @@ func appendDNSConfig(existingDNSConfig *runtimeapi.DNSConfig, dnsConfig *v1.PodD return existingDNSConfig } -// GetPodDNS returns DNS setttings for the pod. +// GetPodDNS returns DNS settings for the pod. func (c *Configurer) GetPodDNS(pod *v1.Pod) (*runtimeapi.DNSConfig, error) { dnsConfig, err := c.getHostDNSConfig(pod) if err != nil { diff --git a/pkg/kubelet/network/kubenet/kubenet_linux.go b/pkg/kubelet/network/kubenet/kubenet_linux.go index 35e0a1b0cc..9fc7e3b279 100644 --- a/pkg/kubelet/network/kubenet/kubenet_linux.go +++ b/pkg/kubelet/network/kubenet/kubenet_linux.go @@ -570,7 +570,7 @@ func (plugin *kubenetNetworkPlugin) Status() error { return nil } -// checkCNIPlugin returns if all kubenet required cni plugins can be found at /opt/cni/bin or user specifed NetworkPluginDir. +// checkCNIPlugin returns if all kubenet required cni plugins can be found at /opt/cni/bin or user specified NetworkPluginDir. func (plugin *kubenetNetworkPlugin) checkCNIPlugin() bool { if plugin.checkCNIPluginInDir(DefaultCNIDir) || plugin.checkCNIPluginInDir(plugin.vendorDir) { return true diff --git a/pkg/kubelet/preemption/preemption_test.go b/pkg/kubelet/preemption/preemption_test.go index d142240c29..de4a6c780b 100644 --- a/pkg/kubelet/preemption/preemption_test.go +++ b/pkg/kubelet/preemption/preemption_test.go @@ -183,7 +183,7 @@ func TestGetPodsToPreempt(t *testing.T) { expectedOutput: []*v1.Pod{allPods[burstable]}, }, { - testName: "higer requirements than pod requests", + testName: "higher requirements than pod requests", inputPods: []*v1.Pod{allPods[burstable]}, insufficientResources: getAdmissionRequirementList(200, 200, 2), expectErr: true, diff --git a/pkg/kubelet/prober/worker_test.go b/pkg/kubelet/prober/worker_test.go index 30f408fa55..f05723e1c8 100644 --- a/pkg/kubelet/prober/worker_test.go +++ b/pkg/kubelet/prober/worker_test.go @@ -348,7 +348,7 @@ func TestResultRunOnLivenessCheckFailure(t *testing.T) { m.statusManager.SetPodStatus(w.pod, getTestRunningStatus()) m.prober.exec = fakeExecProber{probe.Success, nil} - msg := "inital probe success" + msg := "initial probe success" expectContinue(t, w, w.doProbe(), msg) expectResult(t, w, results.Success, msg) if w.resultRun != 1 { diff --git a/pkg/kubelet/server/portforward/websocket.go b/pkg/kubelet/server/portforward/websocket.go index b445c922f6..a7c9e82ce5 100644 --- a/pkg/kubelet/server/portforward/websocket.go +++ b/pkg/kubelet/server/portforward/websocket.go @@ -45,7 +45,7 @@ const ( // options contains details about which streams are required for // port forwarding. -// All fields incldued in V4Options need to be expressed explicilty in the +// All fields incldued in V4Options need to be expressed explicitly in the // CRI (pkg/kubelet/apis/cri/{version}/api.proto) PortForwardRequest. type V4Options struct { Ports []int32 diff --git a/pkg/kubelet/server/remotecommand/httpstream.go b/pkg/kubelet/server/remotecommand/httpstream.go index 74f0595cf7..387ad3d5a7 100644 --- a/pkg/kubelet/server/remotecommand/httpstream.go +++ b/pkg/kubelet/server/remotecommand/httpstream.go @@ -156,7 +156,7 @@ func createHttpStreamStreams(req *http.Request, w http.ResponseWriter, opts *Opt case remotecommandconsts.StreamProtocolV2Name: handler = &v2ProtocolHandler{} case "": - glog.V(4).Infof("Client did not request protocol negotiaion. Falling back to %q", remotecommandconsts.StreamProtocolV1Name) + glog.V(4).Infof("Client did not request protocol negotiation. Falling back to %q", remotecommandconsts.StreamProtocolV1Name) fallthrough case remotecommandconsts.StreamProtocolV1Name: handler = &v1ProtocolHandler{} diff --git a/pkg/kubelet/util/format/pod.go b/pkg/kubelet/util/format/pod.go index c2931ad57a..45c0d8b4b3 100644 --- a/pkg/kubelet/util/format/pod.go +++ b/pkg/kubelet/util/format/pod.go @@ -51,7 +51,7 @@ func PodWithDeletionTimestamp(pod *v1.Pod) string { return Pod(pod) + deletionTimestamp } -// Pods returns a string representating a list of pods in a human +// Pods returns a string representation a list of pods in a human // readable format. func Pods(pods []*v1.Pod) string { return aggregatePods(pods, Pod) diff --git a/pkg/kubelet/volumemanager/reconciler/reconciler.go b/pkg/kubelet/volumemanager/reconciler/reconciler.go index f7293c6d76..6a0dae2369 100644 --- a/pkg/kubelet/volumemanager/reconciler/reconciler.go +++ b/pkg/kubelet/volumemanager/reconciler/reconciler.go @@ -311,7 +311,7 @@ func (rc *reconciler) reconcile() { // sync process tries to observe the real world by scanning all pods' volume directories from the disk. // If the actual and desired state of worlds are not consistent with the observed world, it means that some // mounted volumes are left out probably during kubelet restart. This process will reconstruct -// the volumes and udpate the actual and desired states. For the volumes that cannot support reconstruction, +// the volumes and update the actual and desired states. For the volumes that cannot support reconstruction, // it will try to clean up the mount paths with operation executor. func (rc *reconciler) sync() { defer rc.updateLastSyncTime() @@ -639,7 +639,7 @@ func getVolumesFromPodDir(podDir string) ([]podVolume, error) { for volumeMode, volumesDir := range volumesDirs { var volumesDirInfo []os.FileInfo if volumesDirInfo, err = ioutil.ReadDir(volumesDir); err != nil { - // Just skip the loop becuase given volumesDir doesn't exist depending on volumeMode + // Just skip the loop because given volumesDir doesn't exist depending on volumeMode continue } for _, volumeDir := range volumesDirInfo { diff --git a/pkg/kubelet/winstats/version.go b/pkg/kubelet/winstats/version.go index 81bb52edf5..fae2f77785 100644 --- a/pkg/kubelet/winstats/version.go +++ b/pkg/kubelet/winstats/version.go @@ -25,7 +25,7 @@ import ( "golang.org/x/sys/windows" ) -// getCurrentVersionVal gets value of speficied key from registry. +// getCurrentVersionVal gets value of specified key from registry. func getCurrentVersionVal(key string) (string, error) { var h windows.Handle if err := windows.RegOpenKeyEx(windows.HKEY_LOCAL_MACHINE, diff --git a/pkg/master/client_ca_hook.go b/pkg/master/client_ca_hook.go index 75f76a9bce..3f1daa86c8 100644 --- a/pkg/master/client_ca_hook.go +++ b/pkg/master/client_ca_hook.go @@ -50,7 +50,7 @@ func (h ClientCARegistrationHook) PostStartHook(hookContext genericapiserver.Pos // We've seen lagging etcd before, so we want to retry this a few times before we decide to crashloop // the API server on it. err := wait.Poll(1*time.Second, 30*time.Second, func() (done bool, err error) { - // retry building the config since sometimes the server can be in an inbetween state which caused + // retry building the config since sometimes the server can be in an in-between state which caused // some kind of auto detection failure as I recall from other post start hooks. // TODO see if this is still true and fix the RBAC one too if it isn't. client, err := coreclient.NewForConfig(hookContext.LoopbackClientConfig) diff --git a/pkg/master/ports/ports.go b/pkg/master/ports/ports.go index 14508cc27f..76783de005 100644 --- a/pkg/master/ports/ports.go +++ b/pkg/master/ports/ports.go @@ -30,7 +30,7 @@ const ( // May be overridden by a flag at startup. ControllerManagerPort = 10252 // CloudControllerManagerPort is the default port for the cloud controller manager server. - // This value may be overriden by a flag at startup. + // This value may be overridden by a flag at startup. CloudControllerManagerPort = 10253 // KubeletReadOnlyPort exposes basic read-only services from the kubelet. // May be overridden by a flag at startup. diff --git a/pkg/printers/internalversion/describe.go b/pkg/printers/internalversion/describe.go index bfcdfd33c0..fe38c3f696 100644 --- a/pkg/printers/internalversion/describe.go +++ b/pkg/printers/internalversion/describe.go @@ -87,7 +87,7 @@ type PrefixWriter interface { Write(level int, format string, a ...interface{}) // WriteLine writes an entire line with no indentation level. WriteLine(a ...interface{}) - // Flush forces indendation to be reset. + // Flush forces indentation to be reset. Flush() } diff --git a/pkg/proxy/healthcheck/healthcheck.go b/pkg/proxy/healthcheck/healthcheck.go index 7ee1da6ff4..93e5edf611 100644 --- a/pkg/proxy/healthcheck/healthcheck.go +++ b/pkg/proxy/healthcheck/healthcheck.go @@ -73,7 +73,7 @@ type HTTPServerFactory interface { // HTTPServer allows for testing of Server. type HTTPServer interface { - // Server is designed so that http.Server satifies this interface, + // Server is designed so that http.Server satisfies this interface, Serve(listener net.Listener) error } diff --git a/pkg/proxy/ipvs/proxier.go b/pkg/proxy/ipvs/proxier.go index fc8eef57de..bea1609f64 100644 --- a/pkg/proxy/ipvs/proxier.go +++ b/pkg/proxy/ipvs/proxier.go @@ -1641,7 +1641,7 @@ func (proxier *Proxier) syncEndpoint(svcPortName proxy.ServicePortName, onlyNode return err } - // curEndpoints represents IPVS destiantions listed from current system. + // curEndpoints represents IPVS destinations listed from current system. curEndpoints := sets.NewString() // newEndpoints represents Endpoints watched from API Server. newEndpoints := sets.NewString() diff --git a/pkg/proxy/ipvs/proxier_test.go b/pkg/proxy/ipvs/proxier_test.go index 88f7df5189..be0437009c 100644 --- a/pkg/proxy/ipvs/proxier_test.go +++ b/pkg/proxy/ipvs/proxier_test.go @@ -2500,7 +2500,7 @@ func Test_syncService(t *testing.T) { } } if err := proxier.syncService(testCases[i].svcName, testCases[i].newVirtualServer, testCases[i].bindAddr); err != nil { - t.Errorf("Case [%d], unexpected sync IPVS virutal server error: %v", i, err) + t.Errorf("Case [%d], unexpected sync IPVS virtual server error: %v", i, err) } // check list, err := proxier.ipvs.GetVirtualServers() diff --git a/pkg/proxy/userspace/proxier.go b/pkg/proxy/userspace/proxier.go index 21ac5ca2bd..3d11391a95 100644 --- a/pkg/proxy/userspace/proxier.go +++ b/pkg/proxy/userspace/proxier.go @@ -157,7 +157,7 @@ func NewProxier(loadBalancer LoadBalancer, listenIP net.IP, iptables iptables.In return NewCustomProxier(loadBalancer, listenIP, iptables, exec, pr, syncPeriod, minSyncPeriod, udpIdleTimeout, newProxySocket) } -// NewCustomProxier functions similarly to NewProxier, returing a new Proxier +// NewCustomProxier functions similarly to NewProxier, returning a new Proxier // for the given LoadBalancer and address. The new proxier is constructed using // the ProxySocket constructor provided, however, instead of constructing the // default ProxySockets. diff --git a/pkg/proxy/userspace/proxysocket.go b/pkg/proxy/userspace/proxysocket.go index d65ac02a0c..207004b1cb 100644 --- a/pkg/proxy/userspace/proxysocket.go +++ b/pkg/proxy/userspace/proxysocket.go @@ -87,7 +87,7 @@ func (tcp *tcpProxySocket) ListenPort() int { } // TryConnectEndpoints attempts to connect to the next available endpoint for the given service, cycling -// through until it is able to successully connect, or it has tried with all timeouts in EndpointDialTimeouts. +// through until it is able to successfully connect, or it has tried with all timeouts in EndpointDialTimeouts. func TryConnectEndpoints(service proxy.ServicePortName, srcAddr net.Addr, protocol string, loadBalancer LoadBalancer) (out net.Conn, err error) { sessionAffinityReset := false for _, dialTimeout := range EndpointDialTimeouts { diff --git a/pkg/proxy/winkernel/proxier.go b/pkg/proxy/winkernel/proxier.go index 7b75e4a947..595286520c 100644 --- a/pkg/proxy/winkernel/proxier.go +++ b/pkg/proxy/winkernel/proxier.go @@ -471,7 +471,7 @@ func NewProxier( } hnsNetwork, err := getHnsNetworkInfo(hnsNetworkName) if err != nil { - glog.Fatalf("Unable to find Hns Network speficied by %s. Please check environment variable KUBE_NETWORK", hnsNetworkName) + glog.Fatalf("Unable to find Hns Network specified by %s. Please check environment variable KUBE_NETWORK", hnsNetworkName) return nil, err } diff --git a/pkg/proxy/winuserspace/proxysocket.go b/pkg/proxy/winuserspace/proxysocket.go index ed87f19753..85823b737e 100644 --- a/pkg/proxy/winuserspace/proxysocket.go +++ b/pkg/proxy/winuserspace/proxysocket.go @@ -382,7 +382,7 @@ func processUnpackedDNSResponsePacket( if found { index := atomic.SwapInt32(&state.searchIndex, state.searchIndex+1) if rcode != 0 && index >= 0 && index < int32(len(dnsSearch)) { - // If the reponse has failure and iteration through the search list has not + // If the response has failure and iteration through the search list has not // reached the end, retry on behalf of the client using the original query message drop = true length, err = appendDNSSuffix(state.msg, buffer, length, dnsSearch[index]) @@ -477,7 +477,7 @@ func processDNSResponsePacket( // QDCOUNT if len(msg.Question) != 1 { - glog.V(1).Infof("Number of entries in the reponse section of the DNS packet is: %d", len(msg.Answer)) + glog.V(1).Infof("Number of entries in the response section of the DNS packet is: %d", len(msg.Answer)) return drop, length, nil } diff --git a/pkg/quota/evaluator/core/persistent_volume_claims.go b/pkg/quota/evaluator/core/persistent_volume_claims.go index 9032dcaf7b..4547f370d5 100644 --- a/pkg/quota/evaluator/core/persistent_volume_claims.go +++ b/pkg/quota/evaluator/core/persistent_volume_claims.go @@ -42,7 +42,7 @@ import ( var pvcObjectCountName = generic.ObjectCountQuotaResourceNameFor(v1.SchemeGroupVersion.WithResource("persistentvolumeclaims").GroupResource()) // pvcResources are the set of static resources managed by quota associated with pvcs. -// for each resouce in this list, it may be refined dynamically based on storage class. +// for each resource in this list, it may be refined dynamically based on storage class. var pvcResources = []api.ResourceName{ api.ResourcePersistentVolumeClaims, api.ResourceRequestsStorage, diff --git a/pkg/quota/generic/evaluator.go b/pkg/quota/generic/evaluator.go index 5bcb1cb20f..6324ce5dde 100644 --- a/pkg/quota/generic/evaluator.go +++ b/pkg/quota/generic/evaluator.go @@ -200,7 +200,7 @@ func (o *objectCountEvaluator) UsageStats(options quota.UsageStatsOptions) (quot var _ quota.Evaluator = &objectCountEvaluator{} // NewObjectCountEvaluator returns an evaluator that can perform generic -// object quota counting. It allows an optional alias for backwards compatibilty +// object quota counting. It allows an optional alias for backwards compatibility // purposes for the legacy object counting names in quota. Unless its supporting // backward compatibility, alias should not be used. func NewObjectCountEvaluator( diff --git a/pkg/quota/resources.go b/pkg/quota/resources.go index a7642806a1..a40a81a64c 100644 --- a/pkg/quota/resources.go +++ b/pkg/quota/resources.go @@ -126,7 +126,7 @@ func Add(a api.ResourceList, b api.ResourceList) api.ResourceList { return result } -// SubtractWithNonNegativeResult - substracts and returns result of a - b but +// SubtractWithNonNegativeResult - subtracts and returns result of a - b but // makes sure we don't return negative values to prevent negative resource usage. func SubtractWithNonNegativeResult(a api.ResourceList, b api.ResourceList) api.ResourceList { zero := resource.MustParse("0") diff --git a/pkg/registry/apps/deployment/storage/storage_test.go b/pkg/registry/apps/deployment/storage/storage_test.go index c7e348fc7b..553936fdeb 100644 --- a/pkg/registry/apps/deployment/storage/storage_test.go +++ b/pkg/registry/apps/deployment/storage/storage_test.go @@ -190,7 +190,7 @@ func TestWatch(t *testing.T) { []fields.Set{ {"metadata.name": name}, }, - // not matchin fields + // not matching fields []fields.Set{ {"metadata.name": "bar"}, {"name": name}, diff --git a/pkg/registry/apps/replicaset/storage/storage_test.go b/pkg/registry/apps/replicaset/storage/storage_test.go index 31191c5f45..670cede929 100644 --- a/pkg/registry/apps/replicaset/storage/storage_test.go +++ b/pkg/registry/apps/replicaset/storage/storage_test.go @@ -238,7 +238,7 @@ func TestWatch(t *testing.T) { {"metadata.name": "foo"}, {"status.replicas": "5", "metadata.name": "foo"}, }, - // not matchin fields + // not matching fields []fields.Set{ {"status.replicas": "10"}, {"metadata.name": "bar"}, diff --git a/pkg/registry/core/node/storage/storage_test.go b/pkg/registry/core/node/storage/storage_test.go index 1c0603d357..ebb7c8b3e9 100644 --- a/pkg/registry/core/node/storage/storage_test.go +++ b/pkg/registry/core/node/storage/storage_test.go @@ -145,7 +145,7 @@ func TestWatch(t *testing.T) { []fields.Set{ {"metadata.name": "foo"}, }, - // not matchin fields + // not matching fields []fields.Set{ {"metadata.name": "bar"}, }, diff --git a/pkg/registry/core/pod/storage/eviction.go b/pkg/registry/core/pod/storage/eviction.go index ff03d96dd5..e98a93211a 100644 --- a/pkg/registry/core/pod/storage/eviction.go +++ b/pkg/registry/core/pod/storage/eviction.go @@ -125,7 +125,7 @@ func (r *EvictionREST) Create(ctx genericapirequest.Context, obj runtime.Object, return rtStatus, nil } - // At this point there was either no PDB or we succeded in decrementing + // At this point there was either no PDB or we succeeded in decrementing // Try the delete _, _, err = r.store.Delete(ctx, eviction.Name, eviction.DeleteOptions) diff --git a/pkg/registry/core/pod/storage/storage_test.go b/pkg/registry/core/pod/storage/storage_test.go index f98f09adfa..f25e682cb7 100644 --- a/pkg/registry/core/pod/storage/storage_test.go +++ b/pkg/registry/core/pod/storage/storage_test.go @@ -396,7 +396,7 @@ func TestWatch(t *testing.T) { []fields.Set{ {"metadata.name": "foo"}, }, - // not matchin fields + // not matching fields []fields.Set{ {"metadata.name": "bar"}, }, diff --git a/pkg/registry/core/replicationcontroller/storage/storage_test.go b/pkg/registry/core/replicationcontroller/storage/storage_test.go index 04a846f821..2ffb6446a9 100644 --- a/pkg/registry/core/replicationcontroller/storage/storage_test.go +++ b/pkg/registry/core/replicationcontroller/storage/storage_test.go @@ -241,7 +241,7 @@ func TestWatch(t *testing.T) { {"metadata.name": "foo"}, {"status.replicas": "0", "metadata.name": "foo"}, }, - // not matchin fields + // not matching fields []fields.Set{ {"status.replicas": "10"}, {"metadata.name": "bar"}, diff --git a/pkg/registry/core/resourcequota/storage/storage_test.go b/pkg/registry/core/resourcequota/storage/storage_test.go index a05cba92fd..413cae0995 100644 --- a/pkg/registry/core/resourcequota/storage/storage_test.go +++ b/pkg/registry/core/resourcequota/storage/storage_test.go @@ -147,7 +147,7 @@ func TestWatch(t *testing.T) { []fields.Set{ {"metadata.name": "foo"}, }, - // not matchin fields + // not matching fields []fields.Set{ {"metadata.name": "bar"}, }, diff --git a/pkg/registry/core/service/storage/storage_test.go b/pkg/registry/core/service/storage/storage_test.go index 5cfe71d7cc..3964dad136 100644 --- a/pkg/registry/core/service/storage/storage_test.go +++ b/pkg/registry/core/service/storage/storage_test.go @@ -162,7 +162,7 @@ func TestWatch(t *testing.T) { []fields.Set{ {"metadata.name": "foo"}, }, - // not matchin fields + // not matching fields []fields.Set{ {"metadata.name": "bar"}, }, diff --git a/pkg/registry/rbac/rest/storage_rbac.go b/pkg/registry/rbac/rest/storage_rbac.go index b029233999..0670c8d4d1 100644 --- a/pkg/registry/rbac/rest/storage_rbac.go +++ b/pkg/registry/rbac/rest/storage_rbac.go @@ -291,7 +291,7 @@ func (p *PolicyData) EnsureRBACPolicy() genericapiserver.PostStartHookFunc { return true, nil }) - // if we're never able to make it through intialization, kill the API server + // if we're never able to make it through initialization, kill the API server if err != nil { return fmt.Errorf("unable to initialize roles: %v", err) } diff --git a/pkg/scheduler/algorithm/predicates/predicates.go b/pkg/scheduler/algorithm/predicates/predicates.go index 7dd38cea93..e4fbbcfdf8 100644 --- a/pkg/scheduler/algorithm/predicates/predicates.go +++ b/pkg/scheduler/algorithm/predicates/predicates.go @@ -383,7 +383,7 @@ func (c *MaxPDVolumeCountChecker) filterVolumes(volumes []v1.Volume, namespace s pvName := pvc.Spec.VolumeName if pvName == "" { // PVC is not bound. It was either deleted and created again or - // it was forcefuly unbound by admin. The pod can still use the + // it was forcefully unbound by admin. The pod can still use the // original PV where it was bound to -> log the error and count // the PV towards the PV limit glog.V(4).Infof("PVC %s/%s is not bound, assuming PVC matches predicate when counting limits", namespace, pvcName) diff --git a/pkg/scheduler/algorithm/priorities/resource_allocation.go b/pkg/scheduler/algorithm/priorities/resource_allocation.go index 25d820ee20..2d569b1d38 100644 --- a/pkg/scheduler/algorithm/priorities/resource_allocation.go +++ b/pkg/scheduler/algorithm/priorities/resource_allocation.go @@ -48,7 +48,7 @@ func (r *ResourceAllocationPriority) PriorityMap( if priorityMeta, ok := meta.(*priorityMetadata); ok { requested = *priorityMeta.nonZeroRequest } else { - // We couldn't parse metadatat - fallback to computing it. + // We couldn't parse metadata - fallback to computing it. requested = *getNonZeroRequests(pod) } diff --git a/pkg/scheduler/algorithm/priorities/selector_spreading_test.go b/pkg/scheduler/algorithm/priorities/selector_spreading_test.go index e6eff8cc27..5abd1736ac 100644 --- a/pkg/scheduler/algorithm/priorities/selector_spreading_test.go +++ b/pkg/scheduler/algorithm/priorities/selector_spreading_test.go @@ -807,7 +807,7 @@ func TestGetNodeClassificationByLabels(t *testing.T) { t.Errorf("Expected only labeled node with label zoneA and no noNonLabeledNodes") } if len(noLabeledNodes) != 0 && newnonLabeledNodes[0] != machine02 { - t.Errorf("Expected only non labled nodes") + t.Errorf("Expected only non labelled nodes") } } diff --git a/pkg/scheduler/factory/factory_test.go b/pkg/scheduler/factory/factory_test.go index 195fdebd38..ca7ba5b5e7 100644 --- a/pkg/scheduler/factory/factory_test.go +++ b/pkg/scheduler/factory/factory_test.go @@ -284,7 +284,7 @@ func TestDefaultErrorFunc(t *testing.T) { } mux := http.NewServeMux() - // FakeHandler musn't be sent requests other than the one you want to test. + // FakeHandler mustn't be sent requests other than the one you want to test. mux.Handle(util.Test.ResourcePath(string(v1.ResourcePods), "bar", "foo"), &handler) server := httptest.NewServer(mux) defer server.Close() diff --git a/pkg/security/podsecuritypolicy/group/mustrunas_test.go b/pkg/security/podsecuritypolicy/group/mustrunas_test.go index c0347672e6..462344cdd1 100644 --- a/pkg/security/podsecuritypolicy/group/mustrunas_test.go +++ b/pkg/security/podsecuritypolicy/group/mustrunas_test.go @@ -136,14 +136,14 @@ func TestValidate(t *testing.T) { }, pass: true, }, - "in range boundry min": { + "in range boundary min": { groups: []int64{1}, ranges: []extensions.GroupIDRange{ {Min: 1, Max: 3}, }, pass: true, }, - "in range boundry max": { + "in range boundary max": { groups: []int64{3}, ranges: []extensions.GroupIDRange{ {Min: 1, Max: 3}, diff --git a/pkg/security/podsecuritypolicy/provider_test.go b/pkg/security/podsecuritypolicy/provider_test.go index 5d05b19c41..0f90663c33 100644 --- a/pkg/security/podsecuritypolicy/provider_test.go +++ b/pkg/security/podsecuritypolicy/provider_test.go @@ -403,7 +403,7 @@ func allowFlexVolumesPSP(allowAllFlexVolumes, allowAllVolumes bool) *extensions. } func TestValidateContainerSecurityContextFailures(t *testing.T) { - // fail user strat + // fail user strategy failUserPSP := defaultPSP() uid := int64(999) badUID := int64(1) @@ -414,7 +414,7 @@ func TestValidateContainerSecurityContextFailures(t *testing.T) { failUserPod := defaultPod() failUserPod.Spec.Containers[0].SecurityContext.RunAsUser = &badUID - // fail selinux strat + // fail selinux strategy failSELinuxPSP := defaultPSP() failSELinuxPSP.Spec.SELinux = extensions.SELinuxStrategyOptions{ Rule: extensions.SELinuxStrategyMustRunAs, @@ -741,7 +741,7 @@ func TestValidatePodSecurityContextSuccess(t *testing.T) { } func TestValidateContainerSecurityContextSuccess(t *testing.T) { - // success user strat + // success user strategy userPSP := defaultPSP() uid := int64(999) userPSP.Spec.RunAsUser = extensions.RunAsUserStrategyOptions{ @@ -751,7 +751,7 @@ func TestValidateContainerSecurityContextSuccess(t *testing.T) { userPod := defaultPod() userPod.Spec.Containers[0].SecurityContext.RunAsUser = &uid - // success selinux strat + // success selinux strategy seLinuxPSP := defaultPSP() seLinuxPSP.Spec.SELinux = extensions.SELinuxStrategyOptions{ Rule: extensions.SELinuxStrategyMustRunAs, diff --git a/pkg/security/podsecuritypolicy/seccomp/strategy_test.go b/pkg/security/podsecuritypolicy/seccomp/strategy_test.go index c79602c225..d1f41c14c8 100644 --- a/pkg/security/podsecuritypolicy/seccomp/strategy_test.go +++ b/pkg/security/podsecuritypolicy/seccomp/strategy_test.go @@ -83,8 +83,8 @@ func TestNewStrategy(t *testing.T) { }, } for k, v := range tests { - strat := NewStrategy(v.annotations) - internalStrat, _ := strat.(*strategy) + s := NewStrategy(v.annotations) + internalStrat, _ := s.(*strategy) if internalStrat.allowAnyProfile != v.expectedAllowAny { t.Errorf("%s expected allowAnyProfile to be %t but found %t", k, v.expectedAllowAny, internalStrat.allowAnyProfile) @@ -145,8 +145,8 @@ func TestGenerate(t *testing.T) { }, } for k, v := range tests { - strat := NewStrategy(v.pspAnnotations) - actual, err := strat.Generate(v.podAnnotations, nil) + s := NewStrategy(v.pspAnnotations) + actual, err := s.Generate(v.podAnnotations, nil) if err != nil { t.Errorf("%s received error during generation %#v", k, err) continue @@ -213,8 +213,8 @@ func TestValidatePod(t *testing.T) { Annotations: v.podAnnotations, }, } - strat := NewStrategy(v.pspAnnotations) - errs := strat.ValidatePod(pod) + s := NewStrategy(v.pspAnnotations) + errs := s.ValidatePod(pod) if v.expectedError == "" && len(errs) != 0 { t.Errorf("%s expected no errors but received %#v", k, errs.ToAggregate().Error()) } @@ -304,8 +304,8 @@ func TestValidateContainer(t *testing.T) { Name: "container", } - strat := NewStrategy(v.pspAnnotations) - errs := strat.ValidateContainer(pod, container) + s := NewStrategy(v.pspAnnotations) + errs := s.ValidateContainer(pod, container) if v.expectedError == "" && len(errs) != 0 { t.Errorf("%s expected no errors but received %#v", k, errs.ToAggregate().Error()) } diff --git a/pkg/security/podsecuritypolicy/util/util_test.go b/pkg/security/podsecuritypolicy/util/util_test.go index bb492b7431..12e0970d75 100644 --- a/pkg/security/podsecuritypolicy/util/util_test.go +++ b/pkg/security/podsecuritypolicy/util/util_test.go @@ -41,7 +41,7 @@ func TestVolumeSourceFSTypeDrift(t *testing.T) { fsType, err := GetVolumeFSType(api.Volume{VolumeSource: volumeSource}) if err != nil { - t.Errorf("error getting fstype for field %s. This likely means that drift has occured between FSType and VolumeSource. Please update the api and getVolumeFSType", fieldVal.Name) + t.Errorf("error getting fstype for field %s. This likely means that drift has occurred between FSType and VolumeSource. Please update the api and getVolumeFSType", fieldVal.Name) } if !allFSTypes.Has(string(fsType)) { diff --git a/pkg/util/async/bounded_frequency_runner.go b/pkg/util/async/bounded_frequency_runner.go index da6fc2a4f8..f03a7ec2d5 100644 --- a/pkg/util/async/bounded_frequency_runner.go +++ b/pkg/util/async/bounded_frequency_runner.go @@ -109,7 +109,7 @@ var _ timer = realTimer{} // multiple runs are serialized. If the function needs to hold locks, it must // take them internally. // -// Runs of the funtion will have at least minInterval between them (from +// Runs of the function will have at least minInterval between them (from // completion to next start), except that up to bursts may be allowed. Burst // runs are "accumulated" over time, one per minInterval up to burstRuns total. // This can be used, for example, to mitigate the impact of expensive operations diff --git a/pkg/util/file/file_test.go b/pkg/util/file/file_test.go index 21bf495218..43eb2ed1d1 100644 --- a/pkg/util/file/file_test.go +++ b/pkg/util/file/file_test.go @@ -70,7 +70,7 @@ func TestFileUtils(t *testing.T) { t.Fatal("Failed to test: failed to change work dir.") } - // recover test enviroment + // recover test environment defer RecoverEnv(currentDir, tmpDir) t.Run("TestFileExists", func(t *testing.T) { diff --git a/pkg/util/iptables/testing/fake.go b/pkg/util/iptables/testing/fake.go index 6f398597f7..3a69efa675 100644 --- a/pkg/util/iptables/testing/fake.go +++ b/pkg/util/iptables/testing/fake.go @@ -97,8 +97,8 @@ func (*FakeIPTables) AddReloadFunc(reloadFunc func()) {} func (*FakeIPTables) Destroy() {} -func getToken(line, seperator string) string { - tokens := strings.Split(line, seperator) +func getToken(line, separator string) string { + tokens := strings.Split(line, separator) if len(tokens) == 2 { return strings.Split(tokens[1], " ")[0] } diff --git a/pkg/util/ipvs/testing/fake_test.go b/pkg/util/ipvs/testing/fake_test.go index a38d40840e..c66e8930f2 100644 --- a/pkg/util/ipvs/testing/fake_test.go +++ b/pkg/util/ipvs/testing/fake_test.go @@ -35,12 +35,12 @@ func TestVirtualServer(t *testing.T) { } err := fake.AddVirtualServer(vs1) if err != nil { - t.Errorf("Fail to add virutal server, error: %v", err) + t.Errorf("Fail to add virtual server, error: %v", err) } // Get a specific virtual server got1, err := fake.GetVirtualServer(vs1) if err != nil { - t.Errorf("Fail to get virutal server, error: %v", err) + t.Errorf("Fail to get virtual server, error: %v", err) } if !vs1.Equal(got1) { t.Errorf("Expect virtual server: %v, got: %v", vs1, got1) @@ -54,12 +54,12 @@ func TestVirtualServer(t *testing.T) { } err = fake.UpdateVirtualServer(vs12) if err != nil { - t.Errorf("Fail to update virutal server, error: %v", err) + t.Errorf("Fail to update virtual server, error: %v", err) } // Check the updated virtual server got12, err := fake.GetVirtualServer(vs1) if !got12.Equal(vs12) { - t.Errorf("Expect virutal server: %v, got: %v", vs12, got12) + t.Errorf("Expect virtual server: %v, got: %v", vs12, got12) } // Add another virtual server vs2 := &utilipvs.VirtualServer{ @@ -69,20 +69,20 @@ func TestVirtualServer(t *testing.T) { } err = fake.AddVirtualServer(vs2) if err != nil { - t.Errorf("Unexpected error when add virutal server, error: %v", err) + t.Errorf("Unexpected error when add virtual server, error: %v", err) } // List all virtual servers list, err := fake.GetVirtualServers() if err != nil { - t.Errorf("Fail to list virutal servers, error: %v", err) + t.Errorf("Fail to list virtual servers, error: %v", err) } if len(list) != 2 { - t.Errorf("Expect 2 virutal servers, got: %d", len(list)) + t.Errorf("Expect 2 virtual servers, got: %d", len(list)) } // Delete a virtual server err = fake.DeleteVirtualServer(vs1) if err != nil { - t.Errorf("Fail to delete virutal server: %v, error: %v", vs1, err) + t.Errorf("Fail to delete virtual server: %v, error: %v", vs1, err) } // Check the deleted virtual server no longer exists got, _ := fake.GetVirtualServer(vs1) @@ -92,15 +92,15 @@ func TestVirtualServer(t *testing.T) { // Flush all virtual servers err = fake.Flush() if err != nil { - t.Errorf("Fail to flush virutal servers, error: %v", err) + t.Errorf("Fail to flush virtual servers, error: %v", err) } // List all virtual servers list, err = fake.GetVirtualServers() if err != nil { - t.Errorf("Fail to list virutal servers, error: %v", err) + t.Errorf("Fail to list virtual servers, error: %v", err) } if len(list) != 0 { - t.Errorf("Expect 0 virutal servers, got: %d", len(list)) + t.Errorf("Expect 0 virtual servers, got: %d", len(list)) } } @@ -120,7 +120,7 @@ func TestRealServer(t *testing.T) { } err := fake.AddVirtualServer(vs) if err != nil { - t.Errorf("Fail to add virutal server, error: %v", err) + t.Errorf("Fail to add virtual server, error: %v", err) } // Add real server to the virtual server for i := range rss { @@ -138,7 +138,7 @@ func TestRealServer(t *testing.T) { t.Errorf("Fail to get real servers of the virtual server, error: %v", err) } if len(list) != rssLen { - t.Errorf("Expect %d virutal servers, got: %d", len(rss), len(list)) + t.Errorf("Expect %d virtual servers, got: %d", len(rss), len(list)) } rsToDel := list[i] if err = fake.DeleteRealServer(vs, rsToDel); err != nil { diff --git a/pkg/util/mount/exec_mount.go b/pkg/util/mount/exec_mount.go index 1dedc5b7ae..b12a2be38a 100644 --- a/pkg/util/mount/exec_mount.go +++ b/pkg/util/mount/exec_mount.go @@ -56,7 +56,7 @@ func (m *execMounter) Mount(source string, target string, fstype string, options return m.doExecMount(source, target, fstype, options) } -// doExecMount calls exec(mount ) using given exec interface. +// doExecMount calls exec(mount ) using given exec interface. func (m *execMounter) doExecMount(source, target, fstype string, options []string) error { glog.V(5).Infof("Exec Mounting %s %s %s %v", source, target, fstype, options) mountArgs := makeMountArgs(source, target, fstype, options) diff --git a/pkg/util/mount/mount.go b/pkg/util/mount/mount.go index a531fc9dbd..0f9bac03fb 100644 --- a/pkg/util/mount/mount.go +++ b/pkg/util/mount/mount.go @@ -260,7 +260,7 @@ func isBind(options []string) (bool, []string) { // TODO: this is a workaround for the unmount device issue caused by gci mounter. // In GCI cluster, if gci mounter is used for mounting, the container started by mounter // script will cause additional mounts created in the container. Since these mounts are -// irrelavant to the original mounts, they should be not considered when checking the +// irrelevant to the original mounts, they should be not considered when checking the // mount references. Current solution is to filter out those mount paths that contain // the string of original mount path. // Plan to work on better approach to solve this issue. diff --git a/pkg/util/mount/mount_linux.go b/pkg/util/mount/mount_linux.go index c7a2f3d856..9bf64ada3e 100644 --- a/pkg/util/mount/mount_linux.go +++ b/pkg/util/mount/mount_linux.go @@ -70,7 +70,7 @@ func New(mounterPath string) Interface { } // Mount mounts source to target as fstype with given options. 'source' and 'fstype' must -// be an emtpy string in case it's not required, e.g. for remount, or for auto filesystem +// be an empty string in case it's not required, e.g. for remount, or for auto filesystem // type, where kernel handles fstype for you. The mount 'options' is a list of options, // currently come from mount(8), e.g. "ro", "remount", "bind", etc. If no more option is // required, call Mount with an empty string list or nil. @@ -314,7 +314,7 @@ func exclusiveOpenFailsOnDevice(pathname string) (bool, error) { } if !isDevice { - glog.Errorf("Path %q is not refering to a device.", pathname) + glog.Errorf("Path %q is not referring to a device.", pathname) return false, nil } fd, errno := unix.Open(pathname, unix.O_RDONLY|unix.O_EXCL, 0) diff --git a/pkg/volume/azure_dd/attacher.go b/pkg/volume/azure_dd/attacher.go index e1eff7feae..f4f9e5d4e9 100644 --- a/pkg/volume/azure_dd/attacher.go +++ b/pkg/volume/azure_dd/attacher.go @@ -181,7 +181,7 @@ func (a *azureDiskAttacher) WaitForAttach(spec *volume.Spec, devicePath string, // did we find it? if newDevicePath != "" { - // the curent sequence k8s uses for unformated disk (check-disk, mount, fail, mkfs.extX) hangs on + // the current sequence k8s uses for unformated disk (check-disk, mount, fail, mkfs.extX) hangs on // Azure Managed disk scsi interface. this is a hack and will be replaced once we identify and solve // the root case on Azure. formatIfNotFormatted(newDevicePath, *volumeSource.FSType, exec) diff --git a/pkg/volume/azure_dd/azure_dd.go b/pkg/volume/azure_dd/azure_dd.go index 09e4cdb635..c0b51a23d6 100644 --- a/pkg/volume/azure_dd/azure_dd.go +++ b/pkg/volume/azure_dd/azure_dd.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/volume" ) -// interface exposed by the cloud provider implementing Disk functionlity +// interface exposed by the cloud provider implementing Disk functionality type DiskController interface { CreateBlobDisk(dataDiskName string, storageAccountType storage.SkuName, sizeGB int) (string, error) DeleteBlobDisk(diskUri string) error diff --git a/pkg/volume/csi/csi_attacher.go b/pkg/volume/csi/csi_attacher.go index 3a79846a55..3460ce0d7e 100644 --- a/pkg/volume/csi/csi_attacher.go +++ b/pkg/volume/csi/csi_attacher.go @@ -92,7 +92,7 @@ func (c *csiAttacher) Attach(spec *volume.Spec, nodeName types.NodeName) (string // probe for attachment update here // NOTE: any error from waiting for attachment is logged only. This is because - // the primariy intent of the enclosing method is to create VolumeAttachment. + // the primary intent of the enclosing method is to create VolumeAttachment. // DONOT return that error here as it is mitigated in attacher.WaitForAttach. volAttachmentOK := true if _, err := c.waitForVolumeAttachment(csiSource.VolumeHandle, attachID, csiTimeout); err != nil { @@ -244,7 +244,7 @@ func (c *csiAttacher) Detach(volumeName string, nodeName types.NodeName) error { // volumeName in format driverNamevolumeHandle generated by plugin.GetVolumeName() if volumeName == "" { glog.Error(log("detacher.Detach missing value for parameter volumeName")) - return errors.New("missing exepected parameter volumeName") + return errors.New("missing expected parameter volumeName") } parts := strings.Split(volumeName, volNameSep) if len(parts) != 2 { diff --git a/pkg/volume/csi/csi_mounter.go b/pkg/volume/csi/csi_mounter.go index 7874b86ebd..693a011f79 100644 --- a/pkg/volume/csi/csi_mounter.go +++ b/pkg/volume/csi/csi_mounter.go @@ -152,7 +152,7 @@ func (c *csiMountMgr) SetUpAt(dir string, fsGroup *int64) error { } // get volume attributes - // TODO: for alpha vol atttributes are passed via PV.Annotations + // TODO: for alpha vol attributes are passed via PV.Annotations // Beta will fix that attribs, err := getVolAttribsFromSpec(c.spec) if err != nil { @@ -247,7 +247,7 @@ func (c *csiMountMgr) TearDownAt(dir string) error { } if !mounted { - glog.V(4).Info(log("unmounter.Teardown skipping unmout, dir not mounted [%s]", dir)) + glog.V(4).Info(log("unmounter.Teardown skipping unmount, dir not mounted [%s]", dir)) return nil } @@ -295,7 +295,7 @@ func (c *csiMountMgr) TearDownAt(dir string) error { return nil } -// getVolAttribsFromSpec exracts CSI VolumeAttributes information from PV.Annotations +// getVolAttribsFromSpec extracts CSI VolumeAttributes information from PV.Annotations // using key csi.kubernetes.io/volume-attributes. The annotation value is expected // to be a JSON-encoded object of form {"key0":"val0",...,"keyN":"valN"} func getVolAttribsFromSpec(spec *volume.Spec) (map[string]string, error) { @@ -318,7 +318,7 @@ func getVolAttribsFromSpec(spec *volume.Spec) (map[string]string, error) { return attribs, nil } -// saveVolumeData persists parameter data as json file using the locagion +// saveVolumeData persists parameter data as json file using the location // generated by /var/lib/kubelet/pods//volumes/kubernetes.io~csi//volume_data.json func saveVolumeData(p *csiPlugin, podUID types.UID, specVolID string, data map[string]string) error { dir := getTargetPath(podUID, specVolID, p.host) diff --git a/pkg/volume/csi/fake/fake_client.go b/pkg/volume/csi/fake/fake_client.go index d96ed620db..80a9023f47 100644 --- a/pkg/volume/csi/fake/fake_client.go +++ b/pkg/volume/csi/fake/fake_client.go @@ -103,7 +103,7 @@ func (f *NodeClient) NodePublishVolume(ctx grpctx.Context, req *csipb.NodePublis fsTypes := "ext4|xfs|zfs" fsType := req.GetVolumeCapability().GetMount().GetFsType() if !strings.Contains(fsTypes, fsType) { - return nil, errors.New("invlid fstype") + return nil, errors.New("invalid fstype") } f.nodePublishedVolumes[req.GetVolumeId()] = req.GetTargetPath() return &csipb.NodePublishVolumeResponse{}, nil diff --git a/pkg/volume/fc/fc.go b/pkg/volume/fc/fc.go index 9e140c7406..ebd3e4d125 100644 --- a/pkg/volume/fc/fc.go +++ b/pkg/volume/fc/fc.go @@ -289,7 +289,7 @@ func (plugin *fcPlugin) ConstructVolumeSpec(volumeName, mountPath string) (*volu } // ConstructBlockVolumeSpec creates a new volume.Spec with following steps. -// - Searchs a file whose name is {pod uuid} under volume plugin directory. +// - Searches a file whose name is {pod uuid} under volume plugin directory. // - If a file is found, then retreives volumePluginDependentPath from globalMapPathUUID. // - Once volumePluginDependentPath is obtained, store volume information to VolumeSource // examples: @@ -304,13 +304,13 @@ func (plugin *fcPlugin) ConstructBlockVolumeSpec(podUID types.UID, volumeName, m } glog.V(5).Infof("globalMapPathUUID: %v, err: %v", globalMapPathUUID, err) - // Retreive volumePluginDependentPath from globalMapPathUUID + // Retrieve volumePluginDependentPath from globalMapPathUUID // globalMapPathUUID examples: // wwn+lun: plugins/kubernetes.io/fc/volumeDevices/50060e801049cfd1-lun-0/{pod uuid} // wwid: plugins/kubernetes.io/fc/volumeDevices/3600508b400105e210000900000490000/{pod uuid} arr := strings.Split(globalMapPathUUID, "/") if len(arr) < 2 { - return nil, fmt.Errorf("Fail to retreive volume plugin information from globalMapPathUUID: %v", globalMapPathUUID) + return nil, fmt.Errorf("Fail to retrieve volume plugin information from globalMapPathUUID: %v", globalMapPathUUID) } l := len(arr) - 2 volumeInfo := arr[l] diff --git a/pkg/volume/fc/fc_util.go b/pkg/volume/fc/fc_util.go index 3eff48ee52..ba889551c7 100644 --- a/pkg/volume/fc/fc_util.go +++ b/pkg/volume/fc/fc_util.go @@ -301,9 +301,9 @@ func (util *FCUtil) DetachBlockFCDisk(c fcDiskUnmapper, mapPath, devicePath stri return pathErr } } else { - // TODO: FC plugin can't obtain the devicePath from kubelet becuase devicePath + // TODO: FC plugin can't obtain the devicePath from kubelet because devicePath // in volume object isn't updated when volume is attached to kubelet node. - glog.Infof("fc: devicePath is empty. Try to retreive FC configuration from global map path: %v", mapPath) + glog.Infof("fc: devicePath is empty. Try to retrieve FC configuration from global map path: %v", mapPath) } // Check if global map path is valid @@ -314,10 +314,10 @@ func (util *FCUtil) DetachBlockFCDisk(c fcDiskUnmapper, mapPath, devicePath stri return pathErr } - // Retreive volume plugin dependent path like '50060e801049cfd1-lun-0' from global map path + // Retrieve volume plugin dependent path like '50060e801049cfd1-lun-0' from global map path arr := strings.Split(mapPath, "/") if len(arr) < 1 { - return fmt.Errorf("Fail to retreive volume plugin information from global map path: %v", mapPath) + return fmt.Errorf("Fail to retrieve volume plugin information from global map path: %v", mapPath) } volumeInfo := arr[len(arr)-1] diff --git a/pkg/volume/flocker/flocker_test.go b/pkg/volume/flocker/flocker_test.go index 78930d8945..fee6f06983 100644 --- a/pkg/volume/flocker/flocker_test.go +++ b/pkg/volume/flocker/flocker_test.go @@ -338,7 +338,7 @@ func (m mockFlockerClient) UpdatePrimaryForDataset(primaryUUID, datasetID string } /* -TODO: reenable after refactor +TODO: re-enable after refactor func TestSetUpAtInternal(t *testing.T) { const dir = "dir" mockPath := "expected-to-be-set-properly" // package var diff --git a/pkg/volume/gce_pd/attacher.go b/pkg/volume/gce_pd/attacher.go index 6ee1fd6d23..1a28d5adee 100644 --- a/pkg/volume/gce_pd/attacher.go +++ b/pkg/volume/gce_pd/attacher.go @@ -103,7 +103,7 @@ func (attacher *gcePersistentDiskAttacher) VolumesAreAttached(specs []*volume.Sp pdNameList := []string{} for _, spec := range specs { volumeSource, _, err := getVolumeSource(spec) - // If error is occured, skip this volume and move to the next one + // If error is occurred, skip this volume and move to the next one if err != nil { glog.Errorf("Error getting volume (%q) source : %v", spec.Name(), err) continue diff --git a/pkg/volume/iscsi/iscsi.go b/pkg/volume/iscsi/iscsi.go index 58313353d5..ac644af2e6 100644 --- a/pkg/volume/iscsi/iscsi.go +++ b/pkg/volume/iscsi/iscsi.go @@ -241,7 +241,7 @@ func (plugin *iscsiPlugin) ConstructBlockVolumeSpec(podUID types.UID, volumeName return nil, err } glog.V(5).Infof("globalMapPathUUID: %v, err: %v", globalMapPathUUID, err) - // Retreive volume information from globalMapPathUUID + // Retrieve volume information from globalMapPathUUID // globalMapPathUUID example: // plugins/kubernetes.io/{PluginName}/{DefaultKubeletVolumeDevicesDirName}/{volumePluginDependentPath}/{pod uuid} // plugins/kubernetes.io/iscsi/volumeDevices/iface-default/192.168.0.10:3260-iqn.2017-05.com.example:test-lun-0/{pod uuid} @@ -598,7 +598,7 @@ func createPersistentVolumeFromISCSIPVSource(volumeName string, iscsi v1.ISCSIPe } func getVolumeSpecFromGlobalMapPath(volumeName, globalMapPath string) (*volume.Spec, error) { - // Retreive volume spec information from globalMapPath + // Retrieve volume spec information from globalMapPath // globalMapPath example: // plugins/kubernetes.io/{PluginName}/{DefaultKubeletVolumeDevicesDirName}/{volumePluginDependentPath} // plugins/kubernetes.io/iscsi/volumeDevices/iface-default/192.168.0.10:3260-iqn.2017-05.com.example:test-lun-0 @@ -614,7 +614,7 @@ func getVolumeSpecFromGlobalMapPath(volumeName, globalMapPath string) (*volume.S } arr := strings.Split(device, "-lun-") if len(arr) < 2 { - return nil, fmt.Errorf("failed to retreive lun from globalMapPath: %v", globalMapPath) + return nil, fmt.Errorf("failed to retrieve lun from globalMapPath: %v", globalMapPath) } lun, err := strconv.Atoi(arr[1]) if err != nil { @@ -622,7 +622,7 @@ func getVolumeSpecFromGlobalMapPath(volumeName, globalMapPath string) (*volume.S } iface, found := extractIface(globalMapPath) if !found { - return nil, fmt.Errorf("failed to retreive iface from globalMapPath: %v", globalMapPath) + return nil, fmt.Errorf("failed to retrieve iface from globalMapPath: %v", globalMapPath) } iscsiPV := createPersistentVolumeFromISCSIPVSource(volumeName, v1.ISCSIPersistentVolumeSource{ diff --git a/pkg/volume/iscsi/iscsi_test.go b/pkg/volume/iscsi/iscsi_test.go index f3759fb0ec..330d925257 100644 --- a/pkg/volume/iscsi/iscsi_test.go +++ b/pkg/volume/iscsi/iscsi_test.go @@ -554,7 +554,7 @@ func TestGetVolumeSpec_no_lun(t *testing.T) { func TestGetVolumeSpec_no_iface(t *testing.T) { path := "plugins/kubernetes.io/iscsi/volumeDevices/default/127.0.0.1:3260-iqn.2014-12.server:storage.target01-lun-0" _, err := getVolumeSpecFromGlobalMapPath("test", path) - if !strings.Contains(err.Error(), "failed to retreive iface") { - t.Errorf("should get error: failed to retreive iface") + if !strings.Contains(err.Error(), "failed to retrieve iface") { + t.Errorf("should get error: failed to retrieve iface") } } diff --git a/pkg/volume/iscsi/iscsi_util.go b/pkg/volume/iscsi/iscsi_util.go index 149e972986..89b84789f3 100644 --- a/pkg/volume/iscsi/iscsi_util.go +++ b/pkg/volume/iscsi/iscsi_util.go @@ -340,8 +340,8 @@ func (util *ISCSIUtil) AttachDisk(b iscsiDiskMounter) (string, error) { // globalPDPathOperation returns global mount path related operations based on volumeMode. // If the volumeMode is 'Filesystem' or not defined, plugin needs to create a dir, persist -// iscsi configrations, and then format/mount the volume. -// If the volumeMode is 'Block', plugin creates a dir and persists iscsi configrations. +// iscsi configurations, and then format/mount the volume. +// If the volumeMode is 'Block', plugin creates a dir and persists iscsi configurations. // Since volume type is block, plugin doesn't need to format/mount the volume. func globalPDPathOperation(b iscsiDiskMounter) func(iscsiDiskMounter, string, *ISCSIUtil) (string, error) { // TODO: remove feature gate check after no longer needed @@ -490,7 +490,7 @@ func (util *ISCSIUtil) DetachBlockISCSIDisk(c iscsiDiskUnmapper, mapPath string) } arr := strings.Split(device, "-lun-") if len(arr) < 2 { - return fmt.Errorf("failed to retreive lun from mapPath: %v", mapPath) + return fmt.Errorf("failed to retrieve lun from mapPath: %v", mapPath) } lun = arr[1] // Extract the iface from the mountPath and use it to log out. If the iface diff --git a/pkg/volume/rbd/rbd.go b/pkg/volume/rbd/rbd.go index 6f65a9cd98..9323e4bbd2 100644 --- a/pkg/volume/rbd/rbd.go +++ b/pkg/volume/rbd/rbd.go @@ -398,13 +398,13 @@ func (plugin *rbdPlugin) ConstructBlockVolumeSpec(podUID types.UID, volumeName, glog.V(5).Infof("globalMapPathUUID: %v, err: %v", globalMapPathUUID, err) globalMapPath := filepath.Dir(globalMapPathUUID) if len(globalMapPath) == 1 { - return nil, fmt.Errorf("failed to retreive volume plugin information from globalMapPathUUID: %v", globalMapPathUUID) + return nil, fmt.Errorf("failed to retrieve volume plugin information from globalMapPathUUID: %v", globalMapPathUUID) } return getVolumeSpecFromGlobalMapPath(globalMapPath) } func getVolumeSpecFromGlobalMapPath(globalMapPath string) (*volume.Spec, error) { - // Retreive volume spec information from globalMapPath + // Retrieve volume spec information from globalMapPath // globalMapPath example: // plugins/kubernetes.io/{PluginName}/{DefaultKubeletVolumeDevicesDirName}/{volumePluginDependentPath} pool, image, err := getPoolAndImageFromMapPath(globalMapPath) diff --git a/pkg/volume/scaleio/sio_client.go b/pkg/volume/scaleio/sio_client.go index 18b8ffb5b1..b64d034828 100644 --- a/pkg/volume/scaleio/sio_client.go +++ b/pkg/volume/scaleio/sio_client.go @@ -317,7 +317,7 @@ func (c *sioClient) IID() (string, error) { } // getGuid returns instance GUID, if not set using resource labels -// it attemps to fallback to using drv_cfg binary +// it attempts to fallback to using drv_cfg binary func (c *sioClient) getGuid() (string, error) { if c.sdcGuid == "" { glog.V(4).Info(log("sdc guid label not set, falling back to using drv_cfg")) diff --git a/pkg/volume/scaleio/sio_volume_test.go b/pkg/volume/scaleio/sio_volume_test.go index a72d74e515..bdc13045d9 100644 --- a/pkg/volume/scaleio/sio_volume_test.go +++ b/pkg/volume/scaleio/sio_volume_test.go @@ -384,7 +384,7 @@ func TestVolumeProvisioner(t *testing.T) { } sioVol.sioMgr.client = sio if err := deleter.Delete(); err != nil { - t.Fatalf("failed while deleteing vol: %v", err) + t.Fatalf("failed while deleting vol: %v", err) } path := deleter.GetPath() if _, err := os.Stat(path); err == nil { diff --git a/pkg/volume/util.go b/pkg/volume/util.go index 9945bd88b4..f268a50820 100644 --- a/pkg/volume/util.go +++ b/pkg/volume/util.go @@ -91,7 +91,7 @@ func internalRecycleVolumeByWatchingPodUntilCompletion(pvName string, pod *v1.Po if deleteErr != nil { return fmt.Errorf("failed to delete old recycler pod %s/%s: %s", pod.Namespace, pod.Name, deleteErr) } - // Recycler will try again and the old pod will be hopefuly deleted + // Recycler will try again and the old pod will be hopefully deleted // at that time. return fmt.Errorf("old recycler pod found, will retry later") } diff --git a/pkg/volume/util/util.go b/pkg/volume/util/util.go index bcb436e6f8..88b82f1f5f 100644 --- a/pkg/volume/util/util.go +++ b/pkg/volume/util/util.go @@ -321,7 +321,7 @@ type BlockVolumePathHandler interface { UnmapDevice(mapPath string, linkName string) error // RemovePath removes a file or directory on specified map path RemoveMapPath(mapPath string) error - // IsSymlinkExist retruns true if specified symbolic link exists + // IsSymlinkExist returns true if specified symbolic link exists IsSymlinkExist(mapPath string) (bool, error) // GetDeviceSymlinkRefs searches symbolic links under global map path GetDeviceSymlinkRefs(devPath string, mapPath string) ([]string, error) @@ -380,7 +380,7 @@ func (v VolumePathHandler) MapDevice(devicePath string, mapPath string, linkName } // Remove old symbolic link(or file) then create new one. // This should be done because current symbolic link is - // stale accross node reboot. + // stale across node reboot. linkPath := path.Join(mapPath, string(linkName)) if err = os.Remove(linkPath); err != nil && !os.IsNotExist(err) { return err diff --git a/pkg/volume/util/volumehelper/volumehelper.go b/pkg/volume/util/volumehelper/volumehelper.go index 74b14be5de..11ac87694c 100644 --- a/pkg/volume/util/volumehelper/volumehelper.go +++ b/pkg/volume/util/volumehelper/volumehelper.go @@ -115,7 +115,7 @@ func notRunning(statuses []v1.ContainerStatus) bool { } // SplitUniqueName splits the unique name to plugin name and volume name strings. It expects the uniqueName to follow -// the fromat plugin_name/volume_name and the plugin name must be namespaced as descibed by the plugin interface, +// the fromat plugin_name/volume_name and the plugin name must be namespaced as described by the plugin interface, // i.e. namespace/plugin containing exactly one '/'. This means the unique name will always be in the form of // plugin_namespace/plugin/volume_name, see k8s.io/kubernetes/pkg/volume/plugins.go VolumePlugin interface // description and pkg/volume/util/volumehelper/volumehelper.go GetUniqueVolumeNameFromSpec that constructs diff --git a/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go b/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go index 48febd8976..277df576a7 100644 --- a/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go +++ b/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go @@ -2252,7 +2252,7 @@ func TestPreferValidatedPSP(t *testing.T) { validatedPSPHint: "", expectedPSP: "001permissive", }, - "policy saved in annotations is prefered": { + "policy saved in annotations is preferred": { inPolicies: []*extensions.PodSecurityPolicy{ restrictivePSPWithName("001restrictive"), restrictivePSPWithName("002restrictive"), diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/controller_policy.go b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/controller_policy.go index 529c30d9e8..5087519e93 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/controller_policy.go +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/controller_policy.go @@ -265,7 +265,7 @@ func buildControllerRoles() ([]rbac.ClusterRole, []rbac.ClusterRoleBinding) { addControllerRole(&controllerRoles, &controllerRoleBindings, rbac.ClusterRole{ ObjectMeta: metav1.ObjectMeta{Name: saRolePrefix + "resourcequota-controller"}, Rules: []rbac.PolicyRule{ - // quota can count quota on anything for reconcilation, so it needs full viewing powers + // quota can count quota on anything for reconciliation, so it needs full viewing powers rbac.NewRule("list", "watch").Groups("*").Resources("*").RuleOrDie(), rbac.NewRule("update").Groups(legacyGroup).Resources("resourcequotas/status").RuleOrDie(), eventsRule(), diff --git a/staging/src/k8s.io/api/certificates/v1beta1/types.go b/staging/src/k8s.io/api/certificates/v1beta1/types.go index cc33043ee4..bb9e82d308 100644 --- a/staging/src/k8s.io/api/certificates/v1beta1/types.go +++ b/staging/src/k8s.io/api/certificates/v1beta1/types.go @@ -131,7 +131,7 @@ type KeyUsage string const ( UsageSigning KeyUsage = "signing" UsageDigitalSignature KeyUsage = "digital signature" - UsageContentCommittment KeyUsage = "content committment" + UsageContentCommittment KeyUsage = "content commitment" UsageKeyEncipherment KeyUsage = "key encipherment" UsageKeyAgreement KeyUsage = "key agreement" UsageDataEncipherment KeyUsage = "data encipherment" diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto index e5d8f74db6..5ce1bcbfd2 100644 --- a/staging/src/k8s.io/api/core/v1/generated.proto +++ b/staging/src/k8s.io/api/core/v1/generated.proto @@ -1124,12 +1124,12 @@ message EventList { } // EventSeries contain information on series of events, i.e. thing that was/is happening -// continously for some time. +// continuously for some time. message EventSeries { // Number of occurrences in this series up to the last heartbeat time optional int32 count = 1; - // Time of the last occurence observed + // Time of the last occurrence observed optional k8s.io.apimachinery.pkg.apis.meta.v1.MicroTime lastObservedTime = 2; // State of this Series: Ongoing or Finished diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index d1b464fd40..62ff5820d0 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -1901,7 +1901,7 @@ type SecretKeySelector struct { // EnvFromSource represents the source of a set of ConfigMaps type EnvFromSource struct { - // An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. + // An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. // +optional Prefix string `json:"prefix,omitempty" protobuf:"bytes,1,opt,name=prefix"` // The ConfigMap to select from @@ -4583,11 +4583,11 @@ type Event struct { } // EventSeries contain information on series of events, i.e. thing that was/is happening -// continously for some time. +// continuously for some time. type EventSeries struct { // Number of occurrences in this series up to the last heartbeat time Count int32 `json:"count,omitempty" protobuf:"varint,1,name=count"` - // Time of the last occurence observed + // Time of the last occurrence observed LastObservedTime metav1.MicroTime `json:"lastObservedTime,omitempty" protobuf:"bytes,2,name=lastObservedTime"` // State of this Series: Ongoing or Finished State EventSeriesState `json:"state,omitempty" protobuf:"bytes,3,name=state"` diff --git a/staging/src/k8s.io/api/events/v1beta1/generated.proto b/staging/src/k8s.io/api/events/v1beta1/generated.proto index 81be470f05..0637f780ae 100644 --- a/staging/src/k8s.io/api/events/v1beta1/generated.proto +++ b/staging/src/k8s.io/api/events/v1beta1/generated.proto @@ -108,7 +108,7 @@ message EventList { } // EventSeries contain information on series of events, i.e. thing that was/is happening -// continously for some time. +// continuously for some time. message EventSeries { // Number of occurrences in this series up to the last heartbeat time optional int32 count = 1; diff --git a/staging/src/k8s.io/api/events/v1beta1/types.go b/staging/src/k8s.io/api/events/v1beta1/types.go index 1b68bd743e..dc48ddb069 100644 --- a/staging/src/k8s.io/api/events/v1beta1/types.go +++ b/staging/src/k8s.io/api/events/v1beta1/types.go @@ -89,7 +89,7 @@ type Event struct { } // EventSeries contain information on series of events, i.e. thing that was/is happening -// continously for some time. +// continuously for some time. type EventSeries struct { // Number of occurrences in this series up to the last heartbeat time Count int32 `json:"count" protobuf:"varint,1,opt,name=count"` diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go index 56d147cd88..4a85546452 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go @@ -169,7 +169,7 @@ func ValidateCustomResourceDefinitionNames(names *apiextensions.CustomResourceDe return allErrs } -// specStandardValidator applies validations for different OpenAPI specfication versions. +// specStandardValidator applies validations for different OpenAPI specification versions. type specStandardValidator interface { validate(spec *apiextensions.JSONSchemaProps, fldPath *field.Path) field.ErrorList } diff --git a/staging/src/k8s.io/apimachinery/pkg/api/meta/restmapper_test.go b/staging/src/k8s.io/apimachinery/pkg/api/meta/restmapper_test.go index 292c4149ef..1b1c70d657 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/meta/restmapper_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/api/meta/restmapper_test.go @@ -507,7 +507,7 @@ func TestRESTMapperResourceSingularizer(t *testing.T) { {Kind: "lowercase", Plural: "lowercases", Singular: "lowercase"}, // TODO this test is broken. This updates to reflect actual behavior. Kinds are expected to be singular - // old (incorrect), coment: Don't add extra s if the original object is already plural + // old (incorrect), comment: Don't add extra s if the original object is already plural {Kind: "lowercases", Plural: "lowercaseses", Singular: "lowercases"}, } for i, testCase := range testCases { diff --git a/staging/src/k8s.io/apimachinery/pkg/api/resource/scale_int_test.go b/staging/src/k8s.io/apimachinery/pkg/api/resource/scale_int_test.go index 50d91060aa..b150fa514c 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/resource/scale_int_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/api/resource/scale_int_test.go @@ -45,7 +45,7 @@ func TestScaledValueInternal(t *testing.T) { {big.NewInt(1), 3, 0, 1}, // large scaled value does not lose precision {big.NewInt(0).Sub(maxInt64, bigOne), 1, 0, (math.MaxInt64-1)/10 + 1}, - // large intermidiate result. + // large intermediate result. {big.NewInt(1).Exp(big.NewInt(10), big.NewInt(100), nil), 100, 0, 1}, // scale up diff --git a/staging/src/k8s.io/apimachinery/pkg/apimachinery/announced/announced.go b/staging/src/k8s.io/apimachinery/pkg/apimachinery/announced/announced.go index 2c8568c1f7..4e38cc8c54 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apimachinery/announced/announced.go +++ b/staging/src/k8s.io/apimachinery/pkg/apimachinery/announced/announced.go @@ -35,7 +35,7 @@ import ( // // (Right now APIRegistrationManager has separate 'registration' and 'enabled' // concepts-- APIGroupFactory is going to take over the former function; -// they will overlap untill the refactoring is finished.) +// they will overlap until the refactoring is finished.) // // The key is the group name. After initialization, this should be treated as // read-only. It is implemented as a map from group name to group factory, and diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go index d41744af4d..54fab9c02e 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go @@ -221,7 +221,7 @@ func v1FuzzerFuncs(codecs runtimeserializer.CodecFactory) []interface{} { if j.MatchExpressions != nil { // NB: the label selector parser code sorts match expressions by key, and sorts the values, - // so we need to make sure ours are sorted as well here to preserve round-trip comparision. + // so we need to make sure ours are sorted as well here to preserve round-trip comparison. // In practice, not sorting doesn't hurt anything... for i := range j.MatchExpressions { diff --git a/staging/src/k8s.io/apimachinery/pkg/conversion/converter_test.go b/staging/src/k8s.io/apimachinery/pkg/conversion/converter_test.go index 57f51c253c..5373c80983 100644 --- a/staging/src/k8s.io/apimachinery/pkg/conversion/converter_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/conversion/converter_test.go @@ -343,7 +343,7 @@ func TestConverter_GeneratedConversionOverriden(t *testing.T) { t.Fatalf("unexpected error %v", err) } if err := c.RegisterGeneratedConversionFunc(func(in *A, out *B, s Scope) error { - return fmt.Errorf("generated function should be overriden") + return fmt.Errorf("generated function should be overridden") }); err != nil { t.Fatalf("unexpected error %v", err) } @@ -360,12 +360,12 @@ func TestConverter_WithConversionOverriden(t *testing.T) { type B struct{} c := NewConverter(DefaultNameFunc) if err := c.RegisterConversionFunc(func(in *A, out *B, s Scope) error { - return fmt.Errorf("conversion function should be overriden") + return fmt.Errorf("conversion function should be overridden") }); err != nil { t.Fatalf("unexpected error %v", err) } if err := c.RegisterGeneratedConversionFunc(func(in *A, out *B, s Scope) error { - return fmt.Errorf("generated function should be overriden") + return fmt.Errorf("generated function should be overridden") }); err != nil { t.Fatalf("unexpected error %v", err) } @@ -378,7 +378,7 @@ func TestConverter_WithConversionOverriden(t *testing.T) { a := A{} b := B{} - if err := c.Convert(&a, &b, 0, nil); err == nil || err.Error() != "conversion function should be overriden" { + if err := c.Convert(&a, &b, 0, nil); err == nil || err.Error() != "conversion function should be overridden" { t.Errorf("unexpected error: %v", err) } if err := newc.Convert(&a, &b, 0, nil); err != nil { diff --git a/staging/src/k8s.io/apimachinery/pkg/fields/selector.go b/staging/src/k8s.io/apimachinery/pkg/fields/selector.go index 273e9a2c1b..3785d8c2f7 100644 --- a/staging/src/k8s.io/apimachinery/pkg/fields/selector.go +++ b/staging/src/k8s.io/apimachinery/pkg/fields/selector.go @@ -396,7 +396,7 @@ const ( var termOperators = []string{notEqualOperator, doubleEqualOperator, equalOperator} // splitTerm returns the lhs, operator, and rhs parsed from the given term, along with an indicator of whether the parse was successful. -// no escaping of special characters is supported in the lhs value, so the first occurance of a recognized operator is used as the split point. +// no escaping of special characters is supported in the lhs value, so the first occurrence of a recognized operator is used as the split point. // the literal rhs is returned, and the caller is responsible for applying any desired unescaping. func splitTerm(term string) (lhs, op, rhs string, ok bool) { for i := range term { diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/codec.go b/staging/src/k8s.io/apimachinery/pkg/runtime/codec.go index 5b3080aa58..10dc12cca9 100644 --- a/staging/src/k8s.io/apimachinery/pkg/runtime/codec.go +++ b/staging/src/k8s.io/apimachinery/pkg/runtime/codec.go @@ -281,7 +281,7 @@ func (disabledGroupVersioner) KindForGroupVersionKinds(kinds []schema.GroupVersi // GroupVersioners implements GroupVersioner and resolves to the first exact match for any kind. type GroupVersioners []GroupVersioner -// KindForGroupVersionKinds returns the first match of any of the group versioners, or false if no match occured. +// KindForGroupVersionKinds returns the first match of any of the group versioners, or false if no match occurred. func (gvs GroupVersioners) KindForGroupVersionKinds(kinds []schema.GroupVersionKind) (schema.GroupVersionKind, bool) { for _, gv := range gvs { target, ok := gv.KindForGroupVersionKinds(kinds) diff --git a/staging/src/k8s.io/apimachinery/pkg/util/errors/errors.go b/staging/src/k8s.io/apimachinery/pkg/util/errors/errors.go index 26e7eb2082..88e937679d 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/errors/errors.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/errors/errors.go @@ -21,7 +21,7 @@ import ( "fmt" ) -// MessageCountMap contains occurance for each error message. +// MessageCountMap contains occurrence for each error message. type MessageCountMap map[string]int // Aggregate represents an object that contains multiple errors, but does not diff --git a/staging/src/k8s.io/apimachinery/pkg/util/rand/rand_test.go b/staging/src/k8s.io/apimachinery/pkg/util/rand/rand_test.go index 7be656c40a..517043a52f 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/rand/rand_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/rand/rand_test.go @@ -36,7 +36,7 @@ func TestString(t *testing.T) { } for _, c := range s { if !strings.ContainsRune(valid, c) { - t.Errorf("expected valid charaters, got %v", c) + t.Errorf("expected valid characters, got %v", c) } } } diff --git a/staging/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go b/staging/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go index 442dde7df2..d4cec0b884 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go @@ -43,7 +43,7 @@ var PanicHandlers = []func(interface{}){logPanic} // TODO: remove this function. We are switching to a world where it's safe for // apiserver to panic, since it will be restarted by kubelet. At the beginning // of the Kubernetes project, nothing was going to restart apiserver and so -// catching panics was important. But it's actually much simpler for montoring +// catching panics was important. But it's actually much simpler for monitoring // software if we just exit when an unexpected panic happens. func HandleCrash(additionalHandlers ...func(interface{})) { if r := recover(); r != nil { diff --git a/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go b/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go index 09dcd0fd59..2f6ade2bea 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go @@ -423,7 +423,7 @@ func normalizeElementOrder(patch, serverOnly, patchOrder, serverOrder []interfac // scan from the place of last insertion in `right` to the end of `right`, // the place is before the first item that is greater than the item we want to insert. // example usage: using server-only items as left and patch items as right. We insert server-only items -// to patch list. We use the order of live object as record for comparision. +// to patch list. We use the order of live object as record for comparison. func mergeSortedSlice(left, right, serverOrder []interface{}, mergeKey string, kind reflect.Kind) []interface{} { // Returns if l is less than r, and if both have been found. // If l and r both present and l is in front of r, l is less than r. @@ -2109,7 +2109,7 @@ func sliceTypeAssertion(original, patch interface{}) ([]interface{}, []interface } // extractRetainKeysPatchStrategy process patch strategy, which is a string may contains multiple -// patch strategies seperated by ",". It returns a boolean var indicating if it has +// patch strategies separated by ",". It returns a boolean var indicating if it has // retainKeys strategies and a string for the other strategy. func extractRetainKeysPatchStrategy(strategies []string) (bool, string, error) { switch len(strategies) { diff --git a/staging/src/k8s.io/apimachinery/pkg/util/validation/field/errors_test.go b/staging/src/k8s.io/apimachinery/pkg/util/validation/field/errors_test.go index bff0d88e9c..fe747319bb 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/validation/field/errors_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/validation/field/errors_test.go @@ -99,7 +99,7 @@ func TestErrorUsefulMessage(t *testing.T) { "foo", ErrorTypeInvalid.String(), "Baz", "Qux", "Inner", "KV", "detail", "1", "aoeu", "Billy", "2", - // "asdf", TODO: reenable once we have a better nested printer + // "asdf", TODO: re-enable once we have a better nested printer } { if !strings.Contains(s, part) { t.Errorf("error message did not contain expected part '%v'", part) diff --git a/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/waitgroup.go b/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/waitgroup.go index 488f563407..e080a5e92f 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/waitgroup.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/waitgroup.go @@ -37,7 +37,7 @@ func (wg *SafeWaitGroup) Add(delta int) error { wg.mu.RLock() defer wg.mu.RUnlock() if wg.wait && delta > 0 { - return fmt.Errorf("add with postive delta after Wait is forbidden") + return fmt.Errorf("add with positive delta after Wait is forbidden") } wg.wg.Add(delta) return nil diff --git a/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go b/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go index 3246e4c075..15753789ce 100644 --- a/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go +++ b/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go @@ -20,7 +20,7 @@ limitations under the License. // subauthorizer returns a NoOpinion, then the union authorizer moves onto the // next authorizer or, if the subauthorizer was the last authorizer, returns // NoOpinion as the aggregate decision. I.e. union authorizer creates an -// aggregate decision and supports short-circut allows and denies from +// aggregate decision and supports short-circuit allows and denies from // subauthorizers. package union diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go index 7cbb671539..d3f155c11f 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go @@ -86,7 +86,7 @@ var ( }, []string{"requestKind"}, ) - // Becasue of volatality of the base metric this is pre-aggregated one. Instead of reporing current usage all the time + // Because of volatality of the base metric this is pre-aggregated one. Instead of reporing current usage all the time // it reports maximal usage during the last second. currentInflightRequests = prometheus.NewGaugeVec( prometheus.GaugeOpts{ diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go index 67b0f62972..4d5bda72dd 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go @@ -33,10 +33,10 @@ import ( ) const ( - // Now only supportied unix domain socket. + // Now only supported unix domain socket. unixProtocol = "unix" - // Current version for the protocal interface definition. + // Current version for the protocol interface definition. kmsapiVersion = "v1beta1" // The timeout that communicate with KMS server. diff --git a/staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp/gcp_test.go b/staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp/gcp_test.go index fc7f774b67..32271b252b 100644 --- a/staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp/gcp_test.go +++ b/staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp/gcp_test.go @@ -192,7 +192,7 @@ func Test_tokenSource_applicationDefaultCredentials(t *testing.T) { t.Fatalf("failed to get a token source: %+v", err) } if ts == nil { - t.Fatal("returned nil token soruce") + t.Fatal("returned nil token source") } } diff --git a/staging/src/k8s.io/client-go/rest/client_test.go b/staging/src/k8s.io/client-go/rest/client_test.go index 3096cc13a2..2eae9be2d6 100644 --- a/staging/src/k8s.io/client-go/rest/client_test.go +++ b/staging/src/k8s.io/client-go/rest/client_test.go @@ -302,7 +302,7 @@ func TestCreateBackoffManager(t *testing.T) { backoff.UpdateBackoff(theUrl, nil, 500) backoff = readExpBackoffConfig() if backoff.CalculateBackoff(theUrl)/time.Second != 0 { - t.Errorf("Zero backoff duration, but backoff still occuring.") + t.Errorf("Zero backoff duration, but backoff still occurring.") } // No env -> No backoff. diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/client_config.go b/staging/src/k8s.io/client-go/tools/clientcmd/client_config.go index c2bb39aae5..af86f677c1 100644 --- a/staging/src/k8s.io/client-go/tools/clientcmd/client_config.go +++ b/staging/src/k8s.io/client-go/tools/clientcmd/client_config.go @@ -107,7 +107,7 @@ func (config *DirectClientConfig) RawConfig() (clientcmdapi.Config, error) { // ClientConfig implements ClientConfig func (config *DirectClientConfig) ClientConfig() (*restclient.Config, error) { // check that getAuthInfo, getContext, and getCluster do not return an error. - // Do this before checking if the curent config is usable in the event that an + // Do this before checking if the current config is usable in the event that an // AuthInfo, Context, or Cluster config with user-defined names are not found. // This provides a user with the immediate cause for error if one is found configAuthInfo, err := config.getAuthInfo() diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/client_config_test.go b/staging/src/k8s.io/client-go/tools/clientcmd/client_config_test.go index 9c08ff89d5..0a9288bcf9 100644 --- a/staging/src/k8s.io/client-go/tools/clientcmd/client_config_test.go +++ b/staging/src/k8s.io/client-go/tools/clientcmd/client_config_test.go @@ -94,7 +94,7 @@ func TestInsecureOverridesCA(t *testing.T) { } func TestMergeContext(t *testing.T) { - const namespace = "overriden-namespace" + const namespace = "overridden-namespace" config := createValidTestConfig() clientBuilder := NewNonInteractiveClientConfig(*config, "clean", &ConfigOverrides{}, nil) diff --git a/staging/src/k8s.io/client-go/tools/leaderelection/leaderelection_test.go b/staging/src/k8s.io/client-go/tools/leaderelection/leaderelection_test.go index 5e58646316..e99cf57afb 100644 --- a/staging/src/k8s.io/client-go/tools/leaderelection/leaderelection_test.go +++ b/staging/src/k8s.io/client-go/tools/leaderelection/leaderelection_test.go @@ -260,7 +260,7 @@ func testTryAcquireOrRenew(t *testing.T, objectType string) { } if test.expectSuccess != le.tryAcquireOrRenew() { - t.Errorf("[%v]unexpected result of tryAcquireOrRenew: [succeded=%v]", i, !test.expectSuccess) + t.Errorf("[%v]unexpected result of tryAcquireOrRenew: [succeeded=%v]", i, !test.expectSuccess) } le.observedRecord.AcquireTime = metav1.Time{} diff --git a/staging/src/k8s.io/client-go/tools/portforward/portforward_test.go b/staging/src/k8s.io/client-go/tools/portforward/portforward_test.go index ab705849c8..2abbf16f29 100644 --- a/staging/src/k8s.io/client-go/tools/portforward/portforward_test.go +++ b/staging/src/k8s.io/client-go/tools/portforward/portforward_test.go @@ -179,7 +179,7 @@ func TestGetListener(t *testing.T) { t.Errorf("Test case #%d failed: Listener does not listen on expected address: asked '%v' got '%v'", i, testCase.ExpectedListenerAddress, host) } if port != expectedListenerPort { - t.Errorf("Test case #%d failed: Listener does not listen on exepected port: asked %v got %v", i, expectedListenerPort, port) + t.Errorf("Test case #%d failed: Listener does not listen on expected port: asked %v got %v", i, expectedListenerPort, port) } listener.Close() diff --git a/staging/src/k8s.io/client-go/util/jsonpath/jsonpath_test.go b/staging/src/k8s.io/client-go/util/jsonpath/jsonpath_test.go index c659053226..6c7277d10a 100644 --- a/staging/src/k8s.io/client-go/util/jsonpath/jsonpath_test.go +++ b/staging/src/k8s.io/client-go/util/jsonpath/jsonpath_test.go @@ -190,7 +190,7 @@ func TestStructInput(t *testing.T) { {"nonexistent field", "{.hello}", storeData, "hello is not found", false}, {"invalid array", "{.Labels[0]}", storeData, "map[string]int is not array or slice", false}, {"invalid filter operator", "{.Book[?(@.Price<>10)]}", storeData, "unrecognized filter operator <>", false}, - {"redundent end", "{range .Labels.*}{@}{end}{end}", storeData, "not in range, nothing to end", false}, + {"redundant end", "{range .Labels.*}{@}{end}{end}", storeData, "not in range, nothing to end", false}, } testFailJSONPath(failStoreTests, t) } diff --git a/staging/src/k8s.io/client-go/util/workqueue/delaying_queue.go b/staging/src/k8s.io/client-go/util/workqueue/delaying_queue.go index 74fefd38b7..c62ed32efa 100644 --- a/staging/src/k8s.io/client-go/util/workqueue/delaying_queue.go +++ b/staging/src/k8s.io/client-go/util/workqueue/delaying_queue.go @@ -89,7 +89,7 @@ type waitFor struct { // waitForPriorityQueue implements a priority queue for waitFor items. // -// waitForPriorityQueue implements heap.Interface. The item occuring next in +// waitForPriorityQueue implements heap.Interface. The item occurring next in // time (i.e., the item with the smallest readyAt) is at the root (index 0). // Peek returns this minimum item at index 0. Pop returns the minimum item after // it has been removed from the queue and placed at index Len()-1 by diff --git a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/generator.go b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/generator.go index a73472eae2..0e7a7d8ec3 100644 --- a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/generator.go +++ b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/generator.go @@ -128,7 +128,7 @@ func isProtoable(seen map[*types.Type]bool, t *types.Type) bool { case types.Interface: return false default: - log.Printf("WARNING: type %q is not protable: %s", t.Kind, t.Name) + log.Printf("WARNING: type %q is not portable: %s", t.Kind, t.Name) return false } } diff --git a/staging/src/k8s.io/metrics/IMPLEMENTATIONS.md b/staging/src/k8s.io/metrics/IMPLEMENTATIONS.md index cb5a565c58..ea35099005 100644 --- a/staging/src/k8s.io/metrics/IMPLEMENTATIONS.md +++ b/staging/src/k8s.io/metrics/IMPLEMENTATIONS.md @@ -12,7 +12,7 @@ ## Custom Metrics API -***NB: None of the below implemenations are officially part of Kubernetes. +***NB: None of the below implementations are officially part of Kubernetes. They are listed here for convenience.*** - [Prometheus diff --git a/staging/src/k8s.io/metrics/README.md b/staging/src/k8s.io/metrics/README.md index f78ee266ee..2184d3f1f0 100644 --- a/staging/src/k8s.io/metrics/README.md +++ b/staging/src/k8s.io/metrics/README.md @@ -15,7 +15,7 @@ library when implementing their API servers. ## APIs This repository contains types and clients for several APIs. For more -details on implemenations of these apis, see +details on implementations of these apis, see [IMPLEMENTATIONS.md](IMPLEMENTATIONS.md). ### Custom Metrics API diff --git a/staging/src/k8s.io/metrics/pkg/client/custom_metrics/client.go b/staging/src/k8s.io/metrics/pkg/client/custom_metrics/client.go index d88ec4f63f..1e1763bc8f 100644 --- a/staging/src/k8s.io/metrics/pkg/client/custom_metrics/client.go +++ b/staging/src/k8s.io/metrics/pkg/client/custom_metrics/client.go @@ -69,7 +69,7 @@ func NewForConfigOrDie(c *rest.Config) CustomMetricsClient { return client } -// NewForMapper constucts the client with a RESTMapper, which allows more +// NewForMapper constructs the client with a RESTMapper, which allows more // accurate translation from GroupVersionKind to GroupVersionResource. func NewForMapper(client rest.Interface, mapper meta.RESTMapper) CustomMetricsClient { return &customMetricsClient{ diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index ccc0075ae2..f365c60926 100755 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -24,7 +24,7 @@ test/e2e/common/container_probe.go: "should *not* be restarted with a /healthz h test/e2e/common/container_probe.go: "should be restarted with a docker exec liveness probe with timeout " test/e2e/common/docker_containers.go: "should use the image defaults if command and args are blank " test/e2e/common/docker_containers.go: "should be able to override the image's default arguments (docker cmd) " -test/e2e/common/docker_containers.go: "should be able to override the image's default commmand (docker entrypoint) " +test/e2e/common/docker_containers.go: "should be able to override the image's default command (docker entrypoint) " test/e2e/common/docker_containers.go: "should be able to override the image's default command and arguments " test/e2e/common/downward_api.go: "should provide pod name, namespace and IP address as env vars " test/e2e/common/downward_api.go: "should provide host IP as an env var " diff --git a/test/e2e/apps/cronjob.go b/test/e2e/apps/cronjob.go index db345ad968..b6c46d5200 100644 --- a/test/e2e/apps/cronjob.go +++ b/test/e2e/apps/cronjob.go @@ -222,7 +222,7 @@ var _ = SIGDescribe("CronJob", func() { err = waitForNoJobs(f.ClientSet, f.Namespace.Name, cronJob.Name, true) Expect(err).NotTo(HaveOccurred()) - By("Ensuring MissingJob event has occured") + By("Ensuring MissingJob event has occurred") err = checkNoEventWithReason(f.ClientSet, f.Namespace.Name, cronJob.Name, []string{"MissingJob"}) Expect(err).To(HaveOccurred()) @@ -430,7 +430,7 @@ func waitForAnyFinishedJob(c clientset.Interface, ns string) error { }) } -// checkNoEventWithReason checks no events with a reason within a list has occured +// checkNoEventWithReason checks no events with a reason within a list has occurred func checkNoEventWithReason(c clientset.Interface, ns, cronJobName string, reasons []string) error { sj, err := c.BatchV1beta1().CronJobs(ns).Get(cronJobName, metav1.GetOptions{}) if err != nil { diff --git a/test/e2e/apps/statefulset.go b/test/e2e/apps/statefulset.go index 16b20b9834..ffb085a193 100644 --- a/test/e2e/apps/statefulset.go +++ b/test/e2e/apps/statefulset.go @@ -324,7 +324,7 @@ var _ = SIGDescribe("StatefulSet", func() { ss = sst.WaitForStatus(ss) currentRevision, updateRevision = ss.Status.CurrentRevision, ss.Status.UpdateRevision Expect(currentRevision).NotTo(Equal(updateRevision), - "Current revision should not equal update revision during roll bakc") + "Current revision should not equal update revision during roll back") Expect(priorRevision).To(Equal(updateRevision), "Prior revision should equal update revision during roll back") diff --git a/test/e2e/autoscaling/dns_autoscaling.go b/test/e2e/autoscaling/dns_autoscaling.go index 7731682642..00331f2d19 100644 --- a/test/e2e/autoscaling/dns_autoscaling.go +++ b/test/e2e/autoscaling/dns_autoscaling.go @@ -104,7 +104,7 @@ var _ = SIGDescribe("DNS horizontal autoscaling", func() { err := updateDNSScalingConfigMap(c, packDNSScalingConfigMap(packLinearParams(&DNSParams_1))) Expect(err).NotTo(HaveOccurred()) defer func() { - By("Restoring intial dns autoscaling parameters") + By("Restoring initial dns autoscaling parameters") Expect(updateDNSScalingConfigMap(c, packDNSScalingConfigMap(previousParams))).NotTo(HaveOccurred()) By("Wait for number of running and ready kube-dns pods recover") @@ -164,7 +164,7 @@ var _ = SIGDescribe("DNS horizontal autoscaling", func() { err := updateDNSScalingConfigMap(c, packDNSScalingConfigMap(packLinearParams(&DNSParams_1))) Expect(err).NotTo(HaveOccurred()) defer func() { - By("Restoring intial dns autoscaling parameters") + By("Restoring initial dns autoscaling parameters") Expect(updateDNSScalingConfigMap(c, packDNSScalingConfigMap(previousParams))).NotTo(HaveOccurred()) }() By("Wait for kube-dns scaled to expected number") diff --git a/test/e2e/common/docker_containers.go b/test/e2e/common/docker_containers.go index 734e02fa8c..dc5c9bf2ee 100644 --- a/test/e2e/common/docker_containers.go +++ b/test/e2e/common/docker_containers.go @@ -62,7 +62,7 @@ var _ = framework.KubeDescribe("Docker Containers", func() { Container, ensure that it takes precedent to the docker image's default command. */ - framework.ConformanceIt("should be able to override the image's default commmand (docker entrypoint) ", func() { + framework.ConformanceIt("should be able to override the image's default command (docker entrypoint) ", func() { pod := entrypointTestPod() pod.Spec.Containers[0].Command = []string{"/ep-2"} diff --git a/test/e2e/common/downwardapi_volume.go b/test/e2e/common/downwardapi_volume.go index c7ec9c0763..3709b318ec 100644 --- a/test/e2e/common/downwardapi_volume.go +++ b/test/e2e/common/downwardapi_volume.go @@ -55,7 +55,7 @@ var _ = Describe("[sig-storage] Downward API volume", func() { /* Testname: downwardapi-volume-set-default-mode - Description: Ensure that downward API can set default file premission + Description: Ensure that downward API can set default file permission mode for DownwardAPIVolumeFiles if no mode is specified. */ framework.ConformanceIt("should set DefaultMode on files ", func() { @@ -70,7 +70,7 @@ var _ = Describe("[sig-storage] Downward API volume", func() { /* Testname: downwardapi-volume-set-mode - Description: Ensure that downward API can set file premission mode for + Description: Ensure that downward API can set file permission mode for DownwardAPIVolumeFiles. */ framework.ConformanceIt("should set mode on item file ", func() { diff --git a/test/e2e/common/pods.go b/test/e2e/common/pods.go index 755011fb5a..1b14332bca 100644 --- a/test/e2e/common/pods.go +++ b/test/e2e/common/pods.go @@ -658,7 +658,7 @@ var _ = framework.KubeDescribe("Pods", func() { time.Sleep(2 * kubelet.MaxContainerBackOff) // it takes slightly more than 2*x to get to a back-off of x // wait for a delay == capped delay of MaxContainerBackOff - By("geting restart delay when capped") + By("getting restart delay when capped") var ( delay1 time.Duration err error diff --git a/test/e2e/common/projected.go b/test/e2e/common/projected.go index 68aa0a3002..099d2ecc47 100644 --- a/test/e2e/common/projected.go +++ b/test/e2e/common/projected.go @@ -471,7 +471,7 @@ var _ = Describe("[sig-storage] Projected", func() { }) /* - Testname: projected-volume-configMaps-updated-succesfully + Testname: projected-volume-configMaps-updated-successfully Description: Make sure that if a projected volume has configMaps, that the values in these configMaps can be updated, deleted, and created. @@ -560,7 +560,7 @@ var _ = Describe("[sig-storage] Projected", func() { }) /* - Testname: projected-volume-optional-configMaps-updated-succesfully + Testname: projected-volume-optional-configMaps-updated-successfully Description: Make sure that if a projected volume has optional configMaps, that the values in these configMaps can be updated, deleted, and created. @@ -875,7 +875,7 @@ var _ = Describe("[sig-storage] Projected", func() { /* Testname: projected-downwardapi-volume-set-default-mode - Description: Ensure that downward API can set default file premission + Description: Ensure that downward API can set default file permission mode for DownwardAPIVolumeFiles if no mode is specified in a projected volume. */ @@ -891,7 +891,7 @@ var _ = Describe("[sig-storage] Projected", func() { /* Testname: projected-downwardapi-volume-set-mode - Description: Ensure that downward API can set file premission mode for + Description: Ensure that downward API can set file permission mode for DownwardAPIVolumeFiles in a projected volume. */ framework.ConformanceIt("should set mode on item file", func() { diff --git a/test/e2e/framework/test_context.go b/test/e2e/framework/test_context.go index 56af8106ae..342865168e 100644 --- a/test/e2e/framework/test_context.go +++ b/test/e2e/framework/test_context.go @@ -298,7 +298,7 @@ func ViperizeFlags() { viper.AddConfigPath(".") viper.ReadInConfig() - // TODO Consider wether or not we want to use overwriteFlagsWithViperConfig(). + // TODO Consider whether or not we want to use overwriteFlagsWithViperConfig(). viper.Unmarshal(&TestContext) AfterReadingAllFlags(&TestContext) diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index d57dfb913e..f84769e214 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -1665,7 +1665,7 @@ func WaitForEndpoint(c clientset.Interface, ns, name string) error { } // Context for checking pods responses by issuing GETs to them (via the API -// proxy) and verifying that they answer with ther own pod name. +// proxy) and verifying that they answer with there own pod name. type podProxyResponseChecker struct { c clientset.Interface ns string diff --git a/test/e2e/framework/volume_util.go b/test/e2e/framework/volume_util.go index 9ca69ecb1f..45d2c4bf34 100644 --- a/test/e2e/framework/volume_util.go +++ b/test/e2e/framework/volume_util.go @@ -441,7 +441,7 @@ func TestVolumeClient(client clientset.Interface, config VolumeTestConfig, fsGro if fsGroup != nil { By("Checking fsGroup is correct.") _, err = LookForStringInPodExec(config.Namespace, clientPod.Name, []string{"ls", "-ld", "/opt/0"}, strconv.Itoa(int(*fsGroup)), time.Minute) - Expect(err).NotTo(HaveOccurred(), "failed: getting the right priviliges in the file %v", int(*fsGroup)) + Expect(err).NotTo(HaveOccurred(), "failed: getting the right privileges in the file %v", int(*fsGroup)) } } diff --git a/test/e2e/generated/gobindata_util.go b/test/e2e/generated/gobindata_util.go index 1a7e320ee8..0d939dd53b 100644 --- a/test/e2e/generated/gobindata_util.go +++ b/test/e2e/generated/gobindata_util.go @@ -28,7 +28,7 @@ func ReadOrDie(filePath string) []byte { fileBytes, err := Asset(filePath) if err != nil { - gobindataMsg := "An error occured, possibly gobindata doesn't know about the file you're opening. For questions on maintaining gobindata, contact the sig-testing group." + gobindataMsg := "An error occurred, possibly gobindata doesn't know about the file you're opening. For questions on maintaining gobindata, contact the sig-testing group." glog.Infof("Available gobindata files: %v ", AssetNames()) glog.Fatalf("Failed opening %v , with error %v. %v.", filePath, err, gobindataMsg) } diff --git a/test/e2e/instrumentation/logging/generic_soak.go b/test/e2e/instrumentation/logging/generic_soak.go index 3c94306f06..75f71bc009 100644 --- a/test/e2e/instrumentation/logging/generic_soak.go +++ b/test/e2e/instrumentation/logging/generic_soak.go @@ -119,7 +119,7 @@ func RunLogPodsWithSleepOf(f *framework.Framework, sleep time.Duration, podname framework.PodStateVerification{ Selectors: podlables, ValidPhases: []v1.PodPhase{v1.PodRunning, v1.PodSucceeded}, - // we don't validate total log data, since there is no gaurantee all logs will be stored forever. + // we don't validate total log data, since there is no guarantee all logs will be stored forever. // instead, we just validate that some logs are being created in std out. Verify: func(p v1.Pod) (bool, error) { s, err := framework.LookForStringInLog(f.Namespace.Name, p.Name, "logging-soak", "logs-123", 1*time.Second) diff --git a/test/e2e/network/networking_perf.go b/test/e2e/network/networking_perf.go index e8a7b608ec..9563e0bba8 100644 --- a/test/e2e/network/networking_perf.go +++ b/test/e2e/network/networking_perf.go @@ -149,9 +149,9 @@ func networkingIPerfTest(isIPv6 bool) { } }) } - fmt.Println("[begin] Node,Bandwith CSV") + fmt.Println("[begin] Node,Bandwidth CSV") fmt.Println(iperfResults.ToTSV()) - fmt.Println("[end] Node,Bandwith CSV") + fmt.Println("[end] Node,Bandwidth CSV") for ipClient, bandwidth := range iperfResults.BandwidthMap { framework.Logf("%v had bandwidth %v. Ratio to expected (%v) was %f", ipClient, bandwidth, expectedBandwidth, float64(bandwidth)/float64(expectedBandwidth)) diff --git a/test/e2e/scalability/load.go b/test/e2e/scalability/load.go index 0d53943895..0febdd0eeb 100644 --- a/test/e2e/scalability/load.go +++ b/test/e2e/scalability/load.go @@ -122,7 +122,7 @@ var _ = SIGDescribe("Load capacity", func() { // We assume a default throughput of 10 pods/second throughput. // We may want to revisit it in the future. - // However, this can be overriden by LOAD_TEST_THROUGHPUT env var. + // However, this can be overridden by LOAD_TEST_THROUGHPUT env var. throughput := 10 if throughputEnv := os.Getenv("LOAD_TEST_THROUGHPUT"); throughputEnv != "" { if newThroughput, err := strconv.Atoi(throughputEnv); err == nil { diff --git a/test/e2e/scheduling/taints_test.go b/test/e2e/scheduling/taints_test.go index c4f1e8b9e1..8a5668508d 100644 --- a/test/e2e/scheduling/taints_test.go +++ b/test/e2e/scheduling/taints_test.go @@ -196,7 +196,7 @@ var _ = SIGDescribe("NoExecuteTaintManager [Serial]", func() { // 1. Run a pod with toleration // 2. Taint the node running this pod with a no-execute taint - // 3. See if pod wont get evicted + // 3. See if pod won't get evicted It("doesn't evict pod with tolerations from tainted nodes", func() { podName := "taint-eviction-2" pod := createPodForTaintsTest(true, 0, podName, ns) @@ -228,7 +228,7 @@ var _ = SIGDescribe("NoExecuteTaintManager [Serial]", func() { // 1. Run a pod with a finite toleration // 2. Taint the node running this pod with a no-execute taint - // 3. See if pod wont get evicted before toleration time runs out + // 3. See if pod won't get evicted before toleration time runs out // 4. See if pod will get evicted after toleration time runs out It("eventually evict pod with finite tolerations from tainted nodes", func() { podName := "taint-eviction-3" diff --git a/test/e2e/storage/persistent_volumes-local.go b/test/e2e/storage/persistent_volumes-local.go index 1c5e0dc0f2..ed5107c4f0 100644 --- a/test/e2e/storage/persistent_volumes-local.go +++ b/test/e2e/storage/persistent_volumes-local.go @@ -250,7 +250,7 @@ var _ = utils.SIGDescribe("PersistentVolumes-local [Feature:LocalPersistentVolum // TODO: // - make the pod create timeout shorter // - check for these errors in unit tests intead - It("should fail due to non-existant path", func() { + It("should fail due to non-existent path", func() { ep := &eventPatterns{ reason: "FailedMount", pattern: make([]string, 2)} diff --git a/test/e2e/storage/pvc_protection.go b/test/e2e/storage/pvc_protection.go index 131999e510..390d12daaa 100644 --- a/test/e2e/storage/pvc_protection.go +++ b/test/e2e/storage/pvc_protection.go @@ -80,7 +80,7 @@ var _ = utils.SIGDescribe("PVC Protection [Feature:StorageProtection]", func() { pvcCreatedAndNotDeleted = false }) - It("Verify that PVC in active use by a pod is not removed immediatelly", func() { + It("Verify that PVC in active use by a pod is not removed immediately", func() { By("Creating a Pod that becomes Running and therefore is actively using the PVC") pvcClaims := []*v1.PersistentVolumeClaim{pvc} pod, err := framework.CreatePod(client, nameSpace, nil, pvcClaims, false, "") diff --git a/test/e2e/storage/vsphere/vsphere_volume_vsan_policy.go b/test/e2e/storage/vsphere/vsphere_volume_vsan_policy.go index 3c51cbce4e..13f0318e6c 100644 --- a/test/e2e/storage/vsphere/vsphere_volume_vsan_policy.go +++ b/test/e2e/storage/vsphere/vsphere_volume_vsan_policy.go @@ -60,7 +60,7 @@ const ( /* Test to verify the storage policy based management for dynamic volume provisioning inside kubernetes. - There are 2 ways to achive it: + There are 2 ways to achieve it: 1. Specify VSAN storage capabilities in the storage-class. 2. Use existing vCenter SPBM storage policies. diff --git a/test/e2e_node/apparmor_test.go b/test/e2e_node/apparmor_test.go index cfc814a645..85e3514854 100644 --- a/test/e2e_node/apparmor_test.go +++ b/test/e2e_node/apparmor_test.go @@ -50,7 +50,7 @@ var _ = framework.KubeDescribe("AppArmor [Feature:AppArmor]", func() { f := framework.NewDefaultFramework("apparmor-test") It("should reject an unloaded profile", func() { - status := runAppArmorTest(f, false, apparmor.ProfileNamePrefix+"non-existant-profile") + status := runAppArmorTest(f, false, apparmor.ProfileNamePrefix+"non-existent-profile") expectSoftRejection(status) }) It("should enforce a profile blocking writes", func() { diff --git a/test/e2e_node/dockershim_checkpoint_test.go b/test/e2e_node/dockershim_checkpoint_test.go index 018213d1b2..c64191cd20 100644 --- a/test/e2e_node/dockershim_checkpoint_test.go +++ b/test/e2e_node/dockershim_checkpoint_test.go @@ -90,7 +90,7 @@ var _ = SIGDescribe("Dockershim [Serial] [Disruptive] [Feature:Docker]", func() if len(filename) == 0 { continue } - framework.Logf("Removing checkpiont %q", filename) + framework.Logf("Removing checkpoint %q", filename) _, err := exec.Command("sudo", "rm", filename).CombinedOutput() framework.ExpectNoError(err, "Failed to remove checkpoint file %q: %v", string(filename), err) } diff --git a/test/e2e_node/garbage_collector_test.go b/test/e2e_node/garbage_collector_test.go index 96045f09ca..d6a9244ad4 100644 --- a/test/e2e_node/garbage_collector_test.go +++ b/test/e2e_node/garbage_collector_test.go @@ -137,7 +137,7 @@ var _ = framework.KubeDescribe("GarbageCollect [Serial]", func() { // Tests the following: // pods are created, and all containers restart the specified number of times -// while contianers are running, the number of copies of a single container does not exceed maxPerPodContainer +// while containers are running, the number of copies of a single container does not exceed maxPerPodContainer // while containers are running, the total number of containers does not exceed maxTotalContainers // while containers are running, if not constrained by maxPerPodContainer or maxTotalContainers, keep an extra copy of each container // once pods are killed, all containers are eventually cleaned up diff --git a/test/e2e_node/jenkins/cos-init-docker.yaml b/test/e2e_node/jenkins/cos-init-docker.yaml index e93372bb71..3dec3bd747 100644 --- a/test/e2e_node/jenkins/cos-init-docker.yaml +++ b/test/e2e_node/jenkins/cos-init-docker.yaml @@ -27,7 +27,7 @@ write_files: permissions: 0644 owner: root content: | - # This script reads a GCE metadata key for the user speficied Docker + # This script reads a GCE metadata key for the user specified Docker # version, downloads, and replaces the builtin Docker with it. set -x diff --git a/test/e2e_node/jenkins/ubuntu-init-docker.yaml b/test/e2e_node/jenkins/ubuntu-init-docker.yaml index 0ce064f7b8..eb551171e2 100644 --- a/test/e2e_node/jenkins/ubuntu-init-docker.yaml +++ b/test/e2e_node/jenkins/ubuntu-init-docker.yaml @@ -27,7 +27,7 @@ write_files: permissions: 0644 owner: root content: | - # This script reads a GCE metadata key for the user speficied Docker + # This script reads a GCE metadata key for the user specified Docker # version, downloads, and replaces the builtin Docker with it. set -x diff --git a/test/e2e_node/node_problem_detector_linux.go b/test/e2e_node/node_problem_detector_linux.go index 9333b66cba..3baf328733 100644 --- a/test/e2e_node/node_problem_detector_linux.go +++ b/test/e2e_node/node_problem_detector_linux.go @@ -66,7 +66,7 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() { framework.KubeDescribe("SystemLogMonitor", func() { const ( // Use test condition to avoid changing the real node condition in use. - // TODO(random-liu): Now node condition could be arbitrary string, consider wether we need to + // TODO(random-liu): Now node condition could be arbitrary string, consider whether we need to // add TestCondition when switching to predefined condition list. condition = v1.NodeConditionType("TestCondition") diff --git a/test/e2e_node/remote/node_conformance.go b/test/e2e_node/remote/node_conformance.go index 625940bf19..117b315862 100644 --- a/test/e2e_node/remote/node_conformance.go +++ b/test/e2e_node/remote/node_conformance.go @@ -102,7 +102,7 @@ func buildConformanceTest(binDir, systemSpecName string) error { func (c *ConformanceRemote) SetupTestPackage(tardir, systemSpecName string) error { // Build the executables if err := builder.BuildGo(); err != nil { - return fmt.Errorf("failed to build the depedencies: %v", err) + return fmt.Errorf("failed to build the dependencies: %v", err) } // Make sure we can find the newly built binaries diff --git a/test/e2e_node/remote/node_e2e.go b/test/e2e_node/remote/node_e2e.go index f95fc2b580..00056aa1cd 100644 --- a/test/e2e_node/remote/node_e2e.go +++ b/test/e2e_node/remote/node_e2e.go @@ -45,7 +45,7 @@ func InitNodeE2ERemote() TestSuite { func (n *NodeE2ERemote) SetupTestPackage(tardir, systemSpecName string) error { // Build the executables if err := builder.BuildGo(); err != nil { - return fmt.Errorf("failed to build the depedencies: %v", err) + return fmt.Errorf("failed to build the dependencies: %v", err) } // Make sure we can find the newly built binaries diff --git a/test/e2e_node/runner/remote/run_remote.go b/test/e2e_node/runner/remote/run_remote.go index 74b591ef0a..054d1cbed5 100644 --- a/test/e2e_node/runner/remote/run_remote.go +++ b/test/e2e_node/runner/remote/run_remote.go @@ -147,7 +147,7 @@ type GCEImage struct { Project string `json:"project"` Metadata string `json:"metadata"` ImageRegex string `json:"image_regex, omitempty"` - // Defaults to using only the latest image. Acceptible values are [0, # of images that match the regex). + // Defaults to using only the latest image. Acceptable values are [0, # of images that match the regex). // If the number of existing previous images is lesser than what is desired, the test will use that is available. PreviousImages int `json:"previous_images, omitempty"` diff --git a/test/images/resource-consumer/controller/controller.go b/test/images/resource-consumer/controller/controller.go index 7e33ceeda8..f0afbd52a0 100644 --- a/test/images/resource-consumer/controller/controller.go +++ b/test/images/resource-consumer/controller/controller.go @@ -78,7 +78,7 @@ func (handler *Controller) ServeHTTP(w http.ResponseWriter, req *http.Request) { } func (handler *Controller) handleConsumeCPU(w http.ResponseWriter, query url.Values) { - // geting string data for consumeCPU + // getting string data for consumeCPU durationSecString := query.Get(DurationSecQuery) millicoresString := query.Get(MillicoresQuery) requestSizeInMillicoresString := query.Get(RequestSizeInMillicoresQuery) @@ -111,7 +111,7 @@ func (handler *Controller) handleConsumeCPU(w http.ResponseWriter, query url.Val } func (handler *Controller) handleConsumeMem(w http.ResponseWriter, query url.Values) { - // geting string data for consumeMem + // getting string data for consumeMem durationSecString := query.Get(DurationSecQuery) megabytesString := query.Get(MegabytesQuery) requestSizeInMegabytesString := query.Get(RequestSizeInMegabytesQuery) @@ -144,7 +144,7 @@ func (handler *Controller) handleConsumeMem(w http.ResponseWriter, query url.Val } func (handler *Controller) handleBumpMetric(w http.ResponseWriter, query url.Values) { - // geting string data for handleBumpMetric + // getting string data for handleBumpMetric metric := query.Get(MetricNameQuery) deltaString := query.Get(DeltaQuery) durationSecString := query.Get(DurationSecQuery) diff --git a/test/images/resource-consumer/resource_consumer_handler.go b/test/images/resource-consumer/resource_consumer_handler.go index 755daba32e..ffcbb04f54 100644 --- a/test/images/resource-consumer/resource_consumer_handler.go +++ b/test/images/resource-consumer/resource_consumer_handler.go @@ -75,7 +75,7 @@ func (handler *ResourceConsumerHandler) ServeHTTP(w http.ResponseWriter, req *ht } func (handler *ResourceConsumerHandler) handleConsumeCPU(w http.ResponseWriter, query url.Values) { - // geting string data for consumeCPU + // getting string data for consumeCPU durationSecString := query.Get(DurationSecQuery) millicoresString := query.Get(MillicoresQuery) if durationSecString == "" || millicoresString == "" { @@ -98,7 +98,7 @@ func (handler *ResourceConsumerHandler) handleConsumeCPU(w http.ResponseWriter, } func (handler *ResourceConsumerHandler) handleConsumeMem(w http.ResponseWriter, query url.Values) { - // geting string data for consumeMem + // getting string data for consumeMem durationSecString := query.Get(DurationSecQuery) megabytesString := query.Get(MegabytesQuery) if durationSecString == "" || megabytesString == "" { @@ -153,7 +153,7 @@ func (handler *ResourceConsumerHandler) bumpMetric(metric string, delta float64, } func (handler *ResourceConsumerHandler) handleBumpMetric(w http.ResponseWriter, query url.Values) { - // geting string data for handleBumpMetric + // getting string data for handleBumpMetric metric := query.Get(MetricNameQuery) deltaString := query.Get(DeltaQuery) durationSecString := query.Get(DurationSecQuery) diff --git a/test/integration/client/client_test.go b/test/integration/client/client_test.go index 928693f848..97a9b9cac3 100644 --- a/test/integration/client/client_test.go +++ b/test/integration/client/client_test.go @@ -563,7 +563,7 @@ func TestSingleWatch(t *testing.T) { func TestMultiWatch(t *testing.T) { // Disable this test as long as it demonstrates a problem. - // TODO: Reenable this test when we get #6059 resolved. + // TODO: Re-enable this test when we get #6059 resolved. t.Skip() const watcherCount = 50 diff --git a/test/integration/etcd/etcd_storage_path_test.go b/test/integration/etcd/etcd_storage_path_test.go index 996c11a9db..1018911ccb 100644 --- a/test/integration/etcd/etcd_storage_path_test.go +++ b/test/integration/etcd/etcd_storage_path_test.go @@ -246,7 +246,7 @@ var etcdStorageData = map[schema.GroupVersionResource]struct { // k8s.io/kubernetes/pkg/apis/events/v1beta1 gvr("events.k8s.io", "v1beta1", "events"): { - stub: `{"metadata": {"name": "event2"}, "regarding": {"namespace": "etcdstoragepathtestnamespace"}, "note": "some data here", "eventTime": "2017-08-09T15:04:05.000000Z", "reportingInstance": "node-xyz", "reportingController": "k8s.io/my-controller", "action": "DidNothing", "reason": "Lazyness"}`, + stub: `{"metadata": {"name": "event2"}, "regarding": {"namespace": "etcdstoragepathtestnamespace"}, "note": "some data here", "eventTime": "2017-08-09T15:04:05.000000Z", "reportingInstance": "node-xyz", "reportingController": "k8s.io/my-controller", "action": "DidNothing", "reason": "Laziness"}`, expectedEtcdPath: "/registry/events/etcdstoragepathtestnamespace/event2", expectedGVK: gvkP("", "v1", "Event"), }, diff --git a/test/integration/garbagecollector/garbage_collector_test.go b/test/integration/garbagecollector/garbage_collector_test.go index b8242ad70f..50746d4b52 100644 --- a/test/integration/garbagecollector/garbage_collector_test.go +++ b/test/integration/garbagecollector/garbage_collector_test.go @@ -851,7 +851,7 @@ func TestCustomResourceCascadingDeletion(t *testing.T) { // between core and custom resources. // // TODO: Consider how this could be represented with table-style tests (e.g. a -// before/after expected object graph given a delete operation targetting a +// before/after expected object graph given a delete operation targeting a // specific node in the before graph with certain delete options). func TestMixedRelationships(t *testing.T) { ctx := setup(t, 5) diff --git a/test/integration/scheduler/local-pv-neg-affinity_test.go b/test/integration/scheduler/local-pv-neg-affinity_test.go index 7cbf774253..51964137ef 100644 --- a/test/integration/scheduler/local-pv-neg-affinity_test.go +++ b/test/integration/scheduler/local-pv-neg-affinity_test.go @@ -82,7 +82,7 @@ func TestLocalPVNegativeAffinity(t *testing.T) { } // Give time to shceduler to attempt to schedule pod if err := waitForPodToSchedule(config.client, pod); err == nil { - t.Errorf("Failed as Pod %s was scheduled sucessfully but expected to fail", pod.Name) + t.Errorf("Failed as Pod %s was scheduled successfully but expected to fail", pod.Name) } // Deleting test pod p, err := config.client.CoreV1().Pods(config.ns).Get(podName, metav1.GetOptions{}) diff --git a/test/integration/scheduler/taint_test.go b/test/integration/scheduler/taint_test.go index bbdb6a7bd7..0c0f4774a8 100644 --- a/test/integration/scheduler/taint_test.go +++ b/test/integration/scheduler/taint_test.go @@ -51,7 +51,7 @@ import ( // TestTaintNodeByCondition verifies: // 1. MemoryPressure Toleration is added to non-BestEffort Pod by PodTolerationRestriction // 2. NodeController taints nodes by node condition -// 3. Scheduler allows pod to tolerate node condition taints, e.g. network unavailabe +// 3. Scheduler allows pod to tolerate node condition taints, e.g. network unavailable func TestTaintNodeByCondition(t *testing.T) { h := &framework.MasterHolder{Initialized: make(chan struct{})} s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { diff --git a/test/integration/scheduler_perf/scheduler_test.go b/test/integration/scheduler_perf/scheduler_test.go index 4d13e22441..419e2d1963 100644 --- a/test/integration/scheduler_perf/scheduler_test.go +++ b/test/integration/scheduler_perf/scheduler_test.go @@ -144,7 +144,7 @@ func schedulePods(config *testConfig) int32 { glog.Fatalf("%v", err) } // 30,000 pods -> wait till @ least 300 are scheduled to start measuring. - // TODO Find out why sometimes there may be scheduling blips in the beggining. + // TODO Find out why sometimes there may be scheduling blips in the beginning. if len(scheduled) > config.numPods/100 { break } diff --git a/test/test_owners.csv b/test/test_owners.csv index 2ae4e9f474..0d30b8f08b 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -89,7 +89,7 @@ DisruptionController should create a PodDisruptionBudget,rkouj,0,scheduling DisruptionController should update PodDisruptionBudget status,rkouj,0,scheduling Docker Containers should be able to override the image's default arguments (docker cmd),maisem,0,node Docker Containers should be able to override the image's default command and arguments,maisem,0,node -Docker Containers should be able to override the image's default commmand (docker entrypoint),maisem,0,node +Docker Containers should be able to override the image's default command (docker entrypoint),maisem,0,node Docker Containers should use the image defaults if command and args are blank,vishh,0,node Downward API should create a pod that prints his name and namespace,nhlfr,0,node Downward API should provide container's limits.cpu/memory and requests.cpu/memory as env vars,deads2k,1,node From 521146e62ddf1d6551c7c6013d208dfd2c73937b Mon Sep 17 00:00:00 2001 From: Di Xu Date: Fri, 9 Feb 2018 15:13:09 +0800 Subject: [PATCH 2/2] auto-generated --- api/openapi-spec/swagger.json | 8 ++++---- api/swagger-spec/apps_v1.json | 2 +- api/swagger-spec/apps_v1beta1.json | 2 +- api/swagger-spec/apps_v1beta2.json | 2 +- api/swagger-spec/batch_v1.json | 2 +- api/swagger-spec/batch_v1beta1.json | 2 +- api/swagger-spec/batch_v2alpha1.json | 2 +- api/swagger-spec/events.k8s.io_v1beta1.json | 2 +- api/swagger-spec/extensions_v1beta1.json | 2 +- api/swagger-spec/settings.k8s.io_v1alpha1.json | 2 +- api/swagger-spec/v1.json | 6 +++--- docs/api-reference/apps/v1/definitions.html | 2 +- docs/api-reference/apps/v1beta1/definitions.html | 2 +- docs/api-reference/apps/v1beta2/definitions.html | 2 +- docs/api-reference/batch/v1/definitions.html | 2 +- docs/api-reference/batch/v1beta1/definitions.html | 2 +- docs/api-reference/batch/v2alpha1/definitions.html | 2 +- docs/api-reference/extensions/v1beta1/definitions.html | 2 +- .../settings.k8s.io/v1alpha1/definitions.html | 2 +- docs/api-reference/v1/definitions.html | 2 +- staging/src/k8s.io/api/core/v1/generated.proto | 2 +- .../src/k8s.io/api/core/v1/types_swagger_doc_generated.go | 6 +++--- .../api/events/v1beta1/types_swagger_doc_generated.go | 2 +- 23 files changed, 30 insertions(+), 30 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 6e286b0737..3ba341e8d2 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -76937,7 +76937,7 @@ "$ref": "#/definitions/io.k8s.api.core.v1.ConfigMapEnvSource" }, "prefix": { - "description": "An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.", + "description": "An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.", "type": "string" }, "secretRef": { @@ -77107,7 +77107,7 @@ ] }, "io.k8s.api.core.v1.EventSeries": { - "description": "EventSeries contain information on series of events, i.e. thing that was/is happening continously for some time.", + "description": "EventSeries contain information on series of events, i.e. thing that was/is happening continuously for some time.", "properties": { "count": { "description": "Number of occurrences in this series up to the last heartbeat time", @@ -77115,7 +77115,7 @@ "format": "int32" }, "lastObservedTime": { - "description": "Time of the last occurence observed", + "description": "Time of the last occurrence observed", "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.MicroTime" }, "state": { @@ -80757,7 +80757,7 @@ ] }, "io.k8s.api.events.v1beta1.EventSeries": { - "description": "EventSeries contain information on series of events, i.e. thing that was/is happening continously for some time.", + "description": "EventSeries contain information on series of events, i.e. thing that was/is happening continuously for some time.", "required": [ "count", "lastObservedTime", diff --git a/api/swagger-spec/apps_v1.json b/api/swagger-spec/apps_v1.json index bf7ebc5903..8fdeacc993 100644 --- a/api/swagger-spec/apps_v1.json +++ b/api/swagger-spec/apps_v1.json @@ -7915,7 +7915,7 @@ "properties": { "prefix": { "type": "string", - "description": "An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." + "description": "An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." }, "configMapRef": { "$ref": "v1.ConfigMapEnvSource", diff --git a/api/swagger-spec/apps_v1beta1.json b/api/swagger-spec/apps_v1beta1.json index e4ca975a59..ca5f8981e4 100644 --- a/api/swagger-spec/apps_v1beta1.json +++ b/api/swagger-spec/apps_v1beta1.json @@ -5549,7 +5549,7 @@ "properties": { "prefix": { "type": "string", - "description": "An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." + "description": "An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." }, "configMapRef": { "$ref": "v1.ConfigMapEnvSource", diff --git a/api/swagger-spec/apps_v1beta2.json b/api/swagger-spec/apps_v1beta2.json index aeb0880472..31b8f3054e 100644 --- a/api/swagger-spec/apps_v1beta2.json +++ b/api/swagger-spec/apps_v1beta2.json @@ -7915,7 +7915,7 @@ "properties": { "prefix": { "type": "string", - "description": "An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." + "description": "An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." }, "configMapRef": { "$ref": "v1.ConfigMapEnvSource", diff --git a/api/swagger-spec/batch_v1.json b/api/swagger-spec/batch_v1.json index 5a0a7b1a76..aed12ec8b5 100644 --- a/api/swagger-spec/batch_v1.json +++ b/api/swagger-spec/batch_v1.json @@ -2889,7 +2889,7 @@ "properties": { "prefix": { "type": "string", - "description": "An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." + "description": "An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." }, "configMapRef": { "$ref": "v1.ConfigMapEnvSource", diff --git a/api/swagger-spec/batch_v1beta1.json b/api/swagger-spec/batch_v1beta1.json index 5dadb0bcd5..e4de35f8f5 100644 --- a/api/swagger-spec/batch_v1beta1.json +++ b/api/swagger-spec/batch_v1beta1.json @@ -2944,7 +2944,7 @@ "properties": { "prefix": { "type": "string", - "description": "An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." + "description": "An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." }, "configMapRef": { "$ref": "v1.ConfigMapEnvSource", diff --git a/api/swagger-spec/batch_v2alpha1.json b/api/swagger-spec/batch_v2alpha1.json index 454dc9133e..b56ce1dd6c 100644 --- a/api/swagger-spec/batch_v2alpha1.json +++ b/api/swagger-spec/batch_v2alpha1.json @@ -2944,7 +2944,7 @@ "properties": { "prefix": { "type": "string", - "description": "An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." + "description": "An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." }, "configMapRef": { "$ref": "v1.ConfigMapEnvSource", diff --git a/api/swagger-spec/events.k8s.io_v1beta1.json b/api/swagger-spec/events.k8s.io_v1beta1.json index 5878a8980a..c9c6185316 100644 --- a/api/swagger-spec/events.k8s.io_v1beta1.json +++ b/api/swagger-spec/events.k8s.io_v1beta1.json @@ -1370,7 +1370,7 @@ }, "v1beta1.EventSeries": { "id": "v1beta1.EventSeries", - "description": "EventSeries contain information on series of events, i.e. thing that was/is happening continously for some time.", + "description": "EventSeries contain information on series of events, i.e. thing that was/is happening continuously for some time.", "required": [ "count", "lastObservedTime", diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json index f45b77dec6..21e9e70dba 100644 --- a/api/swagger-spec/extensions_v1beta1.json +++ b/api/swagger-spec/extensions_v1beta1.json @@ -8557,7 +8557,7 @@ "properties": { "prefix": { "type": "string", - "description": "An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." + "description": "An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." }, "configMapRef": { "$ref": "v1.ConfigMapEnvSource", diff --git a/api/swagger-spec/settings.k8s.io_v1alpha1.json b/api/swagger-spec/settings.k8s.io_v1alpha1.json index fbfdac933f..e8459e6ba9 100644 --- a/api/swagger-spec/settings.k8s.io_v1alpha1.json +++ b/api/swagger-spec/settings.k8s.io_v1alpha1.json @@ -1518,7 +1518,7 @@ "properties": { "prefix": { "type": "string", - "description": "An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." + "description": "An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." }, "configMapRef": { "$ref": "v1.ConfigMapEnvSource", diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 441cf97502..44b6448a4f 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -19730,7 +19730,7 @@ }, "v1.EventSeries": { "id": "v1.EventSeries", - "description": "EventSeries contain information on series of events, i.e. thing that was/is happening continously for some time.", + "description": "EventSeries contain information on series of events, i.e. thing that was/is happening continuously for some time.", "properties": { "count": { "type": "integer", @@ -19739,7 +19739,7 @@ }, "lastObservedTime": { "type": "string", - "description": "Time of the last occurence observed" + "description": "Time of the last occurrence observed" }, "state": { "type": "string", @@ -22390,7 +22390,7 @@ "properties": { "prefix": { "type": "string", - "description": "An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." + "description": "An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER." }, "configMapRef": { "$ref": "v1.ConfigMapEnvSource", diff --git a/docs/api-reference/apps/v1/definitions.html b/docs/api-reference/apps/v1/definitions.html index 24e2dcf29e..38672d876e 100755 --- a/docs/api-reference/apps/v1/definitions.html +++ b/docs/api-reference/apps/v1/definitions.html @@ -2174,7 +2174,7 @@ When an object is created, the system will populate this list with the current s

- + diff --git a/docs/api-reference/apps/v1beta1/definitions.html b/docs/api-reference/apps/v1beta1/definitions.html index 3af498120a..537eb990d1 100755 --- a/docs/api-reference/apps/v1beta1/definitions.html +++ b/docs/api-reference/apps/v1beta1/definitions.html @@ -2189,7 +2189,7 @@ When an object is created, the system will populate this list with the current s - + diff --git a/docs/api-reference/apps/v1beta2/definitions.html b/docs/api-reference/apps/v1beta2/definitions.html index 7cfa2d4fdd..a2ae23fd0a 100755 --- a/docs/api-reference/apps/v1beta2/definitions.html +++ b/docs/api-reference/apps/v1beta2/definitions.html @@ -2591,7 +2591,7 @@ When an object is created, the system will populate this list with the current s - + diff --git a/docs/api-reference/batch/v1/definitions.html b/docs/api-reference/batch/v1/definitions.html index b0113a35ec..656b7d28d7 100755 --- a/docs/api-reference/batch/v1/definitions.html +++ b/docs/api-reference/batch/v1/definitions.html @@ -1765,7 +1765,7 @@ When an object is created, the system will populate this list with the current s - + diff --git a/docs/api-reference/batch/v1beta1/definitions.html b/docs/api-reference/batch/v1beta1/definitions.html index eb90fd3bf8..1f237c8957 100755 --- a/docs/api-reference/batch/v1beta1/definitions.html +++ b/docs/api-reference/batch/v1beta1/definitions.html @@ -1806,7 +1806,7 @@ When an object is created, the system will populate this list with the current s - + diff --git a/docs/api-reference/batch/v2alpha1/definitions.html b/docs/api-reference/batch/v2alpha1/definitions.html index 2cc2084334..ac86a3d3a1 100755 --- a/docs/api-reference/batch/v2alpha1/definitions.html +++ b/docs/api-reference/batch/v2alpha1/definitions.html @@ -1765,7 +1765,7 @@ When an object is created, the system will populate this list with the current s - + diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html index 6ac8e7e35d..48cd6ecfd2 100755 --- a/docs/api-reference/extensions/v1beta1/definitions.html +++ b/docs/api-reference/extensions/v1beta1/definitions.html @@ -2792,7 +2792,7 @@ When an object is created, the system will populate this list with the current s - + diff --git a/docs/api-reference/settings.k8s.io/v1alpha1/definitions.html b/docs/api-reference/settings.k8s.io/v1alpha1/definitions.html index aa446f591a..6449372c13 100755 --- a/docs/api-reference/settings.k8s.io/v1alpha1/definitions.html +++ b/docs/api-reference/settings.k8s.io/v1alpha1/definitions.html @@ -2311,7 +2311,7 @@ When an object is created, the system will populate this list with the current s - + diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index 35ec4b84a9..1a59140b43 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -1659,7 +1659,7 @@ When an object is created, the system will populate this list with the current s - + diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto index 5ce1bcbfd2..4c0e84852f 100644 --- a/staging/src/k8s.io/api/core/v1/generated.proto +++ b/staging/src/k8s.io/api/core/v1/generated.proto @@ -992,7 +992,7 @@ message EndpointsList { // EnvFromSource represents the source of a set of ConfigMaps message EnvFromSource { - // An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. + // An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. // +optional optional string prefix = 1; diff --git a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go index 2c274b13d9..3edb05a62c 100644 --- a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go @@ -510,7 +510,7 @@ func (EndpointsList) SwaggerDoc() map[string]string { var map_EnvFromSource = map[string]string{ "": "EnvFromSource represents the source of a set of ConfigMaps", - "prefix": "An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.", + "prefix": "An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.", "configMapRef": "The ConfigMap to select from", "secretRef": "The Secret to select from", } @@ -576,9 +576,9 @@ func (EventList) SwaggerDoc() map[string]string { } var map_EventSeries = map[string]string{ - "": "EventSeries contain information on series of events, i.e. thing that was/is happening continously for some time.", + "": "EventSeries contain information on series of events, i.e. thing that was/is happening continuously for some time.", "count": "Number of occurrences in this series up to the last heartbeat time", - "lastObservedTime": "Time of the last occurence observed", + "lastObservedTime": "Time of the last occurrence observed", "state": "State of this Series: Ongoing or Finished", } diff --git a/staging/src/k8s.io/api/events/v1beta1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/events/v1beta1/types_swagger_doc_generated.go index 04a4a91227..17ec3d7777 100644 --- a/staging/src/k8s.io/api/events/v1beta1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/api/events/v1beta1/types_swagger_doc_generated.go @@ -60,7 +60,7 @@ func (EventList) SwaggerDoc() map[string]string { } var map_EventSeries = map[string]string{ - "": "EventSeries contain information on series of events, i.e. thing that was/is happening continously for some time.", + "": "EventSeries contain information on series of events, i.e. thing that was/is happening continuously for some time.", "count": "Number of occurrences in this series up to the last heartbeat time", "lastObservedTime": "Time when last Event from the series was seen before last heartbeat.", "state": "Information whether this series is ongoing or finished.",

lastObservedTime

Time of the last occurence observed

Time of the last occurrence observed

false

string

prefix

An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

false

string

prefix

An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

false

string

prefix

An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

false

string

prefix

An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

false

string

prefix

An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

false

string

prefix

An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

false

string

prefix

An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

false

string

prefix

An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

false

string

prefix

An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

false

string