Skip to content

Commit 9eb227f

Browse files
committed
Require a clean golint
Some of my comments/changes might not be great, but its better than where we were!
1 parent 8471a10 commit 9eb227f

File tree

27 files changed

+230
-100
lines changed

27 files changed

+230
-100
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ install:
1212
- mkdir -p $HOME/gopath/src/k8s.io
1313
- mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/contrib
1414
- go get github.com/tools/godep
15+
- go get github.com/golang/lint/golint
1516
- export PATH=$GOPATH/bin:$PATH
1617
- godep go install ./...
1718

18-
1919
script:
2020
- hack/verify-all.sh
2121
- godep go test ./...

diurnal/dc.go

+9-11
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,14 @@ func parseTimeCounts(times string, counts string) ([]timeCount, error) {
106106
return tc, nil
107107
}
108108

109-
type Scaler struct {
109+
type scaler struct {
110110
timeCounts []timeCount
111111
selector labels.Selector
112112
start time.Time
113113
pos int
114114
done chan struct{}
115115
}
116116

117-
var posError = errors.New("could not find position")
118-
119117
func findPos(tc []timeCount, cur int, offset time.Duration) int {
120118
first := true
121119
for i := cur; i != cur || first; i = (i + 1) % len(tc) {
@@ -127,7 +125,7 @@ func findPos(tc []timeCount, cur int, offset time.Duration) int {
127125
return 0
128126
}
129127

130-
func (s *Scaler) setCount(c int) {
128+
func (s *scaler) setCount(c int) {
131129
glog.Infof("scaling to %d replicas", c)
132130
rcList, err := client.ReplicationControllers(namespace).List(s.selector)
133131
if err != nil {
@@ -142,15 +140,15 @@ func (s *Scaler) setCount(c int) {
142140
}
143141
}
144142

145-
func (s *Scaler) timeOffset() time.Duration {
143+
func (s *scaler) timeOffset() time.Duration {
146144
return time.Since(s.start) % dayPeriod
147145
}
148146

149-
func (s *Scaler) curpos(offset time.Duration) int {
147+
func (s *scaler) curpos(offset time.Duration) int {
150148
return findPos(s.timeCounts, s.pos, offset)
151149
}
152150

153-
func (s *Scaler) scale() {
151+
func (s *scaler) scale() {
154152
for {
155153
select {
156154
case <-s.done:
@@ -168,7 +166,7 @@ func (s *Scaler) scale() {
168166
}
169167
}
170168

171-
func (s *Scaler) Start() error {
169+
func (s *scaler) Start() error {
172170
now := time.Now().UTC()
173171
s.start = time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
174172
if *startNow {
@@ -196,7 +194,7 @@ func safeclose(c chan<- struct{}) (err error) {
196194
return nil
197195
}
198196

199-
func (s *Scaler) Stop() error {
197+
func (s *scaler) Stop() error {
200198
if err := safeclose(s.done); err != nil {
201199
return errors.New("already stopped scaling")
202200
}
@@ -211,7 +209,7 @@ var (
211209
local = flag.Bool("local", false, "set to true if running on local machine not within cluster")
212210
localPort = flag.Int("localport", 8001, "port that kubectl proxy is running on (local must be true)")
213211

214-
namespace string = os.Getenv("POD_NAMESPACE")
212+
namespace = os.Getenv("POD_NAMESPACE")
215213

216214
client *kclient.Client
217215
)
@@ -259,7 +257,7 @@ func main() {
259257
if namespace == "" {
260258
glog.Fatal("POD_NAMESPACE is not set. Set to the namespace of the replication controller if running locally.")
261259
}
262-
scaler := Scaler{timeCounts: tc, selector: selector}
260+
scaler := scaler{timeCounts: tc, selector: selector}
263261
if err != nil {
264262
glog.Fatal(err)
265263
}

for-demos/serve_hostname/serve_hostname.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ import (
2727
)
2828

2929
var (
30-
doTcp = flag.Bool("tcp", false, "Serve raw over TCP.")
31-
doUdp = flag.Bool("udp", false, "Serve raw over UDP.")
32-
doHttp = flag.Bool("http", true, "Serve HTTP.")
30+
doTCP = flag.Bool("tcp", false, "Serve raw over TCP.")
31+
doUDP = flag.Bool("udp", false, "Serve raw over UDP.")
32+
doHTTP = flag.Bool("http", true, "Serve HTTP.")
3333
port = flag.Int("port", 9376, "Port number.")
3434
)
3535

3636
func main() {
3737
flag.Parse()
3838

39-
if *doHttp && (*doTcp || *doUdp) {
39+
if *doHTTP && (*doTCP || *doUDP) {
4040
log.Fatalf("Can't server TCP/UDP mode and HTTP mode at the same time")
4141
}
4242

@@ -45,7 +45,7 @@ func main() {
4545
log.Fatalf("Error from os.Hostname(): %s", err)
4646
}
4747

48-
if *doTcp {
48+
if *doTCP {
4949
listener, err := net.Listen("tcp", fmt.Sprintf(":%d", *port))
5050
if err != nil {
5151
log.Fatalf("Error from net.Listen(): %s", err)
@@ -62,7 +62,7 @@ func main() {
6262
}
6363
}()
6464
}
65-
if *doUdp {
65+
if *doUDP {
6666
addr, err := net.ResolveUDPAddr("udp", fmt.Sprintf(":%d", *port))
6767
if err != nil {
6868
log.Fatalf("Error from net.ResolveUDPAddr(): %s", err)
@@ -83,7 +83,7 @@ func main() {
8383
}
8484
}()
8585
}
86-
if *doHttp {
86+
if *doHTTP {
8787
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
8888
log.Printf("HTTP request from %s", r.RemoteAddr)
8989
fmt.Fprintf(w, "%s", hostname)

0 commit comments

Comments
 (0)