Merge pull request #146 from cloudnativelabs/goreportcard

fix gofmt, go_vet, misspells

Author: murali-reddy

app/controllers/network_policy_controller.go

@@ -56,7 +56,7 @@ type networkPolicyInfo struct {
 	// set of pods matching network policy spec podselector label selector
 	destPods map[string]podInfo
 
-	// whitelist ingress rules from the netwrok policy spec
+	// whitelist ingress rules from the network policy spec
 	ingressRules []ingressRule
 }
 
@@ -120,7 +120,7 @@ func (npc *NetworkPolicyController) OnPodUpdate(podUpdate *watchers.PodUpdate) {
 	if watchers.PodWatcher.HasSynced() && watchers.NetworkPolicyWatcher.HasSynced() {
 		err := npc.Sync()
 		if err != nil {
-			glog.Errorf("Error syncing on pod update: ", err)
+			glog.Errorf("Error syncing on pod update: %s", err)
 		}
 	} else {
 		glog.Infof("Received pod update, but controller not in sync")
@@ -131,7 +131,7 @@ func (npc *NetworkPolicyController) OnNetworkPolicyUpdate(networkPolicyUpdate *w
 	if watchers.PodWatcher.HasSynced() && watchers.NetworkPolicyWatcher.HasSynced() {
 		err := npc.Sync()
 		if err != nil {
-			glog.Errorf("Error syncing on network policy update: ", err)
+			glog.Errorf("Error syncing on network policy update: %s", err)
 		}
 	} else {
 		glog.Infof("Received network policy update, but controller not in sync")
@@ -149,7 +149,7 @@ func (npc *NetworkPolicyController) OnNamespaceUpdate(namespaceUpdate *watchers.
 	if watchers.PodWatcher.HasSynced() && watchers.NetworkPolicyWatcher.HasSynced() {
 		err := npc.Sync()
 		if err != nil {
-			glog.Errorf("Error syncing on namespace update: ", err)
+			glog.Errorf("Error syncing on namespace update: %s", err)
 		}
 	} else {
 		glog.Infof("Received namspace update, but controller not in sync")
@@ -372,7 +372,7 @@ func (npc *NetworkPolicyController) syncPodFirewallChains() (map[string]bool, er
 			continue
 		}
 
-		// ensure pod specfic firewall chain exist for all the pods that need ingress firewall
+		// ensure pod specific firewall chain exist for all the pods that need ingress firewall
 		podFwChainName := podFirewallChainName(pod.namespace, pod.name)
 		err = iptablesCmdHandler.NewChain("filter", podFwChainName)
 		if err != nil && err.(*iptables.Error).ExitStatus() != 1 {

app/controllers/network_routes_controller.go

@@ -89,7 +89,7 @@ func (nrc *NetworkRoutingController) Run(stopCh <-chan struct{}, wg *sync.WaitGr
 	// In case of cluster provisioned on AWS disable source-destination check
 	nrc.disableSourceDestinationCheck()
 
-	// enable IP forwarding for the packets coming in/out from ther pods
+	// enable IP forwarding for the packets coming in/out from the pods
 	err = nrc.enableForwarding()
 	if err != nil {
 		glog.Errorf("Failed to enable IP forwarding of traffic from pods: %s", err.Error())
@@ -119,7 +119,7 @@ func (nrc *NetworkRoutingController) Run(stopCh <-chan struct{}, wg *sync.WaitGr
 	} else {
 		glog.Infoln("Disabling Pod egress.")
 		err = deletePodEgressRule()
-		// TODO: Don't error if removing non-existant Pod egress rules/ipsets.
+		// TODO: Don't error if removing non-existent Pod egress rules/ipsets.
 		if err != nil {
 			glog.Infof("Error disabling Pod egress: %s", err.Error())
 		}
@@ -273,7 +273,7 @@ func (nrc *NetworkRoutingController) advertiseRoute() error {
 
 	cidrStr := strings.Split(cidr, "/")
 	subnet := cidrStr[0]
-	cidrLen, err := strconv.Atoi(cidrStr[1])
+	cidrLen, _ := strconv.Atoi(cidrStr[1])
 	attrs := []bgp.PathAttributeInterface{
 		bgp.NewPathAttributeOrigin(0),
 		bgp.NewPathAttributeNextHop(nrc.nodeIP.String()),
@@ -318,7 +318,7 @@ func (nrc *NetworkRoutingController) AdvertiseClusterIp(clusterIp string) error
 // Each node advertises its pod CIDR to the nodes with same ASN (iBGP peers) and to the global BGP peer
 // or per node BGP peer. Each node ends up advertising not only pod CIDR assigned to the self but other
 // routers learned to the node pod CIDR's as well to global BGP peer or per node BGP peers. external BGP
-// peer will randomly (since all path have equal selection atributes) select the routes from multiple
+// peer will randomly (since all path have equal selection attributes) select the routes from multiple
 // routes to a pod CIDR which will result in extra hop. To prevent this behaviour this methods add
 // defult export policy to reject. and explicit policy is added so that each node only advertised the
 // pod CIDR assigned to it. Additionally export policy is added so that a node advertises cluster IP's

app/controllers/network_services_controller.go

@@ -251,7 +251,7 @@ func (nsc *NetworkServicesController) syncIpvsServices(serviceInfoMap serviceInf
 		// create IPVS service for the service to be exposed through the cluster ip
 		ipvs_cluster_vip_svc, err := ipvsAddService(svc.clusterIP, protocol, uint16(svc.port), svc.sessionAffinity)
 		if err != nil {
-			glog.Errorf("Failed to create ipvs service for cluster ip: ", err.Error())
+			glog.Errorf("Failed to create ipvs service for cluster ip: %s", err.Error())
 			continue
 		}
 		var clusterServiceId = generateIpPortId(svc.clusterIP.String(), svc.protocol, strconv.Itoa(svc.port))
@@ -319,7 +319,7 @@ func (nsc *NetworkServicesController) syncIpvsServices(serviceInfoMap serviceInf
 			glog.Infof("Found a IPVS service %s:%s:%s which is no longer needed so cleaning up", ipvsSvc.Address.String(), protocol, strconv.Itoa(int(ipvsSvc.Port)))
 			err := h.DelService(ipvsSvc)
 			if err != nil {
-				glog.Errorf("Failed to delete stale IPVS service: ", err.Error())
+				glog.Errorf("Failed to delete stale IPVS service: %s", err.Error())
 				continue
 			}
 		} else {
@@ -786,7 +786,7 @@ func (nsc *NetworkServicesController) Cleanup() {
 
 	handle, err := ipvs.New("")
 	if err != nil {
-		glog.Errorf("Failed to cleanup ipvs rules: ", err.Error())
+		glog.Errorf("Failed to cleanup ipvs rules: %s", err.Error())
 		return
 	}
 
@@ -795,14 +795,14 @@ func (nsc *NetworkServicesController) Cleanup() {
 	// cleanup iptable masqurade rule
 	err = deleteMasqueradeIptablesRule()
 	if err != nil {
-		glog.Errorf("Failed to cleanup iptable masquerade rule due to: ", err.Error())
+		glog.Errorf("Failed to cleanup iptable masquerade rule due to: %s", err.Error())
 		return
 	}
 
 	// cleanup iptable hairpin rules
 	err = deleteHairpinIptablesRules()
 	if err != nil {
-		glog.Errorf("Failed to cleanup iptable hairpin rules: ", err.Error())
+		glog.Errorf("Failed to cleanup iptable hairpin rules: %s", err.Error())
 		return
 	}
 
@@ -815,7 +815,7 @@ func (nsc *NetworkServicesController) Cleanup() {
 	} else {
 		err = netlink.LinkDel(dummyVipInterface)
 		if err != nil {
-			glog.Errorf("Could not delete dummy interface: "+KUBE_DUMMY_IF, err.Error())
+			glog.Errorf("Could not delete dummy interface " + KUBE_DUMMY_IF + " due to " + err.Error())
 			return
 		}
 	}