Skip to content

Commit 9d5c0c8

Browse files
authored
Update the golangci-lint version from 1.50.1 to 1.51.1 (#977)
golangci-lint version is updated from the 1.50.1 because it is hitting the OOM issue with the Go 1.20 version and its fix has beendone in 1.51.1.
1 parent e8f430f commit 9d5c0c8

File tree

12 files changed

+73
-18
lines changed

12 files changed

+73
-18
lines changed

config/manager/patches/image.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,10 @@ spec:
186186
value: cockroachdb/cockroach:v22.1.14
187187
- name: RELATED_IMAGE_COCKROACH_v22_1_15
188188
value: cockroachdb/cockroach:v22.1.15
189+
- name: RELATED_IMAGE_COCKROACH_v22_1_16
190+
value: cockroachdb/cockroach:v22.1.16
191+
- name: RELATED_IMAGE_COCKROACH_v22_1_18
192+
value: cockroachdb/cockroach:v22.1.18
189193
- name: RELATED_IMAGE_COCKROACH_v22_2_0
190194
value: cockroachdb/cockroach:v22.2.0
191195
- name: RELATED_IMAGE_COCKROACH_v22_2_1
@@ -198,3 +202,9 @@ spec:
198202
value: cockroachdb/cockroach:v22.2.4
199203
- name: RELATED_IMAGE_COCKROACH_v22_2_5
200204
value: cockroachdb/cockroach:v22.2.5
205+
- name: RELATED_IMAGE_COCKROACH_v22_2_6
206+
value: cockroachdb/cockroach:v22.2.6
207+
- name: RELATED_IMAGE_COCKROACH_v22_2_7
208+
value: cockroachdb/cockroach:v22.2.7
209+
- name: RELATED_IMAGE_COCKROACH_v22_2_8
210+
value: cockroachdb/cockroach:v22.2.8

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,10 @@ spec:
342342
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7b907d03b001b758d8a4b5e898725c73dda2ec2aa4b7425b685320b947154d11
343343
- name: RELATED_IMAGE_COCKROACH_v22_1_15
344344
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0ec1dc184a2199736b4bd7de3241a357be7427caea5da1c931b08bc06f5c3dc0
345+
- name: RELATED_IMAGE_COCKROACH_v22_1_16
346+
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1d590946b2f7c7ec0c7ec057a338e81f864d6a9e3d3ac4e0769aa5756a8e13fc
347+
- name: RELATED_IMAGE_COCKROACH_v22_1_18
348+
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:363d8feb560324a848c5771edd224dc19020013af7641979ee81ae8ee536d7e3
345349
- name: RELATED_IMAGE_COCKROACH_v22_2_0
346350
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57
347351
- name: RELATED_IMAGE_COCKROACH_v22_2_1
@@ -354,3 +358,9 @@ spec:
354358
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:086d7b435993fdf21fd59b0093f52105a9028d6b769398b0033f98a65dfb7e79
355359
- name: RELATED_IMAGE_COCKROACH_v22_2_5
356360
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0fea6ed8a78ea624240ee6ffb3573d5cf1115186aa9180fcd7d1273351deaaa3
361+
- name: RELATED_IMAGE_COCKROACH_v22_2_6
362+
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:53c7b960a2ed70a0998a4f8e28a4f78f7f676e01cffebe665e91e3a7629d88ed
363+
- name: RELATED_IMAGE_COCKROACH_v22_2_7
364+
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d14f77f70aea0422a906510c1ac2652ff76e131ed705cb002f80e13e887b0cd9
365+
- name: RELATED_IMAGE_COCKROACH_v22_2_8
366+
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1e5d85f5db10fa79d09263db90daa44549bcc3b025e9f3f98cf0d4e51766394b

config/manifests/patches/deployment_patch.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,10 @@ spec:
195195
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:7b907d03b001b758d8a4b5e898725c73dda2ec2aa4b7425b685320b947154d11
196196
- name: RELATED_IMAGE_COCKROACH_v22_1_15
197197
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0ec1dc184a2199736b4bd7de3241a357be7427caea5da1c931b08bc06f5c3dc0
198+
- name: RELATED_IMAGE_COCKROACH_v22_1_16
199+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1d590946b2f7c7ec0c7ec057a338e81f864d6a9e3d3ac4e0769aa5756a8e13fc
200+
- name: RELATED_IMAGE_COCKROACH_v22_1_18
201+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:363d8feb560324a848c5771edd224dc19020013af7641979ee81ae8ee536d7e3
198202
- name: RELATED_IMAGE_COCKROACH_v22_2_0
199203
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57
200204
- name: RELATED_IMAGE_COCKROACH_v22_2_1
@@ -207,4 +211,10 @@ spec:
207211
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:086d7b435993fdf21fd59b0093f52105a9028d6b769398b0033f98a65dfb7e79
208212
- name: RELATED_IMAGE_COCKROACH_v22_2_5
209213
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0fea6ed8a78ea624240ee6ffb3573d5cf1115186aa9180fcd7d1273351deaaa3
214+
- name: RELATED_IMAGE_COCKROACH_v22_2_6
215+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:53c7b960a2ed70a0998a4f8e28a4f78f7f676e01cffebe665e91e3a7629d88ed
216+
- name: RELATED_IMAGE_COCKROACH_v22_2_7
217+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d14f77f70aea0422a906510c1ac2652ff76e131ed705cb002f80e13e887b0cd9
218+
- name: RELATED_IMAGE_COCKROACH_v22_2_8
219+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1e5d85f5db10fa79d09263db90daa44549bcc3b025e9f3f98cf0d4e51766394b
210220
image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER

config/samples/crdb-tls-example.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ kind: CrdbCluster
1919
metadata:
2020
name: crdb-tls-example
2121
spec:
22-
cockroachDBVersion: v22.2.5
22+
cockroachDBVersion: v22.2.8
2323
dataStore:
2424
pvc:
2525
spec:

crdb-versions.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,12 @@ CrdbVersions:
262262
- image: cockroachdb/cockroach:v22.1.15
263263
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0ec1dc184a2199736b4bd7de3241a357be7427caea5da1c931b08bc06f5c3dc0
264264
tag: v22.1.15
265+
- image: cockroachdb/cockroach:v22.1.16
266+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1d590946b2f7c7ec0c7ec057a338e81f864d6a9e3d3ac4e0769aa5756a8e13fc
267+
tag: v22.1.16
268+
- image: cockroachdb/cockroach:v22.1.18
269+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:363d8feb560324a848c5771edd224dc19020013af7641979ee81ae8ee536d7e3
270+
tag: v22.1.18
265271
- image: cockroachdb/cockroach:v22.2.0
266272
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57
267273
tag: v22.2.0
@@ -280,3 +286,12 @@ CrdbVersions:
280286
- image: cockroachdb/cockroach:v22.2.5
281287
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0fea6ed8a78ea624240ee6ffb3573d5cf1115186aa9180fcd7d1273351deaaa3
282288
tag: v22.2.5
289+
- image: cockroachdb/cockroach:v22.2.6
290+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:53c7b960a2ed70a0998a4f8e28a4f78f7f676e01cffebe665e91e3a7629d88ed
291+
tag: v22.2.6
292+
- image: cockroachdb/cockroach:v22.2.7
293+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d14f77f70aea0422a906510c1ac2652ff76e131ed705cb002f80e13e887b0cd9
294+
tag: v22.2.7
295+
- image: cockroachdb/cockroach:v22.2.8
296+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1e5d85f5db10fa79d09263db90daa44549bcc3b025e9f3f98cf0d4e51766394b
297+
tag: v22.2.8

e2e/openshift/openshift_packaging_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,17 +233,17 @@ var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
233233

234234
// randSeq returns a string of n letters
235235
func randSeq(n int) string {
236+
r := rand.New(rand.NewSource(time.Now().UnixNano()))
236237
b := make([]rune, n)
237238
for i := range b {
238-
b[i] = letters[rand.Intn(len(letters))]
239+
b[i] = letters[r.Intn(len(letters))]
239240
}
240241
return string(b)
241242
}
242243

243244
// wriiteFile writes out b byte array to a random file in the
244245
// os.TempDir and returns the name of that file.
245246
func writeFile(t *testing.T, b []byte) string {
246-
rand.Seed(time.Now().UnixNano())
247247
fileName := fmt.Sprintf("%s-test.yaml", randSeq(10))
248248
fileName = filepath.Join(t.TempDir(), fileName)
249249

examples/client-secure-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
serviceAccountName: cockroachdb-sa
2424
containers:
2525
- name: cockroachdb-client-secure
26-
image: cockroachdb/cockroach:v22.2.5
26+
image: cockroachdb/cockroach:v22.2.8
2727
imagePullPolicy: IfNotPresent
2828
volumeMounts:
2929
- name: client-certs

examples/example.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ spec:
4040
memory: 8Gi
4141
tlsEnabled: true
4242
# You can set either a version of the db or a specific image name
43-
# cockroachDBVersion: v22.2.5
43+
# cockroachDBVersion: v22.2.8
4444
image:
45-
name: cockroachdb/cockroach:v22.2.5
45+
name: cockroachdb/cockroach:v22.2.8
4646
# nodes refers to the number of crdb pods that are created
4747
# via the statefulset
4848
nodes: 3

examples/smoketest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ spec:
3939
memory: 300Mi
4040
tlsEnabled: true
4141
image:
42-
name: cockroachdb/cockroach:v22.2.5
42+
name: cockroachdb/cockroach:v22.2.8
4343
nodes: 3

hack/bin/deps.bzl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,14 @@ def install_k3d():
199199
def install_golangci_lint():
200200
http_archive(
201201
name = "golangci_lint_darwin",
202-
sha256 = "0f615fb8c364f6e4a213f2ed2ff7aa1fc2b208addf29511e89c03534067bbf57",
203-
urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.50.1/golangci-lint-1.50.1-darwin-amd64.tar.gz"],
202+
sha256 = "fba08acc4027f69f07cef48fbff70b8a7ecdfaa1c2aba9ad3fb31d60d9f5d4bc",
203+
urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.51.1/golangci-lint-1.51.1-darwin-amd64.tar.gz"],
204204
build_file_content =
205205
"""
206206
filegroup(
207207
name = "file",
208208
srcs = [
209-
"golangci-lint-1.50.1-darwin-amd64/golangci-lint",
209+
"golangci-lint-1.51.1-darwin-amd64/golangci-lint",
210210
],
211211
visibility = ["//visibility:public"],
212212
)
@@ -215,14 +215,14 @@ filegroup(
215215

216216
http_archive(
217217
name = "golangci_lint_m1",
218-
sha256 = "0f615fb8c364f6e4a213f2ed2ff7aa1fc2b208addf29511e89c03534067bbf57",
219-
urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.50.1/golangci-lint-1.50.1-darwin-arm64.tar.gz"],
218+
sha256 = "75b8f0ff3a4e68147156be4161a49d4576f1be37a0b506473f8c482140c1e7f2",
219+
urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.51.1/golangci-lint-1.51.1-darwin-arm64.tar.gz"],
220220
build_file_content =
221221
"""
222222
filegroup(
223223
name = "file",
224224
srcs = [
225-
"golangci-lint-1.50.1-darwin-arm64/golangci-lint",
225+
"golangci-lint-1.51.1-darwin-arm64/golangci-lint",
226226
],
227227
visibility = ["//visibility:public"],
228228
)
@@ -231,14 +231,14 @@ filegroup(
231231

232232
http_archive(
233233
name = "golangci_lint_linux",
234-
sha256 = "4ba1dc9dbdf05b7bdc6f0e04bdfe6f63aa70576f51817be1b2540bbce017b69a",
235-
urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.50.1/golangci-lint-1.50.1-linux-amd64.tar.gz"],
234+
sha256 = "17aeb26c76820c22efa0e1838b0ab93e90cfedef43fbfc9a2f33f27eb9e5e070",
235+
urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.51.1/golangci-lint-1.51.1-linux-amd64.tar.gz"],
236236
build_file_content =
237237
"""
238238
filegroup(
239239
name = "file",
240240
srcs = [
241-
"golangci-lint-1.50.1-linux-amd64/golangci-lint",
241+
"golangci-lint-1.51.1-linux-amd64/golangci-lint",
242242
],
243243
visibility = ["//visibility:public"],
244244
)

0 commit comments

Comments
 (0)