Skip to content

Commit 42776b6

Browse files
aLekSermarkmandel
andauthored
GolangCI-lint updating version to 1.30 (agones-dev#1785)
Add exportloopref which is a successor of obsoleted scopelint. Disable unnecessaryDefer which are located right before return. Co-authored-by: Mark Mandel <markmandel@google.com>
1 parent bbb8119 commit 42776b6

5 files changed

Lines changed: 7 additions & 5 deletions

File tree

‎.golangci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ output:
4646

4747
linters:
4848
enable:
49+
- exportloopref
4950
- deadcode
5051
- megacheck
5152
- govet
@@ -77,6 +78,7 @@ linters-settings:
7778
disabled-checks:
7879
- paramTypeCombine
7980
- unnamedResult
81+
- unnecessaryDefer
8082
settings: # settings passed to gocritic
8183
hugeParam:
8284
sizeThreshold: 512

‎build/build-image/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ RUN curl -L ${HELM_URL} > /tmp/helm.tar.gz \
6868
RUN echo "source <(helm completion bash)" >> /root/.bashrc
6969

7070
# install golang-ci linter
71-
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.27.0
71+
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.30.0
7272

7373
#
7474
# \ \ / /__| |__ ___(_) |_ ___

‎cmd/controller/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ func parseEnvFlags() config {
247247
viper.SetDefault(sidecarMemoryLimitFlag, "0")
248248
viper.SetDefault(pullSidecarFlag, false)
249249
viper.SetDefault(sdkServerAccountFlag, "agones-sdk")
250-
viper.SetDefault(certFileFlag, filepath.Join(base, "certs/server.crt"))
251-
viper.SetDefault(keyFileFlag, filepath.Join(base, "certs/server.key"))
250+
viper.SetDefault(certFileFlag, filepath.Join(base, "certs", "server.crt"))
251+
viper.SetDefault(keyFileFlag, filepath.Join(base, "certs", "server.key"))
252252
viper.SetDefault(enablePrometheusMetricsFlag, true)
253253
viper.SetDefault(enableStackdriverMetricsFlag, false)
254254
viper.SetDefault(stackdriverLabels, "")

‎test/e2e/framework/framework.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func NewFromFlags() (*Framework, error) {
152152
return nil, err
153153
}
154154

155-
viper.SetDefault(kubeconfigFlag, filepath.Join(usr.HomeDir, "/.kube/config"))
155+
viper.SetDefault(kubeconfigFlag, filepath.Join(usr.HomeDir, ".kube", "config"))
156156
viper.SetDefault(gsimageFlag, "gcr.io/agones-images/udp-server:0.21")
157157
viper.SetDefault(pullSecretFlag, "")
158158
viper.SetDefault(stressTestLevelFlag, 0)

‎test/load/allocation/allocationload.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func main() {
3535
if err != nil {
3636
logrus.Fatalf("Unable to determine the current user: %v", err)
3737
}
38-
kubeconfig := flag.String("kubeconfig", filepath.Join(usr.HomeDir, "/.kube/config"),
38+
kubeconfig := flag.String("kubeconfig", filepath.Join(usr.HomeDir, ".kube", "config"),
3939
"kube config path, e.g. $HOME/.kube/config")
4040
fleetName := flag.String("fleet_name", "simple-udp", "The fleet name that the tests will run against")
4141
qps := flag.Int("qps", 1000, "The QPS value that will overwrite the default value")

0 commit comments

Comments
 (0)