Skip to content

Commit

Permalink
[CRDB-45562] go.mod: Fixed security vulnerabilities and updated go ve…
Browse files Browse the repository at this point in the history
…rsion 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
  • Loading branch information
NishanthNalluri authored Feb 4, 2025
1 parent 286ae86 commit f109a91
Show file tree
Hide file tree
Showing 11 changed files with 219 additions and 201 deletions.
10 changes: 5 additions & 5 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
# gazelle:proto disable_global
# gazelle:exclude docs/generated/reference/generate/json_swagger

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

# TODO
load("@bazel_gazelle//:def.bzl", "gazelle")
load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
load("@rules_oci//oci:defs.bzl", "oci_push")

# export WORKSPACE so workspace_binary rules can be used outside the root
exports_files([
"WORKSPACE",
Expand All @@ -13,10 +17,6 @@ exports_files([
"go.sum",
])

# TODO
load("@bazel_gazelle//:def.bzl", "gazelle")
load("@rules_oci//oci:defs.bzl", "oci_push")

gazelle(name = "gazelle")

expand_template(
Expand Down
36 changes: 24 additions & 12 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -19,53 +19,65 @@ protobuf_deps()

http_archive(
name = "com_github_bazelbuild_buildtools",
sha256 = "a02ba93b96a8151b5d8d3466580f6c1f7e77212c4eb181cba53eb2cae7752a23",
strip_prefix = "buildtools-3.5.0",
sha256 = "051951c10ff8addeb4f10be3b0cf474b304b2ccd675f2cc7683cdd9010320ca9",
strip_prefix = "buildtools-7.3.1",
urls = [
"https://github.com/bazelbuild/buildtools/archive/3.5.0.tar.gz",
"https://github.com/bazelbuild/buildtools/archive/v7.3.1.tar.gz",
],
)

#################################
# External Go Rules and Gazelle #
#################################

http_archive(
name = "bazel_skylib",
sha256 = "9f38886a40548c6e96c106b752f242130ee11aaa068a56ba7e56f4511f33e4f2",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
],
)

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()

http_archive(
name = "io_bazel_rules_go",
sha256 = "8e968b5fcea1d2d64071872b12737bbb5514524ee5f0a4f54f5920266c261acb",
sha256 = "33acc4ae0f70502db4b893c9fc1dd7a9bf998c23e7ff2c4517741d4049a976f8",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.28.0/rules_go-v0.28.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.28.0/rules_go-v0.28.0.zip",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.48.0/rules_go-v0.48.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.48.0/rules_go-v0.48.0.zip",
],
)

http_archive(
name = "bazel_gazelle",
sha256 = "62ca106be173579c0a167deb23358fdfe71ffa1e4cfdddf5582af26520f1c66f",
sha256 = "75df288c4b31c81eb50f51e2e14f4763cb7548daae126817247064637fd9ea62",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.23.0/bazel-gazelle-v0.23.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.23.0/bazel-gazelle-v0.23.0.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.36.0/bazel-gazelle-v0.36.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.36.0/bazel-gazelle-v0.36.0.tar.gz",
],
)

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

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

go_rules_dependencies()

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

go_register_toolchains(version = "1.17")
go_register_toolchains(version = "1.22.3")

gazelle_dependencies()



################################
# begin rules_oci dependencies #
################################
Expand Down
28 changes: 5 additions & 23 deletions cmd/cockroach-operator/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
load("@io_bazel_rules_go//go:def.bzl","go_library")
load("@rules_oci//oci:defs.bzl", "oci_image", "oci_image_index")
load("@rules_pkg//:pkg.bzl", "pkg_tar")
load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")

expand_template(
name = "labels",
Expand All @@ -28,7 +28,7 @@ go_library(
"prep_webhooks.go",
],
importpath = "github.com/cockroachdb/cockroach-operator/cmd/cockroach-operator",
visibility = ["//visibility:private"],
visibility = ["//visibility:public"],
deps = [
"//apis/v1alpha1:go_default_library",
"//pkg/controller:go_default_library",
Expand All @@ -47,24 +47,6 @@ go_library(
],
)

go_binary(
name = "cockroach-operator-linux-amd64",
out = "cockroach-operator",
embed = [":go_default_library"],
goarch = "amd64",
goos = "linux",
visibility = ["//visibility:public"],
)

go_binary(
name = "cockroach-operator-linux-arm64",
out = "cockroach-operator",
embed = [":go_default_library"],
goarch = "arm64",
goos = "linux",
visibility = ["//visibility:public"],
)

pkg_tar(
name = "licenses",
srcs = ["//:license"],
Expand Down Expand Up @@ -107,13 +89,13 @@ oci_image(

pkg_tar(
name = "operator_image_linux_amd64",
srcs = [":cockroach-operator-linux-amd64"],
srcs = ["//cmd/cockroach-operator/linux-amd64:cockroach-operator-linux-amd64"],
visibility = ["//visibility:public"],
)

pkg_tar(
name = "operator_image_linux_arm64",
srcs = [":cockroach-operator-linux-arm64"],
srcs = ["//cmd/cockroach-operator/linux-arm64:cockroach-operator-linux-arm64"],
visibility = ["//visibility:public"],
)

Expand Down
10 changes: 10 additions & 0 deletions cmd/cockroach-operator/linux-amd64/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
load("@rules_pkg//:pkg.bzl", "pkg_tar")
load("@io_bazel_rules_go//go:def.bzl", "go_binary")

genrule(
name = "fetch_linux_amd64_crdb_container",
Expand All @@ -8,6 +9,15 @@ genrule(
visibility = ["//visibility:public"],
)

go_binary(
name = "cockroach-operator-linux-amd64",
out = "cockroach-operator",
embed = ["//cmd/cockroach-operator:go_default_library"],
goarch = "amd64",
goos = "linux",
visibility = ["//visibility:public"],
)

pkg_tar(
name = "cockroach-linux-amd64-tar",
srcs = [":fetch_linux_amd64_crdb_container"],
Expand Down
10 changes: 10 additions & 0 deletions cmd/cockroach-operator/linux-arm64/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
load("@rules_pkg//:pkg.bzl", "pkg_tar")
load("@io_bazel_rules_go//go:def.bzl", "go_binary")

genrule(
name = "fetch_linux_arm64_crdb_container",
Expand All @@ -8,6 +9,15 @@ genrule(
visibility = ["//visibility:public"],
)

go_binary(
name = "cockroach-operator-linux-arm64",
out = "cockroach-operator",
embed = ["//cmd/cockroach-operator:go_default_library"],
goarch = "arm64",
goos = "linux",
visibility = ["//visibility:public"],
)

pkg_tar(
name = "cockroach-linux-arm64-tar",
srcs = [":fetch_linux_arm64_crdb_container"],
Expand Down
42 changes: 21 additions & 21 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
module github.com/cockroachdb/cockroach-operator

go 1.17
go 1.22.3

require (
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/Masterminds/semver/v3 v3.1.0
github.com/Masterminds/semver/v3 v3.1.1
github.com/banzaicloud/k8s-objectmatcher v1.8.0
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/cockroachdb/errors v1.8.0
github.com/dnaeon/go-vcr v1.0.1
github.com/dustin/go-humanize v1.0.0
github.com/go-logr/logr v0.4.0
github.com/go-logr/zapr v0.4.0
github.com/google/go-cmp v0.5.5
github.com/google/go-cmp v0.6.0
github.com/gosimple/slug v1.9.0
github.com/jackc/pgx/v4 v4.9.0
github.com/jackc/pgx/v4 v4.18.2
github.com/lithammer/shortuuid/v3 v3.0.7
github.com/octago/sflags v0.2.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.8.1
go.uber.org/zap v1.17.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.21.2
Expand All @@ -45,7 +45,7 @@ require (
github.com/cockroachdb/redact v1.0.6 // indirect
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/fatih/color v1.9.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
Expand All @@ -64,12 +64,12 @@ require (
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.7.0 // indirect
github.com/jackc/pgconn v1.14.3 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.0.5 // indirect
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
github.com/jackc/pgtype v1.5.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgtype v1.14.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kr/pretty v0.2.1 // indirect
Expand All @@ -83,29 +83,29 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_golang v1.11.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect
github.com/spf13/cobra v1.1.1 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b // indirect
golang.org/x/mod v0.4.0 // indirect
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.0.0-20210112200429-01de73cf58bd // indirect
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect
golang.org/x/tools v0.1.0 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
golang.org/x/tools v0.29.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.26.0 // indirect
google.golang.org/protobuf v1.36.3 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.21.2 // indirect
k8s.io/component-base v0.21.2 // indirect
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect
Expand Down
Loading

0 comments on commit f109a91

Please sign in to comment.