Skip to content

Commit 5eaea6e

Browse files
prafull01prafull01
committed
Update golangci lint version
1 parent 239607f commit 5eaea6e

File tree

7 files changed

+23
-12
lines changed

7 files changed

+23
-12
lines changed

‎config/manager/patches/image.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,8 @@ spec:
312312
value: cockroachdb/cockroach:v23.2.12
313313
- name: RELATED_IMAGE_COCKROACH_v23_2_13
314314
value: cockroachdb/cockroach:v23.2.13
315+
- name: RELATED_IMAGE_COCKROACH_v23_2_14
316+
value: cockroachdb/cockroach:v23.2.14
315317
- name: RELATED_IMAGE_COCKROACH_v24_1_0
316318
value: cockroachdb/cockroach:v24.1.0
317319
- name: RELATED_IMAGE_COCKROACH_v24_1_1

‎config/manifests/bases/cockroach-operator.clusterserviceversion.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,8 @@ spec:
485485
name: RELATED_IMAGE_COCKROACH_v23_2_12
486486
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e0f21abea34825e55622c432a306f2e8aafd64d913eb78f2f601c51dc878a1da
487487
name: RELATED_IMAGE_COCKROACH_v23_2_13
488+
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6366ba29f301a82215c05e60d78e1de66bcee85440ce2fc3c692712d4da32685
489+
name: RELATED_IMAGE_COCKROACH_v23_2_14
488490
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
489491
name: RELATED_IMAGE_COCKROACH_v24_1_0
490492
- image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1374cbdc4ecf38e4b4226328f532e830b8932b34d9449bf2fbb36e60d0310521

‎config/manifests/patches/deployment_patch.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,8 @@ spec:
321321
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:a0faa52a999289b308dc4caf050c6d9fe2f42e112aa30e4af282ed1f21c5c346
322322
- name: RELATED_IMAGE_COCKROACH_v23_2_13
323323
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e0f21abea34825e55622c432a306f2e8aafd64d913eb78f2f601c51dc878a1da
324+
- name: RELATED_IMAGE_COCKROACH_v23_2_14
325+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6366ba29f301a82215c05e60d78e1de66bcee85440ce2fc3c692712d4da32685
324326
- name: RELATED_IMAGE_COCKROACH_v24_1_0
325327
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
326328
- name: RELATED_IMAGE_COCKROACH_v24_1_1

‎crdb-versions.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,9 @@ CrdbVersions:
451451
- image: cockroachdb/cockroach:v23.2.13
452452
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e0f21abea34825e55622c432a306f2e8aafd64d913eb78f2f601c51dc878a1da
453453
tag: v23.2.13
454+
- image: cockroachdb/cockroach:v23.2.14
455+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6366ba29f301a82215c05e60d78e1de66bcee85440ce2fc3c692712d4da32685
456+
tag: v23.2.14
454457
- image: cockroachdb/cockroach:v24.1.0
455458
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
456459
tag: v24.1.0

‎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
)

‎install/operator.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,8 @@ spec:
670670
value: cockroachdb/cockroach:v23.2.12
671671
- name: RELATED_IMAGE_COCKROACH_v23_2_13
672672
value: cockroachdb/cockroach:v23.2.13
673+
- name: RELATED_IMAGE_COCKROACH_v23_2_14
674+
value: cockroachdb/cockroach:v23.2.14
673675
- name: RELATED_IMAGE_COCKROACH_v24_1_0
674676
value: cockroachdb/cockroach:v24.1.0
675677
- name: RELATED_IMAGE_COCKROACH_v24_1_1

‎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

0 commit comments

Comments
 (0)