Skip to content

Commit f109a91

Browse files
[CRDB-45562] go.mod: Fixed security vulnerabilities and updated go version to 1.22 (#1079)
* fix: merge conflicts * fix: resolve PR reviews * modify: cockroach-operator binary output file * fix: cockroach-operator binaries issue for amd64 and arm64
1 parent 286ae86 commit f109a91

File tree

11 files changed

+219
-201
lines changed

11 files changed

+219
-201
lines changed

BUILD.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22
# gazelle:proto disable_global
33
# gazelle:exclude docs/generated/reference/generate/json_swagger
44

5-
load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
65
load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
76

7+
# TODO
8+
load("@bazel_gazelle//:def.bzl", "gazelle")
9+
load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
10+
load("@rules_oci//oci:defs.bzl", "oci_push")
11+
812
# export WORKSPACE so workspace_binary rules can be used outside the root
913
exports_files([
1014
"WORKSPACE",
@@ -13,10 +17,6 @@ exports_files([
1317
"go.sum",
1418
])
1519

16-
# TODO
17-
load("@bazel_gazelle//:def.bzl", "gazelle")
18-
load("@rules_oci//oci:defs.bzl", "oci_push")
19-
2020
gazelle(name = "gazelle")
2121

2222
expand_template(

WORKSPACE

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,53 +19,65 @@ protobuf_deps()
1919

2020
http_archive(
2121
name = "com_github_bazelbuild_buildtools",
22-
sha256 = "a02ba93b96a8151b5d8d3466580f6c1f7e77212c4eb181cba53eb2cae7752a23",
23-
strip_prefix = "buildtools-3.5.0",
22+
sha256 = "051951c10ff8addeb4f10be3b0cf474b304b2ccd675f2cc7683cdd9010320ca9",
23+
strip_prefix = "buildtools-7.3.1",
2424
urls = [
25-
"https://github.com/bazelbuild/buildtools/archive/3.5.0.tar.gz",
25+
"https://github.com/bazelbuild/buildtools/archive/v7.3.1.tar.gz",
2626
],
2727
)
2828

2929
#################################
3030
# External Go Rules and Gazelle #
3131
#################################
3232

33+
http_archive(
34+
name = "bazel_skylib",
35+
sha256 = "9f38886a40548c6e96c106b752f242130ee11aaa068a56ba7e56f4511f33e4f2",
36+
urls = [
37+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
38+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
39+
],
40+
)
41+
42+
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
43+
44+
bazel_skylib_workspace()
45+
3346
http_archive(
3447
name = "io_bazel_rules_go",
35-
sha256 = "8e968b5fcea1d2d64071872b12737bbb5514524ee5f0a4f54f5920266c261acb",
48+
sha256 = "33acc4ae0f70502db4b893c9fc1dd7a9bf998c23e7ff2c4517741d4049a976f8",
3649
urls = [
37-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.28.0/rules_go-v0.28.0.zip",
38-
"https://github.com/bazelbuild/rules_go/releases/download/v0.28.0/rules_go-v0.28.0.zip",
50+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.48.0/rules_go-v0.48.0.zip",
51+
"https://github.com/bazelbuild/rules_go/releases/download/v0.48.0/rules_go-v0.48.0.zip",
3952
],
4053
)
4154

4255
http_archive(
4356
name = "bazel_gazelle",
44-
sha256 = "62ca106be173579c0a167deb23358fdfe71ffa1e4cfdddf5582af26520f1c66f",
57+
sha256 = "75df288c4b31c81eb50f51e2e14f4763cb7548daae126817247064637fd9ea62",
4558
urls = [
46-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.23.0/bazel-gazelle-v0.23.0.tar.gz",
47-
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.23.0/bazel-gazelle-v0.23.0.tar.gz",
59+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.36.0/bazel-gazelle-v0.36.0.tar.gz",
60+
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.36.0/bazel-gazelle-v0.36.0.tar.gz",
4861
],
4962
)
5063

64+
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
5165
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
5266

5367
# we have to log go_dependencies before gazelle because of
5468
# and old version of http2 in the k8s API
5569
load("//hack/build:repos.bzl", "go_dependencies")
56-
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
5770

5871
go_rules_dependencies()
5972

6073
# gazelle:repository_macro hack/build/repos.bzl%_go_dependencies
6174
go_dependencies()
6275

63-
go_register_toolchains(version = "1.17")
76+
go_register_toolchains(version = "1.22.3")
6477

6578
gazelle_dependencies()
6679

6780

68-
6981
################################
7082
# begin rules_oci dependencies #
7183
################################

cmd/cockroach-operator/BUILD.bazel

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
1+
load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
2+
load("@io_bazel_rules_go//go:def.bzl","go_library")
23
load("@rules_oci//oci:defs.bzl", "oci_image", "oci_image_index")
34
load("@rules_pkg//:pkg.bzl", "pkg_tar")
4-
load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
55

66
expand_template(
77
name = "labels",
@@ -28,7 +28,7 @@ go_library(
2828
"prep_webhooks.go",
2929
],
3030
importpath = "github.com/cockroachdb/cockroach-operator/cmd/cockroach-operator",
31-
visibility = ["//visibility:private"],
31+
visibility = ["//visibility:public"],
3232
deps = [
3333
"//apis/v1alpha1:go_default_library",
3434
"//pkg/controller:go_default_library",
@@ -47,24 +47,6 @@ go_library(
4747
],
4848
)
4949

50-
go_binary(
51-
name = "cockroach-operator-linux-amd64",
52-
out = "cockroach-operator",
53-
embed = [":go_default_library"],
54-
goarch = "amd64",
55-
goos = "linux",
56-
visibility = ["//visibility:public"],
57-
)
58-
59-
go_binary(
60-
name = "cockroach-operator-linux-arm64",
61-
out = "cockroach-operator",
62-
embed = [":go_default_library"],
63-
goarch = "arm64",
64-
goos = "linux",
65-
visibility = ["//visibility:public"],
66-
)
67-
6850
pkg_tar(
6951
name = "licenses",
7052
srcs = ["//:license"],
@@ -107,13 +89,13 @@ oci_image(
10789

10890
pkg_tar(
10991
name = "operator_image_linux_amd64",
110-
srcs = [":cockroach-operator-linux-amd64"],
92+
srcs = ["//cmd/cockroach-operator/linux-amd64:cockroach-operator-linux-amd64"],
11193
visibility = ["//visibility:public"],
11294
)
11395

11496
pkg_tar(
11597
name = "operator_image_linux_arm64",
116-
srcs = [":cockroach-operator-linux-arm64"],
98+
srcs = ["//cmd/cockroach-operator/linux-arm64:cockroach-operator-linux-arm64"],
11799
visibility = ["//visibility:public"],
118100
)
119101

cmd/cockroach-operator/linux-amd64/BUILD.bazel

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load("@rules_pkg//:pkg.bzl", "pkg_tar")
2+
load("@io_bazel_rules_go//go:def.bzl", "go_binary")
23

34
genrule(
45
name = "fetch_linux_amd64_crdb_container",
@@ -8,6 +9,15 @@ genrule(
89
visibility = ["//visibility:public"],
910
)
1011

12+
go_binary(
13+
name = "cockroach-operator-linux-amd64",
14+
out = "cockroach-operator",
15+
embed = ["//cmd/cockroach-operator:go_default_library"],
16+
goarch = "amd64",
17+
goos = "linux",
18+
visibility = ["//visibility:public"],
19+
)
20+
1121
pkg_tar(
1222
name = "cockroach-linux-amd64-tar",
1323
srcs = [":fetch_linux_amd64_crdb_container"],

cmd/cockroach-operator/linux-arm64/BUILD.bazel

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load("@rules_pkg//:pkg.bzl", "pkg_tar")
2+
load("@io_bazel_rules_go//go:def.bzl", "go_binary")
23

34
genrule(
45
name = "fetch_linux_arm64_crdb_container",
@@ -8,6 +9,15 @@ genrule(
89
visibility = ["//visibility:public"],
910
)
1011

12+
go_binary(
13+
name = "cockroach-operator-linux-arm64",
14+
out = "cockroach-operator",
15+
embed = ["//cmd/cockroach-operator:go_default_library"],
16+
goarch = "arm64",
17+
goos = "linux",
18+
visibility = ["//visibility:public"],
19+
)
20+
1121
pkg_tar(
1222
name = "cockroach-linux-arm64-tar",
1323
srcs = [":fetch_linux_arm64_crdb_container"],

go.mod

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
module github.com/cockroachdb/cockroach-operator
22

3-
go 1.17
3+
go 1.22.3
44

55
require (
66
github.com/DATA-DOG/go-sqlmock v1.5.0
7-
github.com/Masterminds/semver/v3 v3.1.0
7+
github.com/Masterminds/semver/v3 v3.1.1
88
github.com/banzaicloud/k8s-objectmatcher v1.8.0
99
github.com/cenkalti/backoff v2.2.1+incompatible
1010
github.com/cockroachdb/errors v1.8.0
1111
github.com/dnaeon/go-vcr v1.0.1
1212
github.com/dustin/go-humanize v1.0.0
1313
github.com/go-logr/logr v0.4.0
1414
github.com/go-logr/zapr v0.4.0
15-
github.com/google/go-cmp v0.5.5
15+
github.com/google/go-cmp v0.6.0
1616
github.com/gosimple/slug v1.9.0
17-
github.com/jackc/pgx/v4 v4.9.0
17+
github.com/jackc/pgx/v4 v4.18.2
1818
github.com/lithammer/shortuuid/v3 v3.0.7
1919
github.com/octago/sflags v0.2.0
2020
github.com/spf13/pflag v1.0.5
21-
github.com/stretchr/testify v1.7.0
21+
github.com/stretchr/testify v1.8.1
2222
go.uber.org/zap v1.17.0
2323
gopkg.in/yaml.v2 v2.4.0
2424
k8s.io/api v0.21.2
@@ -45,7 +45,7 @@ require (
4545
github.com/cockroachdb/redact v1.0.6 // indirect
4646
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
4747
github.com/davecgh/go-spew v1.1.1 // indirect
48-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
48+
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
4949
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
5050
github.com/fatih/color v1.9.0 // indirect
5151
github.com/fsnotify/fsnotify v1.4.9 // indirect
@@ -64,12 +64,12 @@ require (
6464
github.com/imdario/mergo v0.3.12 // indirect
6565
github.com/inconshreveable/mousetrap v1.0.0 // indirect
6666
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
67-
github.com/jackc/pgconn v1.7.0 // indirect
67+
github.com/jackc/pgconn v1.14.3 // indirect
6868
github.com/jackc/pgio v1.0.0 // indirect
6969
github.com/jackc/pgpassfile v1.0.0 // indirect
70-
github.com/jackc/pgproto3/v2 v2.0.5 // indirect
71-
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
72-
github.com/jackc/pgtype v1.5.0 // indirect
70+
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
71+
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
72+
github.com/jackc/pgtype v1.14.0 // indirect
7373
github.com/json-iterator/go v1.1.12 // indirect
7474
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
7575
github.com/kr/pretty v0.2.1 // indirect
@@ -83,29 +83,29 @@ require (
8383
github.com/modern-go/reflect2 v1.0.2 // indirect
8484
github.com/pkg/errors v0.9.1 // indirect
8585
github.com/pmezard/go-difflib v1.0.0 // indirect
86-
github.com/prometheus/client_golang v1.11.0 // indirect
86+
github.com/prometheus/client_golang v1.11.1 // indirect
8787
github.com/prometheus/client_model v0.2.0 // indirect
8888
github.com/prometheus/common v0.26.0 // indirect
8989
github.com/prometheus/procfs v0.6.0 // indirect
9090
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect
9191
github.com/spf13/cobra v1.1.1 // indirect
9292
go.uber.org/atomic v1.7.0 // indirect
9393
go.uber.org/multierr v1.6.0 // indirect
94-
golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b // indirect
95-
golang.org/x/mod v0.4.0 // indirect
96-
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
94+
golang.org/x/crypto v0.32.0 // indirect
95+
golang.org/x/mod v0.22.0 // indirect
96+
golang.org/x/net v0.34.0 // indirect
9797
golang.org/x/oauth2 v0.0.0-20210112200429-01de73cf58bd // indirect
98-
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
99-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
100-
golang.org/x/text v0.3.6 // indirect
98+
golang.org/x/sync v0.10.0 // indirect
99+
golang.org/x/sys v0.29.0 // indirect
100+
golang.org/x/term v0.28.0 // indirect
101+
golang.org/x/text v0.21.0 // indirect
101102
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect
102-
golang.org/x/tools v0.1.0 // indirect
103-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
103+
golang.org/x/tools v0.29.0 // indirect
104104
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
105105
google.golang.org/appengine v1.6.7 // indirect
106-
google.golang.org/protobuf v1.26.0 // indirect
106+
google.golang.org/protobuf v1.36.3 // indirect
107107
gopkg.in/inf.v0 v0.9.1 // indirect
108-
gopkg.in/yaml.v3 v3.0.0 // indirect
108+
gopkg.in/yaml.v3 v3.0.1 // indirect
109109
k8s.io/apiextensions-apiserver v0.21.2 // indirect
110110
k8s.io/component-base v0.21.2 // indirect
111111
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect

0 commit comments

Comments
 (0)