mirror of https://github.com/k3s-io/k3s
Fix typos in user-facing strings
parent
eeb712d163
commit
6dee1d7fa4
|
@ -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}'"
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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")
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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" {
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -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")
|
||||
|
|
Loading…
Reference in New Issue