Update the bundle.sh to generate the bundle through opm (cockroachdb#984

)
cockroach-teamcity · Jun 5, 2023 · 1e1df53 · 1e1df53
1 parent eb6a8bf
commit 1e1df53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/hack/bin/deps.bzl b/hack/bin/deps.bzl
@@ -53,10 +53,12 @@ OPENSHIFT_BINS = {
         "opm_darwin": {
             "url": "{}/opm-mac-{}.tar.gz".format(OPENSHIFT_REPO, OPENSHIFT_VERSION),
             "sha": "36d7104b1fd29e77a880b63e3e1aa67639a48cca1fdf537411b40a0c36140dba",
+            "src": "darwin-amd64-opm",
          },
         "opm_linux": {
             "url": "{}/opm-linux-{}.tar.gz".format(OPENSHIFT_REPO, OPENSHIFT_VERSION),
             "sha": "6d422682fd688cbebc7818247005e2baf87675efef4931d2f0a2e744dc613b88",
+            "src": "opm",
         },
     },
 }
@@ -408,10 +410,10 @@ def install_opm():
           build_file_content = """
 filegroup(
     name = "file",
-    srcs = ["opm"],
+    srcs = ["{src}"],
     visibility = ["//visibility:public"],
 )
-"""
+""".format(src=v["src"])
 			)
 
 ## Fetch openshift-installer

diff --git a/hack/bundle.sh b/hack/bundle.sh
@@ -94,7 +94,6 @@ generate_bundle() {
   bundle.Dockerfile > "${dir}/Dockerfile"
 
   rm bundle.Dockerfile
-	rm "${dir}/manifests/cockroach-operator-webhook-service_v1_service.yaml"
 }
 
 adapt_csv() {