From b3b9bcc04cee944a3c318b0e4453a360cf98a790 Mon Sep 17 00:00:00 2001
From: "Aaron.L.Xu" <likexu@harmonycloud.cn>
Date: Tue, 20 Dec 2016 04:56:45 -0800
Subject: [PATCH 1/5] fix typo for cluster/*

---
 cluster/images/etcd/rollback/rollback.go | 3 ++-
 cluster/ubuntu/util.sh                   | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cluster/images/etcd/rollback/rollback.go b/cluster/images/etcd/rollback/rollback.go
index 5ae0e821a8a..fb4a52d8f36 100644
--- a/cluster/images/etcd/rollback/rollback.go
+++ b/cluster/images/etcd/rollback/rollback.go
@@ -325,7 +325,8 @@ func applyRequest(r *pb.Request, applyV2 etcdserver.ApplierV2) {
 		applyV2.Put(r)
 	case "DELETE":
 		applyV2.Delete(r)
-	case "POST", "QGET", "SYNC":
+	//case "POST", "QGET", "SYNC":
+	case "POST", "GET", "SYNC":
 		return
 	default:
 		glog.Fatal("unknown command")
diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh
index 5d3806c5eda..581c4716c6b 100755
--- a/cluster/ubuntu/util.sh
+++ b/cluster/ubuntu/util.sh
@@ -71,7 +71,7 @@ function setClusterInfo() {
 # Sanity check on $CNI_PLUGIN_CONF and $CNI_PLUGIN_EXES
 function check-CNI-config() {
   if [ -z "$CNI_PLUGIN_CONF" ] && [ -n "$CNI_PLUGIN_EXES" ]; then
-    echo "Warning: CNI_PLUGIN_CONF is emtpy but CNI_PLUGIN_EXES is not (it is $CNI_PLUGIN_EXES); Flannel will be used" >& 2
+    echo "Warning: CNI_PLUGIN_CONF is empty but CNI_PLUGIN_EXES is not (it is $CNI_PLUGIN_EXES); Flannel will be used" >& 2
   elif [ -n "$CNI_PLUGIN_CONF" ] && [ -z "$CNI_PLUGIN_EXES" ]; then
     echo "Warning: CNI_PLUGIN_EXES is empty but CNI_PLUGIN_CONF is not (it is $CNI_PLUGIN_CONF); Flannel will be used" & 2
   elif [ -n "$CNI_PLUGIN_CONF" ] && [ -n "$CNI_PLUGIN_EXES" ]; then
@@ -545,7 +545,7 @@ function provision-node() {
     BASH_DEBUG_FLAGS="set -x"
   fi
 
-  # remote login to node and configue k8s node
+  # remote login to node and configure k8s node
   ssh $SSH_OPTS -t "$1" "
     set +e
     ${BASH_DEBUG_FLAGS}
@@ -638,7 +638,7 @@ function provision-masterandnode() {
     BASH_DEBUG_FLAGS="set -x"
   fi
 
-  # remote login to the master/node and configue k8s
+  # remote login to the master/node and configure k8s
   ssh $SSH_OPTS -t "$MASTER" "
     set +e
     ${BASH_DEBUG_FLAGS}

From 853167624edb6bc0cfdcdfb88e746e178f5db36c Mon Sep 17 00:00:00 2001
From: "Aaron.L.Xu" <likexu@harmonycloud.cn>
Date: Tue, 20 Dec 2016 20:00:10 -0800
Subject: [PATCH 2/5] fix typo for federation/*

---
 federation/apis/federation/types.go                  |  6 +++---
 federation/apis/federation/v1beta1/types.go          |  2 +-
 .../apis/federation/validation/validation_test.go    |  2 +-
 federation/pkg/dnsprovider/plugins.go                |  2 +-
 .../dnsprovider/providers/aws/route53/interface.go   |  2 +-
 .../providers/aws/route53/stubs/route53api.go        |  2 +-
 .../pkg/dnsprovider/providers/aws/route53/zone.go    |  2 +-
 .../pkg/dnsprovider/providers/aws/route53/zones.go   |  2 +-
 .../google/clouddns/internal/changes_create_call.go  |  2 +-
 .../google/clouddns/internal/changes_service.go      |  2 +-
 .../google/clouddns/internal/managed_zone.go         |  2 +-
 .../clouddns/internal/managed_zone_create_call.go    |  2 +-
 .../clouddns/internal/managed_zones_delete_call.go   |  2 +-
 .../clouddns/internal/managed_zones_get_call.go      |  2 +-
 .../clouddns/internal/managed_zones_list_call.go     |  2 +-
 .../clouddns/internal/managed_zones_list_response.go |  2 +-
 .../clouddns/internal/managed_zones_service.go       |  2 +-
 .../providers/google/clouddns/internal/rrset.go      |  2 +-
 .../google/clouddns/internal/rrsets_list_call.go     |  2 +-
 .../google/clouddns/internal/rrsets_list_response.go |  2 +-
 .../google/clouddns/internal/rrsets_service.go       |  2 +-
 .../providers/google/clouddns/internal/service.go    |  2 +-
 .../google/clouddns/internal/stubs/change.go         |  2 +-
 .../clouddns/internal/stubs/changes_create_call.go   |  2 +-
 .../clouddns/internal/stubs/changes_service.go       |  2 +-
 .../google/clouddns/internal/stubs/managed_zone.go   |  2 +-
 .../internal/stubs/managed_zone_create_call.go       |  2 +-
 .../internal/stubs/managed_zones_delete_call.go      |  2 +-
 .../internal/stubs/managed_zones_get_call.go         |  2 +-
 .../internal/stubs/managed_zones_list_call.go        |  2 +-
 .../internal/stubs/managed_zones_list_response.go    |  2 +-
 .../clouddns/internal/stubs/managed_zones_service.go |  2 +-
 .../google/clouddns/internal/stubs/rrset.go          |  2 +-
 .../clouddns/internal/stubs/rrsets_list_call.go      |  2 +-
 .../clouddns/internal/stubs/rrsets_list_response.go  |  2 +-
 .../google/clouddns/internal/stubs/rrsets_service.go |  4 ++--
 .../dnsprovider/providers/google/clouddns/rrset.go   |  2 +-
 .../ingress/ingress_controller.go                    | 12 ++++++------
 .../ingress/ingress_controller_test.go               |  2 +-
 .../namespace/namespace_controller.go                | 10 +++++-----
 .../secret/secret_controller.go                      |  2 +-
 .../secret/secret_controller_test.go                 |  2 +-
 .../federation-controller/service/cluster_helper.go  |  2 +-
 .../service/servicecontroller.go                     |  6 +++---
 .../pkg/federation-controller/util/cluster_util.go   |  4 ++--
 .../pkg/federation-controller/util/configmap.go      |  2 +-
 .../pkg/federation-controller/util/deployment.go     |  2 +-
 .../util/eventsink/eventsink.go                      |  2 +-
 .../federation-controller/util/federated_informer.go |  4 ++--
 .../federation-controller/util/planner/planner.go    |  6 +++---
 federation/pkg/federation-controller/util/secret.go  |  2 +-
 .../federation-controller/util/test/test_helper.go   |  6 +++---
 federation/pkg/kubefed/init/init.go                  |  2 +-
 federation/pkg/kubefed/util/util.go                  |  2 +-
 54 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/federation/apis/federation/types.go b/federation/apis/federation/types.go
index 218f8e60b91..8c1d948d56d 100644
--- a/federation/apis/federation/types.go
+++ b/federation/apis/federation/types.go
@@ -76,7 +76,7 @@ type ClusterCondition struct {
 	Message string
 }
 
-// ClusterStatus is information about the current status of a cluster updated by cluster controller peridocally.
+// ClusterStatus is information about the current status of a cluster updated by cluster controller periodically.
 type ClusterStatus struct {
 	// Conditions is an array of current cluster conditions.
 	// +optional
@@ -124,8 +124,8 @@ type ClusterList struct {
 // Temporary/alpha structures to support custom replica assignments within FederatedReplicaSet.
 
 // A set of preferences that can be added to federated version of ReplicaSet as a json-serialized annotation.
-// The preferences allow the user to express in which culsters he wants to put his replicas within the
-// mentiond FederatedReplicaSet.
+// The preferences allow the user to express in which clusters he wants to put his replicas within the
+// mentioned FederatedReplicaSet.
 type FederatedReplicaSetPreferences struct {
 	// If set to true then already scheduled and running replicas may be moved to other clusters to
 	// in order to bring cluster replicasets towards a desired state. Otherwise, if set to false,
diff --git a/federation/apis/federation/v1beta1/types.go b/federation/apis/federation/v1beta1/types.go
index 429ba1b946e..74a2f485560 100644
--- a/federation/apis/federation/v1beta1/types.go
+++ b/federation/apis/federation/v1beta1/types.go
@@ -76,7 +76,7 @@ type ClusterCondition struct {
 	Message string `json:"message,omitempty" protobuf:"bytes,6,opt,name=message"`
 }
 
-// ClusterStatus is information about the current status of a cluster updated by cluster controller peridocally.
+// ClusterStatus is information about the current status of a cluster updated by cluster controller periodically.
 type ClusterStatus struct {
 	// Conditions is an array of current cluster conditions.
 	// +optional
diff --git a/federation/apis/federation/validation/validation_test.go b/federation/apis/federation/validation/validation_test.go
index 54fea7a756d..d1ec2dc86a7 100644
--- a/federation/apis/federation/validation/validation_test.go
+++ b/federation/apis/federation/validation/validation_test.go
@@ -76,7 +76,7 @@ func TestValidateCluster(t *testing.T) {
 	for testName, errorCase := range errorCases {
 		errs := ValidateCluster(&errorCase)
 		if len(errs) == 0 {
-			t.Errorf("expected failur for %s", testName)
+			t.Errorf("expected failure for %s", testName)
 		}
 	}
 }
diff --git a/federation/pkg/dnsprovider/plugins.go b/federation/pkg/dnsprovider/plugins.go
index 72f7c507bab..affaf404e3c 100644
--- a/federation/pkg/dnsprovider/plugins.go
+++ b/federation/pkg/dnsprovider/plugins.go
@@ -51,7 +51,7 @@ func RegisterDnsProvider(name string, cloud Factory) {
 // the name is not known.  The error return is only used if the named provider
 // was known but failed to initialize. The config parameter specifies the
 // io.Reader handler of the configuration file for the DNS provider, or nil
-// for no configuation.
+// for no configuration.
 func GetDnsProvider(name string, config io.Reader) (Interface, error) {
 	providersMutex.Lock()
 	defer providersMutex.Unlock()
diff --git a/federation/pkg/dnsprovider/providers/aws/route53/interface.go b/federation/pkg/dnsprovider/providers/aws/route53/interface.go
index 3567dff2cbf..bda35229b66 100644
--- a/federation/pkg/dnsprovider/providers/aws/route53/interface.go
+++ b/federation/pkg/dnsprovider/providers/aws/route53/interface.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/aws/route53/stubs"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ dnsprovider.Interface = Interface{}
 
 type Interface struct {
diff --git a/federation/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go b/federation/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go
index 07933b72044..b09155a6da0 100644
--- a/federation/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go
+++ b/federation/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go
@@ -44,7 +44,7 @@ type Route53APIStub struct {
 	recordSets map[string]map[string][]*route53.ResourceRecordSet
 }
 
-// NewRoute53APIStub returns an initlialized Route53APIStub
+// NewRoute53APIStub returns an initialized Route53APIStub
 func NewRoute53APIStub() *Route53APIStub {
 	return &Route53APIStub{
 		zones:      make(map[string]*route53.HostedZone),
diff --git a/federation/pkg/dnsprovider/providers/aws/route53/zone.go b/federation/pkg/dnsprovider/providers/aws/route53/zone.go
index 18420075b20..e1ce5121d14 100644
--- a/federation/pkg/dnsprovider/providers/aws/route53/zone.go
+++ b/federation/pkg/dnsprovider/providers/aws/route53/zone.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ dnsprovider.Zone = &Zone{}
 
 type Zone struct {
diff --git a/federation/pkg/dnsprovider/providers/aws/route53/zones.go b/federation/pkg/dnsprovider/providers/aws/route53/zones.go
index d7873fefdcf..4ae650be6a7 100644
--- a/federation/pkg/dnsprovider/providers/aws/route53/zones.go
+++ b/federation/pkg/dnsprovider/providers/aws/route53/zones.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/kubernetes/pkg/util/uuid"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ dnsprovider.Zones = Zones{}
 
 type Zones struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/changes_create_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/changes_create_call.go
index ca77f6dfcaa..b1a8310bcd4 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/changes_create_call.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/changes_create_call.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ChangesCreateCall = ChangesCreateCall{}
 
 type ChangesCreateCall struct{ impl *dns.ChangesCreateCall }
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/changes_service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/changes_service.go
index f20a19b87ab..887ed9df272 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/changes_service.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/changes_service.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ChangesService = ChangesService{}
 
 type ChangesService struct{ impl *dns.ChangesService }
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zone.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zone.go
index 5a13476b306..862897743f9 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zone.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zone.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ManagedZone = ManagedZone{}
 
 type ManagedZone struct{ impl *dns.ManagedZone }
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zone_create_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zone_create_call.go
index 83d1e59b6dd..133cd145b48 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zone_create_call.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zone_create_call.go
@@ -22,7 +22,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ManagedZonesCreateCall = ManagedZonesCreateCall{}
 
 type ManagedZonesCreateCall struct{ impl *dns.ManagedZonesCreateCall }
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_delete_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_delete_call.go
index ccfec1a9bc6..2e96763e010 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_delete_call.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_delete_call.go
@@ -22,7 +22,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ManagedZonesDeleteCall = ManagedZonesDeleteCall{}
 
 type ManagedZonesDeleteCall struct{ impl *dns.ManagedZonesDeleteCall }
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_get_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_get_call.go
index 2ee7cb2e4fe..2a6cadfed99 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_get_call.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_get_call.go
@@ -22,7 +22,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ManagedZonesGetCall = ManagedZonesGetCall{}
 
 type ManagedZonesGetCall struct{ impl *dns.ManagedZonesGetCall }
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_list_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_list_call.go
index fec681b2474..b7041046477 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_list_call.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_list_call.go
@@ -22,7 +22,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ManagedZonesListCall = &ManagedZonesListCall{}
 
 type ManagedZonesListCall struct{ impl *dns.ManagedZonesListCall }
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_list_response.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_list_response.go
index 7ada41fdf7b..b254f5eb56e 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_list_response.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_list_response.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ManagedZonesListResponse = &ManagedZonesListResponse{}
 
 type ManagedZonesListResponse struct{ impl *dns.ManagedZonesListResponse }
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_service.go
index 6e48b5a9db5..c07dc8fefbb 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_service.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_service.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/kubernetes/pkg/util/uuid"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ManagedZonesService = &ManagedZonesService{}
 
 type ManagedZonesService struct{ impl *dns.ManagedZonesService }
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrset.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrset.go
index cacec57dddc..2b7c0ce24e5 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrset.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrset.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ResourceRecordSet = ResourceRecordSet{}
 
 type ResourceRecordSet struct{ impl *dns.ResourceRecordSet }
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_list_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_list_call.go
index 1ff9caf43eb..32c17011fe4 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_list_call.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_list_call.go
@@ -22,7 +22,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ResourceRecordSetsListCall = &ResourceRecordSetsListCall{}
 
 type ResourceRecordSetsListCall struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_list_response.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_list_response.go
index f98fea133b7..a6ff28df8f9 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_list_response.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_list_response.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ResourceRecordSetsListResponse = &ResourceRecordSetsListResponse{}
 
 type ResourceRecordSetsListResponse struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_service.go
index 1a1e045e437..0b3f647db63 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_service.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_service.go
@@ -22,7 +22,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/rrstype"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ResourceRecordSetsService = &ResourceRecordSetsService{}
 
 type ResourceRecordSetsService struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/service.go
index aac6bdd38eb..8ac5e63b74e 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/service.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/service.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.Service = &Service{}
 
 type Service struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/change.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/change.go
index fe6937a366b..83e5d947967 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/change.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/change.go
@@ -18,7 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.Change = &Change{}
 
 type Change struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/changes_create_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/changes_create_call.go
index bf9bc1050f2..ab27a12f75e 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/changes_create_call.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/changes_create_call.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ChangesCreateCall = ChangesCreateCall{}
 
 type ChangesCreateCall struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/changes_service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/changes_service.go
index 42523074f50..39b8bd14f21 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/changes_service.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/changes_service.go
@@ -18,7 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ChangesService = &ChangesService{}
 
 type ChangesService struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zone.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zone.go
index e70d2a4b1b1..2096da400bd 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zone.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zone.go
@@ -18,7 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ManagedZone = ManagedZone{}
 
 type ManagedZone struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zone_create_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zone_create_call.go
index 31ac86f1eae..f35f585cb51 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zone_create_call.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zone_create_call.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ManagedZonesCreateCall = ManagedZonesCreateCall{}
 
 type ManagedZonesCreateCall struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_delete_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_delete_call.go
index 15674b41f67..c518e76ebad 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_delete_call.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_delete_call.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ManagedZonesDeleteCall = ManagedZonesDeleteCall{}
 
 type ManagedZonesDeleteCall struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_get_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_get_call.go
index e85c43be844..f2923c3abd3 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_get_call.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_get_call.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ManagedZonesGetCall = ManagedZonesGetCall{}
 
 type ManagedZonesGetCall struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_list_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_list_call.go
index 79a87da1356..4b7156ffbc5 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_list_call.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_list_call.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ManagedZonesListCall = &ManagedZonesListCall{}
 
 type ManagedZonesListCall struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_list_response.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_list_response.go
index 7832b6c158f..095cae2ba80 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_list_response.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_list_response.go
@@ -18,7 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ManagedZonesListResponse = &ManagedZonesListResponse{}
 
 type ManagedZonesListResponse struct{ ManagedZones_ []interfaces.ManagedZone }
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_service.go
index f4a3a1712ce..5b8513f2f73 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_service.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_service.go
@@ -18,7 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ManagedZonesService = &ManagedZonesService{}
 
 type ManagedZonesService struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrset.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrset.go
index 6372210be67..3412775c17c 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrset.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrset.go
@@ -18,7 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ResourceRecordSet = ResourceRecordSet{}
 
 type ResourceRecordSet struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_list_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_list_call.go
index 0066a779160..5b298b767a6 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_list_call.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_list_call.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ResourceRecordSetsListCall = &ResourceRecordSetsListCall{}
 
 type ResourceRecordSetsListCall struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_list_response.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_list_response.go
index 07f7bdd000d..a60d8dceffb 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_list_response.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_list_response.go
@@ -18,7 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ResourceRecordSetsListResponse = &ResourceRecordSetsListResponse{}
 
 type ResourceRecordSetsListResponse struct {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_service.go
index 9bda8bb40e1..8c43e98f5e4 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_service.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_service.go
@@ -23,12 +23,12 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/rrstype"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ interfaces.ResourceRecordSetsService = &ResourceRecordSetsService{}
 
 type ResourceRecordSetsService struct {
 	Service  *Service
-	ListCall interfaces.ResourceRecordSetsListCall // Use to override response if reqired for testing
+	ListCall interfaces.ResourceRecordSetsListCall // Use to override response if required for testing
 }
 
 func (s ResourceRecordSetsService) List(project string, managedZone string) interfaces.ResourceRecordSetsListCall {
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/rrset.go b/federation/pkg/dnsprovider/providers/google/clouddns/rrset.go
index d39a08b0b40..f357e1c9e7c 100644
--- a/federation/pkg/dnsprovider/providers/google/clouddns/rrset.go
+++ b/federation/pkg/dnsprovider/providers/google/clouddns/rrset.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/rrstype"
 )
 
-// Compile time check for interface adeherence
+// Compile time check for interface adherence
 var _ dnsprovider.ResourceRecordSet = ResourceRecordSet{}
 
 type ResourceRecordSet struct {
diff --git a/federation/pkg/federation-controller/ingress/ingress_controller.go b/federation/pkg/federation-controller/ingress/ingress_controller.go
index 436c8248359..c8243ddd8e6 100644
--- a/federation/pkg/federation-controller/ingress/ingress_controller.go
+++ b/federation/pkg/federation-controller/ingress/ingress_controller.go
@@ -67,16 +67,16 @@ var (
 
 type IngressController struct {
 	sync.Mutex // Lock used for leader election
-	// For triggering single ingress reconcilation. This is used when there is an
+	// For triggering single ingress reconciliation. This is used when there is an
 	// add/update/delete operation on an ingress in either federated API server or
 	// in some member of the federation.
 	ingressDeliverer *util.DelayingDeliverer
 
-	// For triggering reconcilation of cluster ingress controller configmap and
+	// For triggering reconciliation of cluster ingress controller configmap and
 	// all ingresses. This is used when a new cluster becomes available.
 	clusterDeliverer *util.DelayingDeliverer
 
-	// For triggering reconcilation of cluster ingress controller configmap.
+	// For triggering reconciliation of cluster ingress controller configmap.
 	// This is used when a configmap is updated in the cluster.
 	configMapDeliverer *util.DelayingDeliverer
 
@@ -208,7 +208,7 @@ func NewIngressController(client federationclientset.Interface) *IngressControll
 				},
 				&v1.ConfigMap{},
 				controller.NoResyncPeriodFunc(),
-				// Trigger reconcilation whenever the ingress controller's configmap in a federated cluster is changed. In most cases it
+				// Trigger reconciliation whenever the ingress controller's configmap in a federated cluster is changed. In most cases it
 				// would be just confirmation that the configmap for the ingress controller is correct.
 				util.NewTriggerOnAllChanges(
 					func(obj pkgruntime.Object) {
@@ -362,7 +362,7 @@ func (ic *IngressController) Run(stopChan <-chan struct{}) {
 		ic.ingressFederatedInformer.Stop()
 		glog.Infof("Stopping ConfigMap Federated Informer")
 		ic.configMapFederatedInformer.Stop()
-		glog.Infof("Stopoing ingress deliverer")
+		glog.Infof("Stopping ingress deliverer")
 		ic.ingressDeliverer.Stop()
 		glog.Infof("Stopping configmap deliverer")
 		ic.configMapDeliverer.Stop()
@@ -465,7 +465,7 @@ func (ic *IngressController) isSynced() bool {
 	return true
 }
 
-// The function triggers reconcilation of all federated ingresses.  clusterName is the name of the cluster that changed
+// The function triggers reconciliation of all federated ingresses.  clusterName is the name of the cluster that changed
 // but all ingresses in all clusters are reconciled
 func (ic *IngressController) reconcileIngressesOnClusterChange(clusterName string) {
 	glog.V(4).Infof("Reconciling ingresses on cluster change for cluster %q", clusterName)
diff --git a/federation/pkg/federation-controller/ingress/ingress_controller_test.go b/federation/pkg/federation-controller/ingress/ingress_controller_test.go
index 53d44f8fbe1..9c164a3dba8 100644
--- a/federation/pkg/federation-controller/ingress/ingress_controller_test.go
+++ b/federation/pkg/federation-controller/ingress/ingress_controller_test.go
@@ -138,7 +138,7 @@ func TestIngressController(t *testing.T) {
 	assert.NotNil(t, cluster)
 	assert.Equal(t, cluster.ObjectMeta.Annotations[uidAnnotationKey], cfg1.Data[uidKey])
 
-	t.Logf("Checking that approproate finalizers are added")
+	t.Logf("Checking that appropriate finalizers are added")
 	// There should be 2 updates to add both the finalizers.
 	updatedIngress := GetIngressFromChan(t, fedIngressUpdateChan)
 	assert.True(t, ingressController.hasFinalizerFunc(updatedIngress, deletionhelper.FinalizerDeleteFromUnderlyingClusters))
diff --git a/federation/pkg/federation-controller/namespace/namespace_controller.go b/federation/pkg/federation-controller/namespace/namespace_controller.go
index 2c9da0c2c30..b6994e77a3b 100644
--- a/federation/pkg/federation-controller/namespace/namespace_controller.go
+++ b/federation/pkg/federation-controller/namespace/namespace_controller.go
@@ -95,7 +95,7 @@ func NewNamespaceController(client federationclientset.Interface) *NamespaceCont
 		eventRecorder:         recorder,
 	}
 
-	// Build delivereres for triggering reconciliations.
+	// Build deliverers for triggering reconciliations.
 	nc.namespaceDeliverer = util.NewDelayingDeliverer()
 	nc.clusterDeliverer = util.NewDelayingDeliverer()
 
@@ -129,7 +129,7 @@ func NewNamespaceController(client federationclientset.Interface) *NamespaceCont
 				&apiv1.Namespace{},
 				controller.NoResyncPeriodFunc(),
 				// Trigger reconciliation whenever something in federated cluster is changed. In most cases it
-				// would be just confirmation that some namespace opration succeeded.
+				// would be just confirmation that some namespace operation succeeded.
 				util.NewTriggerOnMetaAndSpecChanges(
 					func(obj runtime.Object) { nc.deliverNamespaceObj(obj, nc.namespaceReviewDelay, false) },
 				))
@@ -142,7 +142,7 @@ func NewNamespaceController(client federationclientset.Interface) *NamespaceCont
 		},
 	)
 
-	// Federated updeater along with Create/Update/Delete operations.
+	// Federated updater along with Create/Update/Delete operations.
 	nc.federatedUpdater = util.NewFederatedUpdater(nc.namespaceFederatedInformer,
 		func(client kubeclientset.Interface, obj runtime.Object) error {
 			namespace := obj.(*apiv1.Namespace)
@@ -435,7 +435,7 @@ func (nc *NamespaceController) reconcileNamespace(namespace string) {
 		return
 	}
 
-	// Evertyhing is in order but lets be double sure
+	// Everything is in order but lets be double sure
 	nc.deliverNamespace(namespace, nc.namespaceReviewDelay, false)
 }
 
@@ -489,7 +489,7 @@ func (nc *NamespaceController) delete(namespace *apiv1.Namespace) error {
 // Ensures that all resources in this namespace are deleted and then removes the kubernetes finalizer.
 func (nc *NamespaceController) removeKubernetesFinalizer(namespace *apiv1.Namespace) (*apiv1.Namespace, error) {
 	// Right now there are just 7 types of objects: Deployments, DaemonSets, ReplicaSet, Secret, Ingress, Events and Service.
-	// Temporarly these items are simply deleted one by one to squeeze this code into 1.4.
+	// Temporarily these items are simply deleted one by one to squeeze this code into 1.4.
 	// TODO: Make it generic (like in the regular namespace controller) and parallel.
 	err := nc.federatedApiClient.Core().Services(namespace.Name).DeleteCollection(&apiv1.DeleteOptions{}, apiv1.ListOptions{})
 	if err != nil {
diff --git a/federation/pkg/federation-controller/secret/secret_controller.go b/federation/pkg/federation-controller/secret/secret_controller.go
index 0ebd5554fd7..8d2d7d5c7fa 100644
--- a/federation/pkg/federation-controller/secret/secret_controller.go
+++ b/federation/pkg/federation-controller/secret/secret_controller.go
@@ -130,7 +130,7 @@ func NewSecretController(client federationclientset.Interface) *SecretController
 				&apiv1.Secret{},
 				controller.NoResyncPeriodFunc(),
 				// Trigger reconciliation whenever something in federated cluster is changed. In most cases it
-				// would be just confirmation that some secret opration succeeded.
+				// would be just confirmation that some secret operation succeeded.
 				util.NewTriggerOnAllChanges(
 					func(obj pkgruntime.Object) {
 						secretcontroller.deliverSecretObj(obj, secretcontroller.secretReviewDelay, false)
diff --git a/federation/pkg/federation-controller/secret/secret_controller_test.go b/federation/pkg/federation-controller/secret/secret_controller_test.go
index f5ceea4c21b..1dd0241bd59 100644
--- a/federation/pkg/federation-controller/secret/secret_controller_test.go
+++ b/federation/pkg/federation-controller/secret/secret_controller_test.go
@@ -176,7 +176,7 @@ func setClientFactory(informer util.FederatedInformer, informerClientFactory fun
 
 func secretsEqual(a, b apiv1.Secret) bool {
 	// Clear the SelfLink and ObjectMeta.Finalizers since they will be different
-	// in resoure in federation control plane and resource in underlying cluster.
+	// in resource in federation control plane and resource in underlying cluster.
 	a.SelfLink = ""
 	b.SelfLink = ""
 	a.ObjectMeta.Finalizers = []string{}
diff --git a/federation/pkg/federation-controller/service/cluster_helper.go b/federation/pkg/federation-controller/service/cluster_helper.go
index 3e4f12bfcaa..5a88a8e7937 100644
--- a/federation/pkg/federation-controller/service/cluster_helper.go
+++ b/federation/pkg/federation-controller/service/cluster_helper.go
@@ -145,7 +145,7 @@ func (cc *clusterClientCache) startClusterLW(cluster *v1beta1.Cluster, clusterNa
 				DeleteFunc: func(obj interface{}) {
 					service, _ := obj.(*v1.Service)
 					cc.enqueueService(obj, clusterName)
-					glog.V(2).Infof("Service %s/%s deletion found and enque to service store %s", service.Namespace, service.Name, clusterName)
+					glog.V(2).Infof("Service %s/%s deletion found and enqueue to service store %s", service.Namespace, service.Name, clusterName)
 				},
 			},
 			cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},
diff --git a/federation/pkg/federation-controller/service/servicecontroller.go b/federation/pkg/federation-controller/service/servicecontroller.go
index 152601c7e8b..93e461b71be 100644
--- a/federation/pkg/federation-controller/service/servicecontroller.go
+++ b/federation/pkg/federation-controller/service/servicecontroller.go
@@ -82,7 +82,7 @@ type cachedService struct {
 	serviceStatusMap map[string]v1.LoadBalancerStatus
 	// Ensures only one goroutine can operate on this service at any given time.
 	rwlock sync.Mutex
-	// Controls error back-off for procceeding federation service to k8s clusters
+	// Controls error back-off for proceeding federation service to k8s clusters
 	lastRetryDelay time.Duration
 	// Controls error back-off for updating federation service back to federation apiserver
 	lastFedUpdateDelay time.Duration
@@ -381,7 +381,7 @@ func (s *ServiceController) updateFederationService(key string, cachedService *c
 		}(cache, clusterName)
 	}
 	if hasErr {
-		// detail error has been dumpped inside the loop
+		// detail error has been dumped inside the loop
 		return fmt.Errorf("Service %s/%s was not successfully updated to all clusters", service.Namespace, service.Name), retryable
 	}
 	return nil, !retryable
@@ -880,7 +880,7 @@ func (s *ServiceController) processServiceUpdate(cachedService *cachedService, s
 
 	cachedService.appliedState = service
 	s.serviceCache.set(key, cachedService)
-	glog.V(4).Infof("Successfully procceeded services %s", key)
+	glog.V(4).Infof("Successfully proceeded services %s", key)
 	cachedService.resetRetryDelay()
 	return nil, doNotRetry
 }
diff --git a/federation/pkg/federation-controller/util/cluster_util.go b/federation/pkg/federation-controller/util/cluster_util.go
index b94f81a2661..3fc5a781b3d 100644
--- a/federation/pkg/federation-controller/util/cluster_util.go
+++ b/federation/pkg/federation-controller/util/cluster_util.go
@@ -92,7 +92,7 @@ var KubeconfigGetterForCluster = func(c *federation_v1beta1.Cluster) clientcmd.K
 	}
 }
 
-// KubeconfigGettterForSecret is used to get the kubeconfig from the given secret.
+// KubeconfigGetterForSecret is used to get the kubeconfig from the given secret.
 var KubeconfigGetterForSecret = func(secretName string) clientcmd.KubeconfigGetter {
 	return func() (*clientcmdapi.Config, error) {
 		var data []byte
@@ -137,7 +137,7 @@ var KubeconfigGetterForSecret = func(secretName string) clientcmd.KubeconfigGett
 	}
 }
 
-// Retruns Clientset for the given cluster.
+// Returns Clientset for the given cluster.
 func GetClientsetForCluster(cluster *federation_v1beta1.Cluster) (*fedclientset.Clientset, error) {
 	clusterConfig, err := BuildClusterConfig(cluster)
 	if err != nil && clusterConfig != nil {
diff --git a/federation/pkg/federation-controller/util/configmap.go b/federation/pkg/federation-controller/util/configmap.go
index 1136697b2b8..775f8c9fa8b 100644
--- a/federation/pkg/federation-controller/util/configmap.go
+++ b/federation/pkg/federation-controller/util/configmap.go
@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
-// Checks if cluster-independent, user provided data in two given ConfigMapss are eqaul. If in
+// Checks if cluster-independent, user provided data in two given ConfigMaps are equal. If in
 // the future the ConfigMap structure is expanded then any field that is not populated.
 // by the api server should be included here.
 func ConfigMapEquivalent(s1, s2 *api_v1.ConfigMap) bool {
diff --git a/federation/pkg/federation-controller/util/deployment.go b/federation/pkg/federation-controller/util/deployment.go
index e5030c4ad9d..ee14484deea 100644
--- a/federation/pkg/federation-controller/util/deployment.go
+++ b/federation/pkg/federation-controller/util/deployment.go
@@ -24,7 +24,7 @@ import (
 	deputils "k8s.io/kubernetes/pkg/controller/deployment/util"
 )
 
-// Checks if cluster-independent, user provided data in two given Deployment are eqaul.
+// Checks if cluster-independent, user provided data in two given Deployment are equal.
 // This function assumes that revisions are not kept in sync across the clusters.
 func DeploymentEquivalent(a, b *extensions_v1.Deployment) bool {
 	if a.Name != b.Name {
diff --git a/federation/pkg/federation-controller/util/eventsink/eventsink.go b/federation/pkg/federation-controller/util/eventsink/eventsink.go
index ab430fdfd99..cb7c2ca5dfc 100644
--- a/federation/pkg/federation-controller/util/eventsink/eventsink.go
+++ b/federation/pkg/federation-controller/util/eventsink/eventsink.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/kubernetes/pkg/client/record"
 )
 
-// Implemnts k8s.io/kubernetes/pkg/client/record.EventSink.
+// Implements k8s.io/kubernetes/pkg/client/record.EventSink.
 type FederatedEventSink struct {
 	clientset fedclientset.Interface
 }
diff --git a/federation/pkg/federation-controller/util/federated_informer.go b/federation/pkg/federation-controller/util/federated_informer.go
index 768154a188b..cb787aabf6f 100644
--- a/federation/pkg/federation-controller/util/federated_informer.go
+++ b/federation/pkg/federation-controller/util/federated_informer.go
@@ -79,7 +79,7 @@ type FederationView interface {
 	// GetUnreadyClusters returns a list of all clusters that are not ready yet.
 	GetUnreadyClusters() ([]*federationapi.Cluster, error)
 
-	// GetReadyClusers returns all clusters for which the sub-informers are run.
+	// GetReadyClusters returns all clusters for which the sub-informers are run.
 	GetReadyClusters() ([]*federationapi.Cluster, error)
 
 	// GetReadyCluster returns the cluster with the given name, if found.
@@ -337,7 +337,7 @@ func (f *federatedInformerImpl) GetUnreadyClusters() ([]*federationapi.Cluster,
 	return result, nil
 }
 
-// GetReadyClusers returns all clusters for which the sub-informers are run.
+// GetReadyClusters returns all clusters for which the sub-informers are run.
 func (f *federatedInformerImpl) GetReadyClusters() ([]*federationapi.Cluster, error) {
 	f.Lock()
 	defer f.Unlock()
diff --git a/federation/pkg/federation-controller/util/planner/planner.go b/federation/pkg/federation-controller/util/planner/planner.go
index a29caf9a239..b1d1a55dc5a 100644
--- a/federation/pkg/federation-controller/util/planner/planner.go
+++ b/federation/pkg/federation-controller/util/planner/planner.go
@@ -58,12 +58,12 @@ func NewPlanner(preferences *fedapi.FederatedReplicaSetPreferences) *Planner {
 // have all of the replicas assigned. In such case a cluster with higher weight has priority over
 // cluster with lower weight (or with lexicographically smaller name in case of draw).
 // It can also use the current replica count and estimated capacity to provide better planning and
-// adhere to rebalance policy. To avoid prioritization of clusters with smaller lexiconographical names
+// adhere to rebalance policy. To avoid prioritization of clusters with smaller lexicographical names
 // a semi-random string (like replica set name) can be provided.
 // Two maps are returned:
 // * a map that contains information how many replicas will be possible to run in a cluster.
 // * a map that contains information how many extra replicas would be nice to schedule in a cluster so,
-//   if by chance, they are scheudled we will be closer to the desired replicas layout.
+//   if by chance, they are scheduled we will be closer to the desired replicas layout.
 func (p *Planner) Plan(replicasToDistribute int64, availableClusters []string, currentReplicaCount map[string]int64,
 	estimatedCapacity map[string]int64, replicaSetKey string) (map[string]int64, map[string]int64) {
 
@@ -140,7 +140,7 @@ func (p *Planner) Plan(replicasToDistribute int64, availableClusters []string, c
 
 	modified := true
 
-	// It is possible single pass of the loop is not enough to distribue all replicas among clusters due
+	// It is possible single pass of the loop is not enough to distribute all replicas among clusters due
 	// to weight, max and rounding corner cases. In such case we iterate until either
 	// there is no replicas or no cluster gets any more replicas or the number
 	// of attempts is less than available cluster count. If there is no preallocated pods
diff --git a/federation/pkg/federation-controller/util/secret.go b/federation/pkg/federation-controller/util/secret.go
index f9e00830bee..57fb170d10e 100644
--- a/federation/pkg/federation-controller/util/secret.go
+++ b/federation/pkg/federation-controller/util/secret.go
@@ -22,7 +22,7 @@ import (
 	api_v1 "k8s.io/kubernetes/pkg/api/v1"
 )
 
-// Checks if cluster-independent, user provided data in two given Secrets are eqaul. If in
+// Checks if cluster-independent, user provided data in two given Secrets are equal. If in
 // the future the Secret structure is expanded then any field that is not populated.
 // by the api server should be included here.
 func SecretEquivalent(s1, s2 api_v1.Secret) bool {
diff --git a/federation/pkg/federation-controller/util/test/test_helper.go b/federation/pkg/federation-controller/util/test/test_helper.go
index 79a7c5df968..f006e567525 100644
--- a/federation/pkg/federation-controller/util/test/test_helper.go
+++ b/federation/pkg/federation-controller/util/test/test_helper.go
@@ -40,7 +40,7 @@ const (
 	pushTimeout = 5 * time.Second
 )
 
-// A structure that distributes eventes to multiple watchers.
+// A structure that distributes events to multiple watchers.
 type WatcherDispatcher struct {
 	sync.Mutex
 	watchers       []*watch.RaceFreeFakeWatcher
@@ -272,10 +272,10 @@ func CompareObjectMeta(a, b apiv1.ObjectMeta) error {
 		return fmt.Errorf("Different name expected:%s observed:%s", a.Namespace, b.Namespace)
 	}
 	if !reflect.DeepEqual(a.Labels, b.Labels) && (len(a.Labels) != 0 || len(b.Labels) != 0) {
-		return fmt.Errorf("Labels are different expected:%v observerd:%v", a.Labels, b.Labels)
+		return fmt.Errorf("Labels are different expected:%v observed:%v", a.Labels, b.Labels)
 	}
 	if !reflect.DeepEqual(a.Annotations, b.Annotations) && (len(a.Annotations) != 0 || len(b.Annotations) != 0) {
-		return fmt.Errorf("Annotations are different expected:%v observerd:%v", a.Annotations, b.Annotations)
+		return fmt.Errorf("Annotations are different expected:%v observed:%v", a.Annotations, b.Annotations)
 	}
 	return nil
 }
diff --git a/federation/pkg/kubefed/init/init.go b/federation/pkg/kubefed/init/init.go
index 9bfb4893fce..591f1554ad6 100644
--- a/federation/pkg/kubefed/init/init.go
+++ b/federation/pkg/kubefed/init/init.go
@@ -199,7 +199,7 @@ func initFederation(cmdOut io.Writer, config util.AdminConfig, cmd *cobra.Comman
 	}
 
 	// Since only one IP address can be specified as advertise address,
-	// we arbitrarily pick the first availabe IP address
+	// we arbitrarily pick the first available IP address
 	advertiseAddress := ""
 	if len(ips) > 0 {
 		advertiseAddress = ips[0]
diff --git a/federation/pkg/kubefed/util/util.go b/federation/pkg/kubefed/util/util.go
index c6dd285de49..b07314854e7 100644
--- a/federation/pkg/kubefed/util/util.go
+++ b/federation/pkg/kubefed/util/util.go
@@ -115,7 +115,7 @@ func CreateKubeconfigSecret(clientset *client.Clientset, kubeconfig *clientcmdap
 		return nil, err
 	}
 
-	// Build the secret object with the minified and flattened
+	// Build the secret object with the minimized and flattened
 	// kubeconfig content.
 	secret := &api.Secret{
 		ObjectMeta: api.ObjectMeta{

From f15c8d0cf5755464c6fdbd5dfa6724f29bfe7f8f Mon Sep 17 00:00:00 2001
From: "Aaron.L.Xu" <likexu@harmonycloud.cn>
Date: Tue, 20 Dec 2016 20:24:03 -0800
Subject: [PATCH 3/5] update-federation-openapi-spec.sh and fix issue 38962

---
 federation/apis/openapi-spec/swagger.json     | 2 +-
 hack/lib/etcd.sh                              | 2 +-
 pkg/generated/openapi/zz_generated.openapi.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/federation/apis/openapi-spec/swagger.json b/federation/apis/openapi-spec/swagger.json
index 625efbed4d4..646d4add032 100644
--- a/federation/apis/openapi-spec/swagger.json
+++ b/federation/apis/openapi-spec/swagger.json
@@ -10247,7 +10247,7 @@
     }
    },
    "v1beta1.ClusterStatus": {
-    "description": "ClusterStatus is information about the current status of a cluster updated by cluster controller peridocally.",
+    "description": "ClusterStatus is information about the current status of a cluster updated by cluster controller periodically.",
     "properties": {
      "conditions": {
       "description": "Conditions is an array of current cluster conditions.",
diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
index 03ad07c0f34..5ef4cc8380b 100755
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -40,7 +40,7 @@ kube::etcd::validate() {
    export PATH=$KUBE_ROOT/third_party/etcd:$PATH
    hash etcd
    echo $PATH
-   ls $KUBE_ROOT/third_party/etcd
+   #ls $KUBE_ROOT/third_party/etcd
    version=$(etcd --version | head -n 1 | cut -d " " -f 3)
    if [[ "${version}" < "${ETCD_VERSION}" ]]; then
     kube::log::usage "etcd version ${ETCD_VERSION} or greater required."
diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go
index 9cb6d540cf3..7feb3cffc5c 100644
--- a/pkg/generated/openapi/zz_generated.openapi.go
+++ b/pkg/generated/openapi/zz_generated.openapi.go
@@ -9782,7 +9782,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
 	"v1beta1.ClusterStatus": {
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
-				Description: "ClusterStatus is information about the current status of a cluster updated by cluster controller peridocally.",
+				Description: "ClusterStatus is information about the current status of a cluster updated by cluster controller periodically.",
 				Properties: map[string]spec.Schema{
 					"conditions": {
 						SchemaProps: spec.SchemaProps{

From 3964aae3853b40274de7304bc25d3e99d1990b4f Mon Sep 17 00:00:00 2001
From: "Aaron.L.Xu" <likexu@harmonycloud.cn>
Date: Wed, 21 Dec 2016 00:36:38 -0800
Subject: [PATCH 4/5] revert some unwanted changes

---
 cluster/images/etcd/rollback/rollback.go | 3 +--
 federation/pkg/kubefed/util/util.go      | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cluster/images/etcd/rollback/rollback.go b/cluster/images/etcd/rollback/rollback.go
index fb4a52d8f36..5ae0e821a8a 100644
--- a/cluster/images/etcd/rollback/rollback.go
+++ b/cluster/images/etcd/rollback/rollback.go
@@ -325,8 +325,7 @@ func applyRequest(r *pb.Request, applyV2 etcdserver.ApplierV2) {
 		applyV2.Put(r)
 	case "DELETE":
 		applyV2.Delete(r)
-	//case "POST", "QGET", "SYNC":
-	case "POST", "GET", "SYNC":
+	case "POST", "QGET", "SYNC":
 		return
 	default:
 		glog.Fatal("unknown command")
diff --git a/federation/pkg/kubefed/util/util.go b/federation/pkg/kubefed/util/util.go
index b07314854e7..c6dd285de49 100644
--- a/federation/pkg/kubefed/util/util.go
+++ b/federation/pkg/kubefed/util/util.go
@@ -115,7 +115,7 @@ func CreateKubeconfigSecret(clientset *client.Clientset, kubeconfig *clientcmdap
 		return nil, err
 	}
 
-	// Build the secret object with the minimized and flattened
+	// Build the secret object with the minified and flattened
 	// kubeconfig content.
 	secret := &api.Secret{
 		ObjectMeta: api.ObjectMeta{

From 5c8f2b87a3ecc9decc2c45dab9648ec516f93768 Mon Sep 17 00:00:00 2001
From: "Aaron.L.Xu" <likexu@harmonycloud.cn>
Date: Wed, 21 Dec 2016 05:04:45 -0800
Subject: [PATCH 5/5] Let's keep this PR strictly to typo fixes.

---
 hack/lib/etcd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
index 5ef4cc8380b..03ad07c0f34 100755
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -40,7 +40,7 @@ kube::etcd::validate() {
    export PATH=$KUBE_ROOT/third_party/etcd:$PATH
    hash etcd
    echo $PATH
-   #ls $KUBE_ROOT/third_party/etcd
+   ls $KUBE_ROOT/third_party/etcd
    version=$(etcd --version | head -n 1 | cut -d " " -f 3)
    if [[ "${version}" < "${ETCD_VERSION}" ]]; then
     kube::log::usage "etcd version ${ETCD_VERSION} or greater required."