diff --git a/build/common.sh b/build/common.sh index 03991cfa146..9aafdbdea5e 100644 --- a/build/common.sh +++ b/build/common.sh @@ -141,7 +141,7 @@ function kube::build::verify_prereqs() { echo echo "Possible causes:" echo " - On Mac OS X, boot2docker VM isn't installed or started" - echo " - On Mac OS X, docker env variable isn't set approriately. Run:" + echo " - On Mac OS X, docker env variable isn't set appropriately. Run:" echo " \$(boot2docker shellinit)" echo " - On Linux, user isn't in 'docker' group. Add and relogin." echo " - Something like 'sudo usermod -a -G docker ${USER-user}'" diff --git a/cluster/azure/util.sh b/cluster/azure/util.sh index f78c31da0da..e8c9a215064 100644 --- a/cluster/azure/util.sh +++ b/cluster/azure/util.sh @@ -145,7 +145,7 @@ function upload-server-tars() { echo "==> SERVER_BINARY_TAR_URL: $SERVER_BINARY_TAR_URL" echo "==> SALT_TAR_URL: $SALT_TAR_URL" - echo "--> Checking storage exsists..." + echo "--> Checking storage exists..." if [[ -z "$(azure_call storage account show $AZ_STG 2>/dev/null | \ grep data)" ]]; then echo "--> Creating storage..." @@ -156,7 +156,7 @@ function upload-server-tars() { stg_key=$(azure_call storage account keys list $AZ_STG --json | \ json_val '["primaryKey"]') - echo "--> Checking storage container exsists..." + echo "--> Checking storage container exists..." if [[ -z "$(azure_call storage container show -a $AZ_STG -k "$stg_key" \ $CONTAINER 2>/dev/null | grep data)" ]]; then echo "--> Creating storage container..." @@ -409,7 +409,7 @@ function kube-up { $AZ_CS $AZ_IMAGE $USER done - echo "--> Createing endpoint" + echo "--> Creating endpoint" azure_call vm endpoint create $MASTER_NAME 443 detect-master > /dev/null @@ -572,4 +572,4 @@ function setup-logging { function teardown-logging { echo "TODO: teardown logging" -} \ No newline at end of file +} diff --git a/cluster/kubectl.sh b/cluster/kubectl.sh index 56687361ab9..9642c22e426 100755 --- a/cluster/kubectl.sh +++ b/cluster/kubectl.sh @@ -90,7 +90,7 @@ if [[ -z "${KUBECTL_PATH:-}" ]]; then fi elif [[ ! -x "${KUBECTL_PATH}" ]]; then { - echo "KUBECTL_PATH enviroment variable set to '${KUBECTL_PATH}', but " + echo "KUBECTL_PATH environment variable set to '${KUBECTL_PATH}', but " echo "this doesn't seem to be a valid executable." } >&2 exit 1 diff --git a/docs/kubectl.md b/docs/kubectl.md index 0ddcd4fb0af..ba215831028 100644 --- a/docs/kubectl.md +++ b/docs/kubectl.md @@ -137,7 +137,7 @@ Usage: --validate=false: If true, use a schema to validate the input before sending it --vmodule=: comma-separated list of pattern=N settings for file-filtered logging -w, --watch=false: After listing/getting the requested object, watch for changes. - --watch-only=false: Watch for changes to the requseted object(s), without listing/getting first. + --watch-only=false: Watch for changes to the requested object(s), without listing/getting first. ``` @@ -364,7 +364,7 @@ Available Commands: --global=false: use the .kubeconfig from /home/username --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure. --kubeconfig="": use a particular .kubeconfig file - --local=true: use the .kubeconfig in the currect directory + --local=true: use the .kubeconfig in the current directory --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace --log_dir=: If non-empty, write log files in this directory --log_flush_frequency=5s: Maximum number of seconds between log flushes @@ -418,7 +418,7 @@ Usage: -h, --help=false: help for view --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure. --kubeconfig="": use a particular .kubeconfig file - --local=true: use the .kubeconfig in the currect directory + --local=true: use the .kubeconfig in the current directory --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace --log_dir=: If non-empty, write log files in this directory --log_flush_frequency=5s: Maximum number of seconds between log flushes @@ -460,7 +460,7 @@ Usage: -h, --help=false: help for set-cluster --insecure-skip-tls-verify=false: insecure-skip-tls-verify for the cluster entry in .kubeconfig --kubeconfig="": use a particular .kubeconfig file - --local=true: use the .kubeconfig in the currect directory + --local=true: use the .kubeconfig in the current directory --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace --log_dir=: If non-empty, write log files in this directory --log_flush_frequency=5s: Maximum number of seconds between log flushes @@ -501,7 +501,7 @@ Usage: -h, --help=false: help for set-credentials --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure. --kubeconfig="": use a particular .kubeconfig file - --local=true: use the .kubeconfig in the currect directory + --local=true: use the .kubeconfig in the current directory --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace --log_dir=: If non-empty, write log files in this directory --log_flush_frequency=5s: Maximum number of seconds between log flushes @@ -542,7 +542,7 @@ Usage: -h, --help=false: help for set-context --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure. --kubeconfig="": use a particular .kubeconfig file - --local=true: use the .kubeconfig in the currect directory + --local=true: use the .kubeconfig in the current directory --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace --log_dir=: If non-empty, write log files in this directory --log_flush_frequency=5s: Maximum number of seconds between log flushes @@ -585,7 +585,7 @@ Usage: -h, --help=false: help for config --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure. --kubeconfig="": use a particular .kubeconfig file - --local=true: use the .kubeconfig in the currect directory + --local=true: use the .kubeconfig in the current directory --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace --log_dir=: If non-empty, write log files in this directory --log_flush_frequency=5s: Maximum number of seconds between log flushes @@ -626,7 +626,7 @@ Usage: -h, --help=false: help for config --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure. --kubeconfig="": use a particular .kubeconfig file - --local=true: use the .kubeconfig in the currect directory + --local=true: use the .kubeconfig in the current directory --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace --log_dir=: If non-empty, write log files in this directory --log_flush_frequency=5s: Maximum number of seconds between log flushes @@ -664,7 +664,7 @@ Usage: -h, --help=false: help for config --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure. --kubeconfig="": use a particular .kubeconfig file - --local=true: use the .kubeconfig in the currect directory + --local=true: use the .kubeconfig in the current directory --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace --log_dir=: If non-empty, write log files in this directory --log_flush_frequency=5s: Maximum number of seconds between log flushes diff --git a/pkg/api/meta/restmapper_test.go b/pkg/api/meta/restmapper_test.go index 02eb507777f..62b25111182 100644 --- a/pkg/api/meta/restmapper_test.go +++ b/pkg/api/meta/restmapper_test.go @@ -115,7 +115,7 @@ func TestKindToResource(t *testing.T) { for i, testCase := range testCases { plural, singular := kindToResource(testCase.Kind, testCase.MixedCase) if singular != testCase.Singular || plural != testCase.Plural { - t.Errorf("%d: unexpected plural and signular: %s %s", i, plural, singular) + t.Errorf("%d: unexpected plural and singular: %s %s", i, plural, singular) } } } diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go index 352c9d6f0eb..ba94be8ec97 100644 --- a/pkg/api/validation/validation_test.go +++ b/pkg/api/validation/validation_test.go @@ -1086,7 +1086,7 @@ func TestValidateReplicationController(t *testing.T) { Selector: validSelector, }, }, - "read-write presistent disk": { + "read-write persistent disk": { ObjectMeta: api.ObjectMeta{Name: "abc"}, Spec: api.ReplicationControllerSpec{ Selector: validSelector, diff --git a/pkg/client/clientcmd/validation.go b/pkg/client/clientcmd/validation.go index 6a2f63f0fba..aa9b9e64e7d 100644 --- a/pkg/client/clientcmd/validation.go +++ b/pkg/client/clientcmd/validation.go @@ -180,7 +180,7 @@ func validateContext(contextName string, context clientcmdapi.Context, config cl } if (len(context.Namespace) != 0) && !util.IsDNS952Label(context.Namespace) { - validationErrors = append(validationErrors, fmt.Errorf("namespace, %v, for context %v, does not conform to the kubernetest DNS952 rules", context.Namespace, contextName)) + validationErrors = append(validationErrors, fmt.Errorf("namespace, %v, for context %v, does not conform to the kubernetes DNS952 rules", context.Namespace, contextName)) } return validationErrors diff --git a/pkg/kubecfg/resource_printer_test.go b/pkg/kubecfg/resource_printer_test.go index d3144b248d9..19db87de636 100644 --- a/pkg/kubecfg/resource_printer_test.go +++ b/pkg/kubecfg/resource_printer_test.go @@ -77,7 +77,7 @@ func TestYAMLPrinterPrint(t *testing.T) { var objOut api.Pod err = yaml.Unmarshal([]byte(buf.String()), &objOut) if err != nil { - t.Errorf("Unexpeted error: %#v", err) + t.Errorf("Unexpected error: %#v", err) } if !reflect.DeepEqual(obj, &objOut) { t.Errorf("Unexpected inequality: %#v vs %#v", obj, &objOut) @@ -100,7 +100,7 @@ func TestIdentityPrinter(t *testing.T) { printer.PrintObj(obj, buff) objOut, err := latest.Codec.Decode([]byte(buff.String())) if err != nil { - t.Errorf("Unexpeted error: %#v", err) + t.Errorf("Unexpected error: %#v", err) } if !reflect.DeepEqual(obj, objOut) { t.Errorf("Unexpected inequality: %#v vs %#v", obj, objOut) diff --git a/pkg/kubectl/cmd/config/config.go b/pkg/kubectl/cmd/config/config.go index e73fb841635..4c6bf23a69c 100644 --- a/pkg/kubectl/cmd/config/config.go +++ b/pkg/kubectl/cmd/config/config.go @@ -47,7 +47,7 @@ func NewCmdConfig(out io.Writer) *cobra.Command { } // file paths are common to all sub commands - cmd.PersistentFlags().BoolVar(&pathOptions.local, "local", true, "use the .kubeconfig in the currect directory") + cmd.PersistentFlags().BoolVar(&pathOptions.local, "local", true, "use the .kubeconfig in the current directory") cmd.PersistentFlags().BoolVar(&pathOptions.global, "global", false, "use the .kubeconfig from "+os.Getenv("HOME")) cmd.PersistentFlags().StringVar(&pathOptions.specifiedFile, "kubeconfig", "", "use a particular .kubeconfig file") diff --git a/pkg/kubectl/cmd/get.go b/pkg/kubectl/cmd/get.go index 01989534e82..febe5ba22c8 100644 --- a/pkg/kubectl/cmd/get.go +++ b/pkg/kubectl/cmd/get.go @@ -62,7 +62,7 @@ Examples: AddPrinterFlags(cmd) cmd.Flags().StringP("selector", "l", "", "Selector (label query) to filter on") cmd.Flags().BoolP("watch", "w", false, "After listing/getting the requested object, watch for changes.") - cmd.Flags().Bool("watch-only", false, "Watch for changes to the requseted object(s), without listing/getting first.") + cmd.Flags().Bool("watch-only", false, "Watch for changes to the requested object(s), without listing/getting first.") return cmd } diff --git a/pkg/kubelet/dockertools/docker_test.go b/pkg/kubelet/dockertools/docker_test.go index d62a16d7145..df1cf58c539 100644 --- a/pkg/kubelet/dockertools/docker_test.go +++ b/pkg/kubelet/dockertools/docker_test.go @@ -169,7 +169,7 @@ func TestDockerContainerCommand(t *testing.T) { t.Errorf("unexpected command CWD: %s", cmd.Dir) } if !reflect.DeepEqual(cmd.Args, []string{"/usr/sbin/nsinit", "exec", "ls"}) { - t.Errorf("unexpectd command args: %s", cmd.Args) + t.Errorf("unexpected command args: %s", cmd.Args) } } diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index df8427141a6..b8a92f28b7b 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -1345,10 +1345,10 @@ func TestRunInContainer(t *testing.T) { containerName, cmd) if fakeCommandRunner.ID != containerID { - t.Errorf("unexected Name: %s", fakeCommandRunner.ID) + t.Errorf("unexpected Name: %s", fakeCommandRunner.ID) } if !reflect.DeepEqual(fakeCommandRunner.Cmd, cmd) { - t.Errorf("unexpected commnd: %s", fakeCommandRunner.Cmd) + t.Errorf("unexpected command: %s", fakeCommandRunner.Cmd) } if err != nil { t.Errorf("unexpected error: %v", err) diff --git a/pkg/master/master.go b/pkg/master/master.go index 3fa899ff7ef..796dcf20393 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -196,7 +196,7 @@ func setDefaults(c *Config) { break } if !found { - glog.Errorf("Unable to find suitible network address in list: '%v'\n"+ + glog.Errorf("Unable to find suitable network address in list: '%v'\n"+ "Will try again in 5 seconds. Set the public address directly to avoid this wait.", addrs) time.Sleep(5 * time.Second) } diff --git a/pkg/standalone/standalone.go b/pkg/standalone/standalone.go index b3d7218dcb3..7a06591c5fe 100644 --- a/pkg/standalone/standalone.go +++ b/pkg/standalone/standalone.go @@ -72,7 +72,7 @@ func GetAPIServerClient(authPath string, apiServerList util.StringList) (*client } // TODO: adapt Kube client to support LB over several servers if len(apiServerList) > 1 { - glog.Infof("Mulitple api servers specified. Picking first one") + glog.Infof("Multiple api servers specified. Picking first one") } clientConfig.Host = apiServerList[0] c, err := client.New(&clientConfig) diff --git a/pkg/volume/volume_test.go b/pkg/volume/volume_test.go index 87bf22c65e4..74eb900fd51 100644 --- a/pkg/volume/volume_test.go +++ b/pkg/volume/volume_test.go @@ -150,7 +150,7 @@ func TestCreateVolumeCleaners(t *testing.T) { continue } if err != nil { - t.Errorf("Unexpected error occured: %v", err) + t.Errorf("Unexpected error occurred: %v", err) } actualKind := reflect.TypeOf(vol).Elem().Name() if tt.kind == "empty" && actualKind != "EmptyDir" { diff --git a/plugin/pkg/scheduler/algorithmprovider/plugins_test.go b/plugin/pkg/scheduler/algorithmprovider/plugins_test.go index 8a205961a72..b70d55fc789 100644 --- a/plugin/pkg/scheduler/algorithmprovider/plugins_test.go +++ b/plugin/pkg/scheduler/algorithmprovider/plugins_test.go @@ -33,7 +33,7 @@ var ( func TestDefaultConfigExists(t *testing.T) { p, err := factory.GetAlgorithmProvider(factory.DefaultProvider) if err != nil { - t.Errorf("error retrivieving default provider: %v", err) + t.Errorf("error retrieving default provider: %v", err) } if p == nil { t.Error("algorithm provider config should not be nil") @@ -47,7 +47,7 @@ func TestAlgorithmProviders(t *testing.T) { for _, pn := range algorithmProviderNames { p, err := factory.GetAlgorithmProvider(pn) if err != nil { - t.Errorf("error retrivieving '%s' provider: %v", pn, err) + t.Errorf("error retrieving '%s' provider: %v", pn, err) break } if len(p.PriorityFunctionKeys) == 0 { @@ -55,12 +55,12 @@ func TestAlgorithmProviders(t *testing.T) { } for _, pf := range p.PriorityFunctionKeys.List() { if !factory.IsPriorityFunctionRegistered(pf) { - t.Errorf("priority function %s is not registerd but is used in the %s algorithm provider", pf, pn) + t.Errorf("priority function %s is not registered but is used in the %s algorithm provider", pf, pn) } } for _, fp := range p.FitPredicateKeys.List() { if !factory.IsFitPredicateRegistered(fp) { - t.Errorf("fit predicate %s is not registerd but is used in the %s algorithm provider", fp, pn) + t.Errorf("fit predicate %s is not registered but is used in the %s algorithm provider", fp, pn) } } } diff --git a/test/e2e/basic.go b/test/e2e/basic.go index 703bb7ca13b..05d449f64a5 100644 --- a/test/e2e/basic.go +++ b/test/e2e/basic.go @@ -55,7 +55,7 @@ func TestBasicImage(c *client.Client, image string) bool { } // Delete the controller if err = c.ReplicationControllers(ns).Delete(name); err != nil { - glog.Warningf("Failed to delete straggler replicatior controller: %v", err) + glog.Warningf("Failed to delete straggler replication controller: %v", err) } break } @@ -154,7 +154,7 @@ func TestBasicImage(c *client.Client, image string) bool { // Resize the replication controller to zero to get rid of pods. controller.Spec.Replicas = 0 if _, err = c.ReplicationControllers(ns).Update(controller); err != nil { - glog.Errorf("Failed to resize replication controllert to zero: %v", err) + glog.Errorf("Failed to resize replication controller to zero: %v", err) return false } diff --git a/test/e2e/private.go b/test/e2e/private.go index 03d97c6ca05..f612d9773e7 100644 --- a/test/e2e/private.go +++ b/test/e2e/private.go @@ -27,7 +27,7 @@ import ( // for the providers GCE and GKE. func TestPrivate(c *client.Client) bool { if testContext.provider != "gce" && testContext.provider != "gke" { - glog.Infof("Skipping test private which is only supported for proivders gce and gke (not %s)", testContext.provider) + glog.Infof("Skipping test private which is only supported for providers gce and gke (not %s)", testContext.provider) return true } glog.Info("Calling out to TestBasic")