From cd1450b3ecf122396ef942b6fc9d2f38663d8ff6 Mon Sep 17 00:00:00 2001
From: Robert Deusser <iamthemuffinman@outlook.com>
Date: Sat, 18 Jun 2016 11:51:56 -0400
Subject: [PATCH] Fix spelling errors

More spelling fixes
---
 .../pkg/federation-controller/service/service_helper.go       | 3 ++-
 test/e2e/framework/util.go                                    | 4 ++--
 test/e2e/petset.go                                            | 2 +-
 test/integration/garbage_collector_test.go                    | 2 +-
 test/integration/kubectl_test.go                              | 2 +-
 test/integration/persistent_volumes_test.go                   | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/federation/pkg/federation-controller/service/service_helper.go b/federation/pkg/federation-controller/service/service_helper.go
index f6c38e79348..061e750580c 100644
--- a/federation/pkg/federation-controller/service/service_helper.go
+++ b/federation/pkg/federation-controller/service/service_helper.go
@@ -26,9 +26,10 @@ import (
 	cache "k8s.io/kubernetes/pkg/client/cache"
 	"k8s.io/kubernetes/pkg/controller"
 
-	"github.com/golang/glog"
 	"reflect"
 	"sort"
+
+	"github.com/golang/glog"
 )
 
 // worker runs a worker thread that just dequeues items, processes them, and marks them done.
diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go
index cd9efab0624..2694cc02534 100644
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -1799,7 +1799,7 @@ func Cleanup(filePath, ns string, selectors ...string) {
 	AssertCleanup(ns, selectors...)
 }
 
-// Asserts that cleanup of a namespace wrt selectors occured.
+// Asserts that cleanup of a namespace wrt selectors occurred.
 func AssertCleanup(ns string, selectors ...string) {
 	var nsArg string
 	if ns != "" {
@@ -3734,7 +3734,7 @@ func RestartApiserver(c *client.Client) error {
 	if ProviderIs("gce", "aws") {
 		return sshRestartMaster()
 	}
-	// GKE doesn't allow ssh accesss, so use a same-version master
+	// GKE doesn't allow ssh access, so use a same-version master
 	// upgrade to teardown/recreate master.
 	v, err := c.ServerVersion()
 	if err != nil {
diff --git a/test/e2e/petset.go b/test/e2e/petset.go
index 60c8803ec5e..d50d10b30ba 100644
--- a/test/e2e/petset.go
+++ b/test/e2e/petset.go
@@ -449,7 +449,7 @@ func (p *petSetTester) execInPets(ps *apps.PetSet, cmd string) error {
 }
 
 func (p *petSetTester) saturate(ps *apps.PetSet) {
-	// TOOD: Watch events and check that creation timestamps don't overlap
+	// TODO: Watch events and check that creation timestamps don't overlap
 	for i := 0; i < ps.Spec.Replicas; i++ {
 		framework.Logf("Waiting for pet at index " + fmt.Sprintf("%v", i+1) + " to enter Running")
 		p.waitForRunning(i+1, ps)
diff --git a/test/integration/garbage_collector_test.go b/test/integration/garbage_collector_test.go
index dda8969c347..ca4592f97c7 100644
--- a/test/integration/garbage_collector_test.go
+++ b/test/integration/garbage_collector_test.go
@@ -180,7 +180,7 @@ func TestCascadingDeletion(t *testing.T) {
 		t.Fatalf("Failed to create Pod: %v", err)
 	}
 
-	// this pod shouldn't be cascadingly deleted, because it has a valid referenece.
+	// this pod shouldn't be cascadingly deleted, because it has a valid reference.
 	pod = newPod(oneValidOwnerPodName, []v1.OwnerReference{
 		{UID: toBeDeletedRC.ObjectMeta.UID, Name: toBeDeletedRCName},
 		{UID: remainingRC.ObjectMeta.UID, Name: remainingRCName},
diff --git a/test/integration/kubectl_test.go b/test/integration/kubectl_test.go
index b17e97feda0..8853c43468f 100644
--- a/test/integration/kubectl_test.go
+++ b/test/integration/kubectl_test.go
@@ -37,7 +37,7 @@ func TestKubectlValidation(t *testing.T) {
 		{`{"apiVersion": "v1", "kind": "Pod"}`, false},
 
 		// The following test the experimental api.
-		// TOOD: Replace with something more robust. These may move.
+		// TODO: Replace with something more robust. These may move.
 		{`{"apiVersion": "extensions/v1beta1", "kind": "Ingress"}`, false},
 		{`{"apiVersion": "extensions/v1beta1", "kind": "Job"}`, false},
 		{`{"apiVersion": "vNotAVersion", "kind": "Job"}`, true},
diff --git a/test/integration/persistent_volumes_test.go b/test/integration/persistent_volumes_test.go
index faa262df02e..241e9aef5a7 100644
--- a/test/integration/persistent_volumes_test.go
+++ b/test/integration/persistent_volumes_test.go
@@ -48,7 +48,7 @@ func init() {
 	requireEtcd()
 }
 
-// Several tests in this file are configurable by enviroment variables:
+// Several tests in this file are configurable by environment variables:
 // KUBE_INTEGRATION_PV_OBJECTS - nr. of PVs/PVCs to be created
 //      (100 by default)
 // KUBE_INTEGRATION_PV_SYNC_PERIOD - volume controller sync period