From 62d010d6ac850aafadec6af2311115c3a33d3034 Mon Sep 17 00:00:00 2001
From: Marek Siarkowicz <serathius@users.noreply.github.com>
Date: Thu, 9 Apr 2020 20:18:26 +0200
Subject: [PATCH] Move prometheus visibility rules to build/visible_to

---
 build/visible_to/BUILD                             | 14 ++++++++++++++
 hack/update-bazel.sh                               |  2 +-
 .../prometheus/client_golang/prometheus/BUILD      |  2 +-
 .../client_golang/prometheus/internal/BUILD        |  2 +-
 .../client_golang/prometheus/promhttp/BUILD        |  2 +-
 .../client_golang/prometheus/testutil/BUILD        |  2 +-
 vendor/github.com/prometheus/client_model/go/BUILD |  2 +-
 vendor/github.com/prometheus/common/expfmt/BUILD   |  2 +-
 .../internal/bitbucket.org/ww/goautoneg/BUILD      |  2 +-
 vendor/github.com/prometheus/common/model/BUILD    |  2 +-
 vendor/github.com/prometheus/procfs/BUILD          |  2 +-
 .../github.com/prometheus/procfs/internal/fs/BUILD |  2 +-
 .../prometheus/procfs/internal/util/BUILD          |  2 +-
 13 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/build/visible_to/BUILD b/build/visible_to/BUILD
index 0d5bb841879..ff06d6aea7a 100644
--- a/build/visible_to/BUILD
+++ b/build/visible_to/BUILD
@@ -425,6 +425,20 @@ package_group(
     ],
 )
 
+package_group(
+    name = "vendor_githubcom_prometheus_CONSUMERS",
+    packages = [
+        "//cluster/images/etcd-version-monitor",
+        "//pkg/scheduler/framework/v1alpha1",
+        "//pkg/volume/util/operationexecutor",
+        "//staging/src/k8s.io/apiserver/pkg/admission/metrics",
+        "//staging/src/k8s.io/apiserver/pkg/util/flowcontrol/metrics",
+        "//staging/src/k8s.io/component-base/metrics/...",
+        "//test/e2e_node",
+        "//vendor/...",
+    ],
+)
+
 # Added by ./hack/verify-bazel.sh; should be excluded from
 # that script since it makes no sense here.
 filegroup(
diff --git a/hack/update-bazel.sh b/hack/update-bazel.sh
index 1afd21b4d88..524a66eccf8 100755
--- a/hack/update-bazel.sh
+++ b/hack/update-bazel.sh
@@ -93,7 +93,7 @@ fi
 
 # restrict ./vendor/github.com/prometheus/* targets visibility
 # see comment above re: buildozer exit codes
-buildozer -quiet 'set visibility //staging/src/k8s.io/component-base/metrics:prometheus_import_allow_list' '//vendor/github.com/prometheus/...:go_default_library' && ret=$? || ret=$?
+buildozer -quiet 'set visibility //build/visible_to:vendor_githubcom_prometheus_CONSUMERS' '//vendor/github.com/prometheus/...:go_default_library' && ret=$? || ret=$?
 if [[ $ret != 0 && $ret != 3 ]]; then
   exit 1
 fi
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/BUILD b/vendor/github.com/prometheus/client_golang/prometheus/BUILD
index 3138ba92ffc..c71cfdca73a 100644
--- a/vendor/github.com/prometheus/client_golang/prometheus/BUILD
+++ b/vendor/github.com/prometheus/client_golang/prometheus/BUILD
@@ -30,7 +30,7 @@ go_library(
     ],
     importmap = "k8s.io/kubernetes/vendor/github.com/prometheus/client_golang/prometheus",
     importpath = "github.com/prometheus/client_golang/prometheus",
-    visibility = ["//staging/src/k8s.io/component-base/metrics:prometheus_import_allow_list"],
+    visibility = ["//build/visible_to:vendor_githubcom_prometheus_CONSUMERS"],
     deps = [
         "//vendor/github.com/beorn7/perks/quantile:go_default_library",
         "//vendor/github.com/golang/protobuf/proto:go_default_library",
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/internal/BUILD b/vendor/github.com/prometheus/client_golang/prometheus/internal/BUILD
index da6f215fa89..ee7f167765e 100644
--- a/vendor/github.com/prometheus/client_golang/prometheus/internal/BUILD
+++ b/vendor/github.com/prometheus/client_golang/prometheus/internal/BUILD
@@ -5,7 +5,7 @@ go_library(
     srcs = ["metric.go"],
     importmap = "k8s.io/kubernetes/vendor/github.com/prometheus/client_golang/prometheus/internal",
     importpath = "github.com/prometheus/client_golang/prometheus/internal",
-    visibility = ["//staging/src/k8s.io/component-base/metrics:prometheus_import_allow_list"],
+    visibility = ["//build/visible_to:vendor_githubcom_prometheus_CONSUMERS"],
     deps = ["//vendor/github.com/prometheus/client_model/go:go_default_library"],
 )
 
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/promhttp/BUILD b/vendor/github.com/prometheus/client_golang/prometheus/promhttp/BUILD
index 642d81c7f8d..b684d053210 100644
--- a/vendor/github.com/prometheus/client_golang/prometheus/promhttp/BUILD
+++ b/vendor/github.com/prometheus/client_golang/prometheus/promhttp/BUILD
@@ -10,7 +10,7 @@ go_library(
     ],
     importmap = "k8s.io/kubernetes/vendor/github.com/prometheus/client_golang/prometheus/promhttp",
     importpath = "github.com/prometheus/client_golang/prometheus/promhttp",
-    visibility = ["//staging/src/k8s.io/component-base/metrics:prometheus_import_allow_list"],
+    visibility = ["//build/visible_to:vendor_githubcom_prometheus_CONSUMERS"],
     deps = [
         "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
         "//vendor/github.com/prometheus/client_model/go:go_default_library",
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/testutil/BUILD b/vendor/github.com/prometheus/client_golang/prometheus/testutil/BUILD
index 275e0bd59ba..041a4a8cfbc 100644
--- a/vendor/github.com/prometheus/client_golang/prometheus/testutil/BUILD
+++ b/vendor/github.com/prometheus/client_golang/prometheus/testutil/BUILD
@@ -5,7 +5,7 @@ go_library(
     srcs = ["testutil.go"],
     importmap = "k8s.io/kubernetes/vendor/github.com/prometheus/client_golang/prometheus/testutil",
     importpath = "github.com/prometheus/client_golang/prometheus/testutil",
-    visibility = ["//staging/src/k8s.io/component-base/metrics:prometheus_import_allow_list"],
+    visibility = ["//build/visible_to:vendor_githubcom_prometheus_CONSUMERS"],
     deps = [
         "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
         "//vendor/github.com/prometheus/client_golang/prometheus/internal:go_default_library",
diff --git a/vendor/github.com/prometheus/client_model/go/BUILD b/vendor/github.com/prometheus/client_model/go/BUILD
index 62a4c4d9445..bbe989671a4 100644
--- a/vendor/github.com/prometheus/client_model/go/BUILD
+++ b/vendor/github.com/prometheus/client_model/go/BUILD
@@ -5,7 +5,7 @@ go_library(
     srcs = ["metrics.pb.go"],
     importmap = "k8s.io/kubernetes/vendor/github.com/prometheus/client_model/go",
     importpath = "github.com/prometheus/client_model/go",
-    visibility = ["//staging/src/k8s.io/component-base/metrics:prometheus_import_allow_list"],
+    visibility = ["//build/visible_to:vendor_githubcom_prometheus_CONSUMERS"],
     deps = [
         "//vendor/github.com/golang/protobuf/proto:go_default_library",
         "//vendor/github.com/golang/protobuf/ptypes/timestamp:go_default_library",
diff --git a/vendor/github.com/prometheus/common/expfmt/BUILD b/vendor/github.com/prometheus/common/expfmt/BUILD
index f1e39686cc0..c278a240d7a 100644
--- a/vendor/github.com/prometheus/common/expfmt/BUILD
+++ b/vendor/github.com/prometheus/common/expfmt/BUILD
@@ -11,7 +11,7 @@ go_library(
     ],
     importmap = "k8s.io/kubernetes/vendor/github.com/prometheus/common/expfmt",
     importpath = "github.com/prometheus/common/expfmt",
-    visibility = ["//staging/src/k8s.io/component-base/metrics:prometheus_import_allow_list"],
+    visibility = ["//build/visible_to:vendor_githubcom_prometheus_CONSUMERS"],
     deps = [
         "//vendor/github.com/golang/protobuf/proto:go_default_library",
         "//vendor/github.com/matttproud/golang_protobuf_extensions/pbutil:go_default_library",
diff --git a/vendor/github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg/BUILD b/vendor/github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg/BUILD
index fb7811fe6db..a233d08b50b 100644
--- a/vendor/github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg/BUILD
+++ b/vendor/github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg/BUILD
@@ -5,7 +5,7 @@ go_library(
     srcs = ["autoneg.go"],
     importmap = "k8s.io/kubernetes/vendor/github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",
     importpath = "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",
-    visibility = ["//staging/src/k8s.io/component-base/metrics:prometheus_import_allow_list"],
+    visibility = ["//build/visible_to:vendor_githubcom_prometheus_CONSUMERS"],
 )
 
 filegroup(
diff --git a/vendor/github.com/prometheus/common/model/BUILD b/vendor/github.com/prometheus/common/model/BUILD
index afdee7ca8ba..df8c5328dd6 100644
--- a/vendor/github.com/prometheus/common/model/BUILD
+++ b/vendor/github.com/prometheus/common/model/BUILD
@@ -17,7 +17,7 @@ go_library(
     ],
     importmap = "k8s.io/kubernetes/vendor/github.com/prometheus/common/model",
     importpath = "github.com/prometheus/common/model",
-    visibility = ["//staging/src/k8s.io/component-base/metrics:prometheus_import_allow_list"],
+    visibility = ["//build/visible_to:vendor_githubcom_prometheus_CONSUMERS"],
 )
 
 filegroup(
diff --git a/vendor/github.com/prometheus/procfs/BUILD b/vendor/github.com/prometheus/procfs/BUILD
index 44dc635d56b..85096bd4cd0 100644
--- a/vendor/github.com/prometheus/procfs/BUILD
+++ b/vendor/github.com/prometheus/procfs/BUILD
@@ -33,7 +33,7 @@ go_library(
     ],
     importmap = "k8s.io/kubernetes/vendor/github.com/prometheus/procfs",
     importpath = "github.com/prometheus/procfs",
-    visibility = ["//staging/src/k8s.io/component-base/metrics:prometheus_import_allow_list"],
+    visibility = ["//build/visible_to:vendor_githubcom_prometheus_CONSUMERS"],
     deps = [
         "//vendor/github.com/prometheus/procfs/internal/fs:go_default_library",
         "//vendor/github.com/prometheus/procfs/internal/util:go_default_library",
diff --git a/vendor/github.com/prometheus/procfs/internal/fs/BUILD b/vendor/github.com/prometheus/procfs/internal/fs/BUILD
index 51c359d037f..3644e2f175c 100644
--- a/vendor/github.com/prometheus/procfs/internal/fs/BUILD
+++ b/vendor/github.com/prometheus/procfs/internal/fs/BUILD
@@ -5,7 +5,7 @@ go_library(
     srcs = ["fs.go"],
     importmap = "k8s.io/kubernetes/vendor/github.com/prometheus/procfs/internal/fs",
     importpath = "github.com/prometheus/procfs/internal/fs",
-    visibility = ["//staging/src/k8s.io/component-base/metrics:prometheus_import_allow_list"],
+    visibility = ["//build/visible_to:vendor_githubcom_prometheus_CONSUMERS"],
 )
 
 filegroup(
diff --git a/vendor/github.com/prometheus/procfs/internal/util/BUILD b/vendor/github.com/prometheus/procfs/internal/util/BUILD
index 1eb36402050..9bc88c1e700 100644
--- a/vendor/github.com/prometheus/procfs/internal/util/BUILD
+++ b/vendor/github.com/prometheus/procfs/internal/util/BUILD
@@ -10,7 +10,7 @@ go_library(
     ],
     importmap = "k8s.io/kubernetes/vendor/github.com/prometheus/procfs/internal/util",
     importpath = "github.com/prometheus/procfs/internal/util",
-    visibility = ["//staging/src/k8s.io/component-base/metrics:prometheus_import_allow_list"],
+    visibility = ["//build/visible_to:vendor_githubcom_prometheus_CONSUMERS"],
 )
 
 filegroup(