fix: cockroach-operator binaries issue for amd64 and arm64

cockroachdb · Feb 4, 2025 · 1e78b07 · 1e78b07
1 parent a8fa67e
commit 1e78b07
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 22 deletions.
diff --git a/cmd/cockroach-operator/BUILD.bazel b/cmd/cockroach-operator/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
-load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+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")
 
@@ -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",
@@ -47,24 +47,6 @@ go_library(
     ],
 )
 
-go_binary(
-    name = "cockroach-operator-linux-amd64",
-    out = "cockroach-operator-amd64",
-    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"],
@@ -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"],
 )
 

diff --git a/cmd/cockroach-operator/linux-amd64/BUILD.bazel b/cmd/cockroach-operator/linux-amd64/BUILD.bazel
@@ -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",
@@ -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"],

diff --git a/cmd/cockroach-operator/linux-arm64/BUILD.bazel b/cmd/cockroach-operator/linux-arm64/BUILD.bazel
@@ -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",
@@ -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"],