bazel: send the component name to prow_image

Signed-off-by: Steve Kuznetsov <[email protected]>
bobbypage · Mar 13, 2020 · 0d4dcac · 0d4dcac
1 parent 2e907ac
commit 0d4dcac
Show file tree

Hide file tree

Showing 51 changed files with 217 additions and 53 deletions.
diff --git a/boskos/aws-janitor/BUILD.bazel b/boskos/aws-janitor/BUILD.bazel
@@ -19,15 +19,18 @@ go_library(
     ],
 )
 
+NAME = "aws-janitor"
+
 go_binary(
-    name = "aws-janitor",
+    name = NAME,
     embed = [":go_default_library"],
     visibility = ["//visibility:public"],
 )
 
 prow_image(
     name = "image",
     base = "@gcloud-go//image",
+    component = NAME,
     visibility = ["//visibility:public"],
 )
 

diff --git a/boskos/aws-janitor/cmd/aws-janitor-boskos/BUILD.bazel b/boskos/aws-janitor/cmd/aws-janitor-boskos/BUILD.bazel
@@ -2,15 +2,18 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@io_bazel_rules_docker//go:image.bzl", "go_image")
 load("//prow:def.bzl", "prow_image")
 
+NAME = "aws-janitor-boskos"
+
 go_binary(
-    name = "aws-janitor-boskos",
+    name = NAME,
     embed = [":go_default_library"],
     visibility = ["//visibility:public"],
 )
 
 prow_image(
     name = "image",
     base = "@gcloud-go//image",
+    component = NAME,
     visibility = ["//visibility:public"],
 )
 

diff --git a/boskos/cmd/boskos/BUILD.bazel b/boskos/cmd/boskos/BUILD.bazel
@@ -1,15 +1,18 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//prow:def.bzl", "prow_image")
 
+NAME = "boskos"
+
 go_binary(
-    name = "boskos",
+    name = NAME,
     embed = [":go_default_library"],
     pure = "on",
     visibility = ["//visibility:public"],
 )
 
 prow_image(
     name = "image",
+    component = NAME,
     visibility = ["//visibility:public"],
 )
 

diff --git a/boskos/cmd/boskos/boskos.go b/boskos/cmd/boskos/boskos.go
@@ -68,7 +68,7 @@ func init() {
 }
 
 func main() {
-	logrusutil.ComponentInit("boskos")
+	logrusutil.ComponentInit()
 	kubeClientOptions.AddFlags(flag.CommandLine)
 	flag.Parse()
 	level, err := logrus.ParseLevel(*logLevel)

diff --git a/boskos/cmd/cleaner/BUILD.bazel b/boskos/cmd/cleaner/BUILD.bazel
@@ -23,13 +23,16 @@ go_library(
     ],
 )
 
+NAME = "cleaner"
+
 prow_image(
     name = "image",
+    component = NAME,
     visibility = ["//visibility:public"],
 )
 
 go_binary(
-    name = "cleaner",
+    name = NAME,
     embed = [":go_default_library"],
     visibility = ["//visibility:public"],
 )

diff --git a/boskos/cmd/cleaner/main.go b/boskos/cmd/cleaner/main.go
@@ -71,7 +71,7 @@ func init() {
 }
 
 func main() {
-	logrusutil.ComponentInit("boskos-cleaner")
+	logrusutil.ComponentInit()
 	flag.Parse()
 	kubeClientOptions.Validate()
 

diff --git a/boskos/cmd/cli/BUILD.bazel b/boskos/cmd/cli/BUILD.bazel
@@ -13,14 +13,17 @@ go_library(
     ],
 )
 
+NAME = "boskosctl"
+
 prow_image(
     name = "image",
     base = "@boskosctl-base//image",
+    component = NAME,
     visibility = ["//visibility:public"],
 )
 
 go_binary(
-    name = "boskosctl",
+    name = NAME,
     embed = [":go_default_library"],
     visibility = ["//visibility:public"],
 )

diff --git a/boskos/cmd/fake-mason/BUILD.bazel b/boskos/cmd/fake-mason/BUILD.bazel
@@ -17,13 +17,16 @@ go_library(
     ],
 )
 
+NAME = "fake-mason"
+
 prow_image(
     name = "image",
+    component = NAME,
     visibility = ["//visibility:public"],
 )
 
 go_binary(
-    name = "fake-mason",
+    name = NAME,
     embed = [":go_default_library"],
     visibility = ["//visibility:public"],
 )

diff --git a/boskos/cmd/janitor/BUILD.bazel b/boskos/cmd/janitor/BUILD.bazel
@@ -10,8 +10,10 @@ load(
     "go_test",
 )
 
+NAME = "janitor"
+
 go_binary(
-    name = "janitor",
+    name = NAME,
     embed = [":go_default_library"],
     pure = "on",
 )
@@ -49,6 +51,7 @@ container_image(
 prow_image(
     name = "image",
     base = ":janitor_image",
+    component = NAME,
     # the entrypoint must be sh
     # https://github.com/kubernetes/test-infra/issues/5877
     entrypoint = [

diff --git a/boskos/cmd/metrics/BUILD.bazel b/boskos/cmd/metrics/BUILD.bazel
@@ -10,8 +10,10 @@ load(
     "go_library",
 )
 
+NAME = "metrics"
+
 go_binary(
-    name = "metrics",
+    name = NAME,
     embed = [":go_default_library"],
     pure = "on",
 )
@@ -34,6 +36,7 @@ go_library(
 
 prow_image(
     name = "image",
+    component = NAME,
     visibility = ["//visibility:public"],
 )
 

diff --git a/boskos/cmd/reaper/BUILD.bazel b/boskos/cmd/reaper/BUILD.bazel
@@ -3,8 +3,10 @@ package(default_visibility = ["//visibility:public"])
 load("//prow:def.bzl", "prow_image")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
+NAME = "reaper"
+
 go_binary(
-    name = "reaper",
+    name = NAME,
     embed = [":go_default_library"],
     pure = "on",
 )
@@ -22,6 +24,7 @@ go_library(
 
 prow_image(
     name = "image",
+    component = NAME,
     visibility = ["//visibility:public"],
 )
 

diff --git a/experiment/resultstore/BUILD.bazel b/experiment/resultstore/BUILD.bazel
@@ -1,7 +1,12 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
 load("//prow:def.bzl", "prow_image", "prow_push")
 
-prow_image(name = "image")
+NAME = "resultstore"
+
+prow_image(
+    name = "image",
+    component = NAME,
+)
 
 prow_push(
     name = "push",
@@ -37,7 +42,7 @@ go_library(
 )
 
 go_binary(
-    name = "resultstore",
+    name = NAME,
     embed = [":go_default_library"],
     visibility = ["//visibility:public"],
 )

diff --git a/ghproxy/BUILD.bazel b/ghproxy/BUILD.bazel
@@ -3,8 +3,10 @@ package(default_visibility = ["//visibility:public"])
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//prow:def.bzl", "prow_image", "prow_push")
 
+NAME = "ghproxy"
+
 go_binary(
-    name = "ghproxy",
+    name = NAME,
     embed = [":go_default_library"],
     visibility = ["//visibility:public"],
 )
@@ -21,6 +23,7 @@ prow_push(
 prow_image(
     name = "image",
     base = "@alpine-base//image",
+    component = NAME,
     visibility = ["//visibility:public"],
 )
 

diff --git a/greenhouse/BUILD.bazel b/greenhouse/BUILD.bazel
@@ -21,8 +21,10 @@ go_library(
     ],
 )
 
+NAME = "greenhouse"
+
 go_binary(
-    name = "greenhouse",
+    name = NAME,
     embed = [":go_default_library"],
     pure = "on",
     visibility = ["//visibility:public"],
@@ -49,6 +51,7 @@ filegroup(
 prow_image(
     name = "image",
     base = "@alpine-base//image",
+    component = NAME,
     visibility = ["//visibility:public"],
 )
 

diff --git a/label_sync/BUILD.bazel b/label_sync/BUILD.bazel
@@ -12,9 +12,12 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])
 
+NAME = "label_sync"
+
 prow_image(
     name = "image",
     base = "@alpine-base//image",
+    component = NAME,
     visibility = ["//visibility:public"],
 )
 
@@ -28,7 +31,7 @@ prow_push(
 )
 
 go_binary(
-    name = "label_sync",
+    name = NAME,
     embed = [":go_default_library"],
 )
 

diff --git a/prow/cmd/admission/BUILD.bazel b/prow/cmd/admission/BUILD.bazel
@@ -1,8 +1,11 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
 load("//prow:def.bzl", "prow_image")
 
+NAME = "admission"
+
 prow_image(
     name = "image",
+    component = NAME,
     visibility = ["//visibility:public"],
 )
 
@@ -31,7 +34,7 @@ go_library(
 )
 
 go_binary(
-    name = "admission",
+    name = NAME,
     embed = [":go_default_library"],
     visibility = ["//visibility:public"],
 )

diff --git a/prow/cmd/branchprotector/BUILD.bazel b/prow/cmd/branchprotector/BUILD.bazel
@@ -13,9 +13,12 @@ k8s_object(
     template = ":oneshot-job.yaml",
 )
 
+NAME = "branchprotector"
+
 prow_image(
     name = "image",
     base = "@alpine-base//image",
+    component = NAME,
     directory = "/",
     files = [":branchprotector"],
     visibility = ["//visibility:public"],
@@ -72,7 +75,7 @@ filegroup(
 )
 
 go_binary(
-    name = "branchprotector",
+    name = NAME,
     embed = [":go_default_library"],
     pure = "on",
     visibility = ["//visibility:public"],

diff --git a/prow/cmd/checkconfig/BUILD.bazel b/prow/cmd/checkconfig/BUILD.bazel
@@ -52,16 +52,19 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 
+NAME = "checkconfig"
+
 prow_image(
     name = "image",
     base = "@git-base//image",
+    component = NAME,
     directory = "/",
     files = [":checkconfig"],
     visibility = ["//visibility:public"],
 )
 
 go_binary(
-    name = "checkconfig",
+    name = NAME,
     embed = [":go_default_library"],
     pure = "on",
     visibility = ["//visibility:public"],

diff --git a/prow/cmd/clonerefs/BUILD.bazel b/prow/cmd/clonerefs/BUILD.bazel
@@ -14,8 +14,10 @@ go_library(
     ],
 )
 
+NAME = "clonerefs"
+
 go_binary(
-    name = "clonerefs",
+    name = NAME,
     embed = [":go_default_library"],
     pure = "on",
     visibility = ["//visibility:public"],
@@ -24,6 +26,7 @@ go_binary(
 prow_image(
     name = "image",
     base = "@git-base//image",
+    component = NAME,
     files = [
         "github_known_hosts",
         "ssh_config",

diff --git a/prow/cmd/config-bootstrapper/BUILD.bazel b/prow/cmd/config-bootstrapper/BUILD.bazel
@@ -35,14 +35,17 @@ filegroup(
     tags = ["automanaged"],
 )
 
+NAME = "config-bootstrapper"
+
 go_binary(
-    name = "config-bootstrapper",
+    name = NAME,
     embed = [":go_default_library"],
 )
 
 prow_image(
     name = "image",
     base = "@git-base//image",
+    component = NAME,
     directory = "/",
     files = [":config-bootstrapper"],
     visibility = ["//visibility:public"],