Skip to content

Commit 617c773

Browse files
sergeylanzmanmurali-reddy
sergeylanzman
authored and
murali-reddy
committed
code cleanup (#301)
1 parent 3369890 commit 617c773

File tree

9 files changed

+37
-37
lines changed

9 files changed

+37
-37
lines changed

‎app/controllers/health_controller.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ import (
1111
"golang.org/x/net/context"
1212
)
1313

14-
//ControllerHeartbeat is the structure to hold the heartbeats sent by controlers
14+
//ControllerHeartbeat is the structure to hold the heartbeats sent by controllers
1515
type ControllerHeartbeat struct {
1616
Component string
17-
Lastheartbeat time.Time
17+
LastHeartBeat time.Time
1818
}
1919

2020
//HealthController reports the health of the controller loops as a http endpoint
2121
type HealthController struct {
2222
HealthPort uint16
23-
HTTPenabled bool
23+
HTTPEnabled bool
2424
Status HealthStats
2525
Config *options.KubeRouterConfig
2626
}
@@ -39,7 +39,7 @@ type HealthStats struct {
3939
func sendHeartBeat(channel chan<- *ControllerHeartbeat, controller string) {
4040
heartbeat := ControllerHeartbeat{
4141
Component: controller,
42-
Lastheartbeat: time.Now(),
42+
LastHeartBeat: time.Now(),
4343
}
4444
channel <- &heartbeat
4545
}
@@ -66,7 +66,7 @@ func (hc *HealthController) Handler(w http.ResponseWriter, req *http.Request) {
6666
}
6767
}
6868

69-
//HandleHeartbeat handles recevied heartbeats onthe health channel
69+
//HandleHeartbeat handles received heartbeats on the health channel
7070
func (hc *HealthController) HandleHeartbeat(beat *ControllerHeartbeat) {
7171
glog.V(3).Infof("Received heartbeat from %s", beat.Component)
7272

@@ -131,7 +131,7 @@ func (hc *HealthController) Run(healthChan <-chan *ControllerHeartbeat, stopCh <
131131
http.HandleFunc("/healthz", hc.Handler)
132132

133133
if (hc.Config.HealthPort > 0) && (hc.Config.HealthPort <= 65535) {
134-
hc.HTTPenabled = true
134+
hc.HTTPEnabled = true
135135
go func() {
136136
if err := srv.ListenAndServe(); err != nil {
137137
// cannot panic, because this probably is an intentional close
@@ -141,7 +141,7 @@ func (hc *HealthController) Run(healthChan <-chan *ControllerHeartbeat, stopCh <
141141
} else if hc.Config.MetricsPort > 65535 {
142142
glog.Errorf("Metrics port must be over 0 and under 65535, given port: %d", hc.Config.MetricsPort)
143143
} else {
144-
hc.HTTPenabled = false
144+
hc.HTTPEnabled = false
145145
}
146146

147147
for {
@@ -152,7 +152,7 @@ func (hc *HealthController) Run(healthChan <-chan *ControllerHeartbeat, stopCh <
152152
select {
153153
case <-stopCh:
154154
glog.Infof("Shutting down health controller")
155-
if hc.HTTPenabled {
155+
if hc.HTTPEnabled {
156156
if err := srv.Shutdown(context.Background()); err != nil {
157157
glog.Errorf("could not shutdown: %v", err)
158158
}
@@ -167,7 +167,7 @@ func (hc *HealthController) Run(healthChan <-chan *ControllerHeartbeat, stopCh <
167167

168168
}
169169

170-
//NewHealthController creates a new healh controller and returns a reference to it
170+
//NewHealthController creates a new health controller and returns a reference to it
171171
func NewHealthController(config *options.KubeRouterConfig) (*HealthController, error) {
172172
hc := HealthController{
173173
Config: config,

‎app/controllers/metrics_controller.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var (
1919
serviceTotalConn = prometheus.NewGaugeVec(prometheus.GaugeOpts{
2020
Namespace: namespace,
2121
Name: "service_total_connections",
22-
Help: "Total incoming conntections made",
22+
Help: "Total incoming connections made",
2323
}, []string{"namespace", "service_name", "service_vip", "protocol", "port"})
2424
servicePacketsIn = prometheus.NewGaugeVec(prometheus.GaugeOpts{
2525
Namespace: namespace,
@@ -29,7 +29,7 @@ var (
2929
servicePacketsOut = prometheus.NewGaugeVec(prometheus.GaugeOpts{
3030
Namespace: namespace,
3131
Name: "service_packets_out",
32-
Help: "Total outoging packets",
32+
Help: "Total outgoing packets",
3333
}, []string{"namespace", "service_name", "service_vip", "protocol", "port"})
3434
serviceBytesIn = prometheus.NewGaugeVec(prometheus.GaugeOpts{
3535
Namespace: namespace,
@@ -49,7 +49,7 @@ var (
4949
servicePpsOut = prometheus.NewGaugeVec(prometheus.GaugeOpts{
5050
Namespace: namespace,
5151
Name: "service_pps_out",
52-
Help: "Outoging packets per second",
52+
Help: "Outgoing packets per second",
5353
}, []string{"namespace", "service_name", "service_vip", "protocol", "port"})
5454
serviceCPS = prometheus.NewGaugeVec(prometheus.GaugeOpts{
5555
Namespace: namespace,
@@ -64,7 +64,7 @@ var (
6464
serviceBpsOut = prometheus.NewGaugeVec(prometheus.GaugeOpts{
6565
Namespace: namespace,
6666
Name: "service_bps_out",
67-
Help: "Outoging bytes per second",
67+
Help: "Outgoing bytes per second",
6868
}, []string{"namespace", "service_name", "service_vip", "protocol", "port"})
6969
controllerIpvsServices = prometheus.NewGaugeVec(prometheus.GaugeOpts{
7070
Namespace: namespace,

‎app/controllers/network_routes_controller.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ func (nrc *NetworkRoutingController) Cleanup() {
871871
}
872872

873873
func (nrc *NetworkRoutingController) disableSourceDestinationCheck() {
874-
nodes, err := nrc.clientset.Core().Nodes().List(metav1.ListOptions{})
874+
nodes, err := nrc.clientset.CoreV1().Nodes().List(metav1.ListOptions{})
875875
if err != nil {
876876
glog.Errorf("Failed to list nodes from API server due to: %s. Can not perform BGP peer sync", err.Error())
877877
return
@@ -882,8 +882,8 @@ func (nrc *NetworkRoutingController) disableSourceDestinationCheck() {
882882
return
883883
}
884884
providerID := strings.Replace(node.Spec.ProviderID, "///", "//", 1)
885-
url, err := url.Parse(providerID)
886-
instanceID := url.Path
885+
URL, err := url.Parse(providerID)
886+
instanceID := URL.Path
887887
instanceID = strings.Trim(instanceID, "/")
888888

889889
sess, _ := session.NewSession(aws.NewConfig().WithMaxRetries(5))
@@ -913,7 +913,7 @@ func (nrc *NetworkRoutingController) disableSourceDestinationCheck() {
913913

914914
func (nrc *NetworkRoutingController) syncNodeIPSets() error {
915915
// Get the current list of the nodes from API server
916-
nodes, err := nrc.clientset.Core().Nodes().List(metav1.ListOptions{})
916+
nodes, err := nrc.clientset.CoreV1().Nodes().List(metav1.ListOptions{})
917917
if err != nil {
918918
return errors.New("Failed to list nodes from API server: " + err.Error())
919919
}
@@ -979,7 +979,7 @@ func (nrc *NetworkRoutingController) syncInternalPeers() {
979979
}()
980980

981981
// get the current list of the nodes from API server
982-
nodes, err := nrc.clientset.Core().Nodes().List(metav1.ListOptions{})
982+
nodes, err := nrc.clientset.CoreV1().Nodes().List(metav1.ListOptions{})
983983
if err != nil {
984984
glog.Errorf("Failed to list nodes from API server due to: %s. Can not perform BGP peer sync", err.Error())
985985
return
@@ -1323,7 +1323,7 @@ func (nrc *NetworkRoutingController) startBgpServer() error {
13231323
}
13241324

13251325
// Get Global Peer Router Password configs
1326-
peerPasswords := []string{}
1326+
var peerPasswords []string
13271327
nodeBGPPasswordsAnnotation, ok := node.ObjectMeta.Annotations["kube-router.io/peer.passwords"]
13281328
if !ok {
13291329
glog.Infof("Could not find BGP peer password info in the node's annotations. Assuming no passwords.")

‎app/controllers/network_services_controller.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ func (nsc *NetworkServicesController) syncIpvsServices(serviceInfoMap serviceInf
336336
for k, svc := range serviceInfoMap {
337337
var protocol uint16
338338

339-
switch aProtocol := svc.protocol; aProtocol {
339+
switch svc.protocol {
340340
case "tcp":
341341
protocol = syscall.IPPROTO_TCP
342342
case "udp":
@@ -663,12 +663,12 @@ func prepareEndpointForDsr(containerId string, endpointIP string, vip string) er
663663
glog.V(1).Infof("Current network namespace before netns.Set: " + activeNetworkNamespaceHandle.String())
664664
activeNetworkNamespaceHandle.Close()
665665

666-
client, err := client.NewEnvClient()
666+
dockerClient, err := client.NewEnvClient()
667667
if err != nil {
668668
return errors.New("Failed to get docker client due to " + err.Error())
669669
}
670670

671-
containerSpec, err := client.ContainerInspect(context.Background(), containerId)
671+
containerSpec, err := dockerClient.ContainerInspect(context.Background(), containerId)
672672
if err != nil {
673673
return errors.New("Failed to get docker container spec due to " + err.Error())
674674
}
@@ -842,7 +842,7 @@ func buildServicesInfo() serviceInfoMap {
842842
}
843843
}
844844
copy(svcInfo.externalIPs, svc.Spec.ExternalIPs)
845-
svcInfo.sessionAffinity = (svc.Spec.SessionAffinity == "ClientIP")
845+
svcInfo.sessionAffinity = svc.Spec.SessionAffinity == "ClientIP"
846846
_, svcInfo.hairpin = svc.ObjectMeta.Annotations["kube-router.io/service.hairpin"]
847847
_, svcInfo.local = svc.ObjectMeta.Annotations["kube-router.io/service.local"]
848848

@@ -1487,12 +1487,12 @@ func setupRoutesForExternalIPForDSR(serviceInfoMap serviceInfoMap) error {
14871487
return nil
14881488
}
14891489

1490-
// unique identfier for a load-balanced service (namespace + name + portname)
1490+
// unique identifier for a load-balanced service (namespace + name + portname)
14911491
func generateServiceId(namespace, svcName, port string) string {
14921492
return namespace + "-" + svcName + "-" + port
14931493
}
14941494

1495-
// unique identfier for a load-balanced service (namespace + name + portname)
1495+
// unique identifier for a load-balanced service (namespace + name + portname)
14961496
func generateIpPortId(ip, protocol, port string) string {
14971497
return ip + "-" + protocol + "-" + port
14981498
}
@@ -1532,7 +1532,7 @@ func getKubeDummyInterface() (netlink.Link, error) {
15321532
dummyVipInterface, err := netlink.LinkByName(KUBE_DUMMY_IF)
15331533
if err != nil && err.Error() == IFACE_NOT_FOUND {
15341534
glog.V(1).Infof("Could not find dummy interface: " + KUBE_DUMMY_IF + " to assign cluster ip's, creating one")
1535-
err = netlink.LinkAdd(&netlink.Dummy{netlink.LinkAttrs{Name: KUBE_DUMMY_IF}})
1535+
err = netlink.LinkAdd(&netlink.Dummy{LinkAttrs: netlink.LinkAttrs{Name: KUBE_DUMMY_IF}})
15361536
if err != nil {
15371537
return nil, errors.New("Failed to add dummy interface: " + err.Error())
15381538
}

‎app/watchers/endpoints_watcher.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
"k8s.io/apimachinery/pkg/fields"
1111
"k8s.io/client-go/kubernetes"
12-
cache "k8s.io/client-go/tools/cache"
12+
"k8s.io/client-go/tools/cache"
1313
)
1414

1515
type Operation int
@@ -103,7 +103,7 @@ func StartEndpointsWatcher(clientset *kubernetes.Clientset, resyncPeriod time.Du
103103

104104
ew.clientset = clientset
105105
ew.broadcaster = utils.NewBroadcaster()
106-
lw := cache.NewListWatchFromClient(clientset.Core().RESTClient(), "endpoints", metav1.NamespaceAll, fields.Everything())
106+
lw := cache.NewListWatchFromClient(clientset.CoreV1().RESTClient(), "endpoints", metav1.NamespaceAll, fields.Everything())
107107
ew.endpointsLister, ew.endpointsController = cache.NewIndexerInformer(
108108
lw,
109109
&api.Endpoints{}, resyncPeriod, eventHandler,

‎app/watchers/namespace_watcher.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"k8s.io/apimachinery/pkg/labels"
1212
"k8s.io/client-go/kubernetes"
1313
listers "k8s.io/client-go/listers/core/v1"
14-
cache "k8s.io/client-go/tools/cache"
14+
"k8s.io/client-go/tools/cache"
1515
)
1616

1717
type NamespaceUpdate struct {
@@ -97,7 +97,7 @@ func StartNamespaceWatcher(clientset *kubernetes.Clientset, resyncPeriod time.Du
9797

9898
nsw.clientset = clientset
9999
nsw.broadcaster = utils.NewBroadcaster()
100-
lw := cache.NewListWatchFromClient(clientset.Core().RESTClient(), "namespaces", metav1.NamespaceAll, fields.Everything())
100+
lw := cache.NewListWatchFromClient(clientset.CoreV1().RESTClient(), "namespaces", metav1.NamespaceAll, fields.Everything())
101101
nsw.namespaceLister, nsw.namespaceController = cache.NewIndexerInformer(
102102
lw,
103103
&api.Namespace{}, resyncPeriod, eventHandler,

‎app/watchers/network_policy_watcher.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1313
"k8s.io/apimachinery/pkg/fields"
1414
"k8s.io/client-go/kubernetes"
15-
cache "k8s.io/client-go/tools/cache"
15+
"k8s.io/client-go/tools/cache"
1616
)
1717

1818
type NetworkPolicyUpdate struct {
@@ -92,13 +92,13 @@ func StartNetworkPolicyWatcher(clientset *kubernetes.Clientset, resyncPeriod tim
9292
npw.broadcaster = utils.NewBroadcaster()
9393
var lw *cache.ListWatch
9494
if v1NetworkPolicy {
95-
lw = cache.NewListWatchFromClient(clientset.Networking().RESTClient(), "networkpolicies", metav1.NamespaceAll, fields.Everything())
95+
lw = cache.NewListWatchFromClient(clientset.NetworkingV1().RESTClient(), "networkpolicies", metav1.NamespaceAll, fields.Everything())
9696
npw.networkPolicyLister, npw.networkPolicyController = cache.NewIndexerInformer(
9797
lw, &networking.NetworkPolicy{}, resyncPeriod, eventHandler,
9898
cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},
9999
)
100100
} else {
101-
lw = cache.NewListWatchFromClient(clientset.Extensions().RESTClient(), "networkpolicies", metav1.NamespaceAll, fields.Everything())
101+
lw = cache.NewListWatchFromClient(clientset.ExtensionsV1beta1().RESTClient(), "networkpolicies", metav1.NamespaceAll, fields.Everything())
102102
npw.networkPolicyLister, npw.networkPolicyController = cache.NewIndexerInformer(
103103
lw, &apiextensions.NetworkPolicy{}, resyncPeriod, eventHandler,
104104
cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},

‎app/watchers/node_watcher.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
99
"k8s.io/apimachinery/pkg/fields"
1010
"k8s.io/client-go/kubernetes"
11-
cache "k8s.io/client-go/tools/cache"
11+
"k8s.io/client-go/tools/cache"
1212
)
1313

1414
type NodeUpdate struct {
@@ -85,7 +85,7 @@ func StartNodeWatcher(clientset *kubernetes.Clientset, resyncPeriod time.Duratio
8585

8686
nw.clientset = clientset
8787
nw.broadcaster = utils.NewBroadcaster()
88-
lw := cache.NewListWatchFromClient(clientset.Core().RESTClient(), "nodes", metav1.NamespaceAll, fields.Everything())
88+
lw := cache.NewListWatchFromClient(clientset.CoreV1().RESTClient(), "nodes", metav1.NamespaceAll, fields.Everything())
8989
nw.nodeLister, nw.nodeController = cache.NewIndexerInformer(
9090
lw,
9191
&api.Node{}, resyncPeriod, eventHandler,

‎app/watchers/pods_watcher.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"k8s.io/apimachinery/pkg/labels"
1212
"k8s.io/client-go/kubernetes"
1313
listers "k8s.io/client-go/listers/core/v1"
14-
cache "k8s.io/client-go/tools/cache"
14+
"k8s.io/client-go/tools/cache"
1515
)
1616

1717
type PodUpdate struct {
@@ -102,7 +102,7 @@ func StartPodWatcher(clientset *kubernetes.Clientset, resyncPeriod time.Duration
102102

103103
pw.clientset = clientset
104104
pw.broadcaster = utils.NewBroadcaster()
105-
lw := cache.NewListWatchFromClient(clientset.Core().RESTClient(), "pods", metav1.NamespaceAll, fields.Everything())
105+
lw := cache.NewListWatchFromClient(clientset.CoreV1().RESTClient(), "pods", metav1.NamespaceAll, fields.Everything())
106106
pw.podLister, pw.podController = cache.NewIndexerInformer(
107107
lw,
108108
&api.Pod{}, resyncPeriod, eventHandler,

0 commit comments

Comments
 (0)