Skip to content

Commit e7f898b

Browse files
committed
Update golangci lint version
1 parent 2412b04 commit e7f898b

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

Diff for: hack/bin/deps.bzl

+11-11
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ def install_integration_test_dependencies():
142142
http_file(
143143
name = "kube-apiserver_linux_amd64",
144144
executable = 1,
145-
sha256 = "b4505b838b27b170531afbdef5e7bfaacf83da665f21b0e3269d1775b0defb7a",
146-
urls = ["https://storage.googleapis.com/kubernetes-release/release/v1.17.3/bin/linux/amd64/kube-apiserver"],
145+
sha256 = "a70a704835450130f8feeac9d42617d527e269c25a5aa92590e54533c2d4f776",
146+
urls = ["https://storage.googleapis.com/cockroach-operator-testing-assets/kube-apiserver-1.24.2_linux_amd64"],
147147
)
148148

149149
http_archive(
@@ -220,14 +220,14 @@ def install_k3d():
220220
def install_golangci_lint():
221221
http_archive(
222222
name = "golangci_lint_darwin",
223-
sha256 = "15c4d19a2c85a04f67779047dbb9467ba176c71fff762a0d514a21bb75e4b42c",
224-
urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.56.2/golangci-lint-1.56.2-darwin-amd64.tar.gz"],
223+
sha256 = "5c280ef3284f80c54fd90d73dc39ca276953949da1db03eb9dd0fbf868cc6e55",
224+
urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.61.0/golangci-lint-1.61.0-darwin-amd64.tar.gz"],
225225
build_file_content =
226226
"""
227227
filegroup(
228228
name = "file",
229229
srcs = [
230-
"golangci-lint-1.56.2-darwin-amd64/golangci-lint",
230+
"golangci-lint-1.61.0-darwin-amd64/golangci-lint",
231231
],
232232
visibility = ["//visibility:public"],
233233
)
@@ -236,14 +236,14 @@ filegroup(
236236

237237
http_archive(
238238
name = "golangci_lint_m1",
239-
sha256 = "5f9ecda712c7ae08fbf872336fae3db866720e5865903d4c53903184b2a2c2dc",
240-
urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.56.2/golangci-lint-1.56.2-darwin-arm64.tar.gz"],
239+
sha256 = "544334890701e4e04a6e574bc010bea8945205c08c44cced73745a6378012d36",
240+
urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.61.0/golangci-lint-1.61.0-darwin-arm64.tar.gz"],
241241
build_file_content =
242242
"""
243243
filegroup(
244244
name = "file",
245245
srcs = [
246-
"golangci-lint-1.56.2-darwin-arm64/golangci-lint",
246+
"golangci-lint-1.61.0-darwin-arm64/golangci-lint",
247247
],
248248
visibility = ["//visibility:public"],
249249
)
@@ -252,14 +252,14 @@ filegroup(
252252

253253
http_archive(
254254
name = "golangci_lint_linux",
255-
sha256 = "e1c313fb5fc85a33890fdee5dbb1777d1f5829c84d655a47a55688f3aad5e501",
256-
urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.56.2/golangci-lint-1.56.2-linux-amd64.tar.gz"],
255+
sha256 = "77cb0af99379d9a21d5dc8c38364d060e864a01bd2f3e30b5e8cc550c3a54111",
256+
urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.61.0/golangci-lint-1.61.0-linux-amd64.tar.gz"],
257257
build_file_content =
258258
"""
259259
filegroup(
260260
name = "file",
261261
srcs = [
262-
"golangci-lint-1.56.2-linux-amd64/golangci-lint",
262+
"golangci-lint-1.61.0-linux-amd64/golangci-lint",
263263
],
264264
visibility = ["//visibility:public"],
265265
)

Diff for: pkg/resource/statefulset.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ func (b StatefulSetBuilder) makePodTemplate() corev1.PodTemplateSpec {
232232
pod.Spec.TopologySpreadConstraints = b.Spec().TopologySpreadConstraints
233233
}
234234

235-
if b.Spec().NodeSelector != nil && len(b.Spec().NodeSelector) > 0 {
235+
if len(b.Spec().NodeSelector) > 0 {
236236
pod.Spec.NodeSelector = b.Spec().NodeSelector
237237
}
238238

Diff for: pkg/testutil/require.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ func RequireClusterInFailedState(t *testing.T, sb testenv.DiffingSandbox, b Clus
660660
},
661661
}
662662

663-
wErr := wait.Poll(10*time.Second, 2*time.Minute, func() (bool, error) {
663+
wErr := wait.Poll(10*time.Second, 5*time.Minute, func() (bool, error) {
664664
if err := sb.Get(&crdbCluster); err != nil {
665665
return false, err
666666
}
@@ -672,6 +672,7 @@ func RequireClusterInFailedState(t *testing.T, sb testenv.DiffingSandbox, b Clus
672672
return false, nil
673673
})
674674

675+
t.Logf("CRDB Cluster status: %s", crdbCluster.Status.ClusterStatus)
675676
require.NoError(t, wErr)
676677
}
677678

0 commit comments

Comments
 (0)