Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move pkg/kubectl/metricsutil to staging #80561

Merged
merged 1 commit into from Jul 30, 2019
Merged

Move pkg/kubectl/metricsutil to staging #80561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/.golint_failures
View file
Open in desktop
Expand Up @@ -140,7 +140,6 @@ pkg/kubectl/cmd/top
pkg/kubectl/cmd/wait
pkg/kubectl/generate
pkg/kubectl/generate/versioned
pkg/kubectl/metricsutil
pkg/kubectl/polymorphichelpers
pkg/kubelet
pkg/kubelet/apis/config
Expand Down Expand Up @@ -539,6 +538,7 @@ staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister
staging/src/k8s.io/kube-proxy/config/v1alpha1
staging/src/k8s.io/kubectl/pkg/cmd/util
staging/src/k8s.io/kubectl/pkg/describe/versioned
staging/src/k8s.io/kubectl/pkg/metricsutil
staging/src/k8s.io/kubectl/pkg/util/templates
staging/src/k8s.io/kubelet/config/v1beta1
staging/src/k8s.io/legacy-cloud-providers/vsphere
Expand Down
1 change: 0 additions & 1 deletion pkg/kubectl/BUILD
View file
Open in desktop
Expand Up @@ -85,7 +85,6 @@ filegroup(
"//pkg/kubectl/cmd:all-srcs",
"//pkg/kubectl/explain:all-srcs",
"//pkg/kubectl/generate:all-srcs",
"//pkg/kubectl/metricsutil:all-srcs",
"//pkg/kubectl/polymorphichelpers:all-srcs",
"//pkg/kubectl/proxy:all-srcs",
],
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/cmd/top/BUILD
View file
Open in desktop
Expand Up @@ -10,14 +10,14 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/top",
visibility = ["//visibility:public"],
deps = [
"//pkg/kubectl/metricsutil:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
"//staging/src/k8s.io/client-go/discovery:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/metricsutil:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
"//staging/src/k8s.io/metrics/pkg/apis/metrics:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/cmd/top/top_node.go
View file
Open in desktop
Expand Up @@ -28,9 +28,9 @@ import (
"k8s.io/client-go/discovery"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/metricsutil"
"k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubernetes/pkg/kubectl/metricsutil"
metricsapi "k8s.io/metrics/pkg/apis/metrics"
metricsV1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1"
metricsclientset "k8s.io/metrics/pkg/client/clientset/versioned"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/cmd/top/top_pod.go
View file
Open in desktop
Expand Up @@ -27,9 +27,9 @@ import (
"k8s.io/client-go/discovery"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/metricsutil"
"k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubernetes/pkg/kubectl/metricsutil"
metricsapi "k8s.io/metrics/pkg/apis/metrics"
metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1"
metricsclientset "k8s.io/metrics/pkg/client/clientset/versioned"
Expand Down
1 change: 1 addition & 0 deletions staging/publishing/import-restrictions.yaml
View file
Open in desktop
Expand Up @@ -132,6 +132,7 @@
- k8s.io/client-go
- k8s.io/kubectl
- k8s.io/kube-openapi
- k8s.io/metrics
- k8s.io/utils
- k8s.io/klog

Expand Down
8 changes: 8 additions & 0 deletions staging/publishing/rules.yaml
View file
Open in desktop
Expand Up @@ -626,6 +626,10 @@ rules:
branch: master
- repository: client-go
branch: master
- repository: code-generator
branch: master
- repository: metrics
branch: master
- source:
branch: release-1.15
dir: staging/src/k8s.io/kubectl
Expand All @@ -638,3 +642,7 @@ rules:
branch: release-1.15
- repository: client-go
branch: release-12.0
- repository: code-generator
branch: release-1.15
- repository: metrics
branch: release-1.15
1 change: 1 addition & 0 deletions staging/src/k8s.io/kubectl/BUILD
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@ filegroup(
"//staging/src/k8s.io/kubectl/pkg/describe:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/drain:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/generated:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/metricsutil:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/rawhttp:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/scheme:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/util:all-srcs",
Expand Down
3 changes: 3 additions & 0 deletions staging/src/k8s.io/kubectl/go.mod
View file
Open in desktop
Expand Up @@ -31,6 +31,7 @@ require (
k8s.io/client-go v0.0.0
k8s.io/klog v0.3.1
k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058
k8s.io/metrics v0.0.0
k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a
sigs.k8s.io/yaml v1.1.0
)
Expand All @@ -46,5 +47,7 @@ replace (
k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
)
14 changes: 14 additions & 0 deletions staging/src/k8s.io/kubectl/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 6 additions & 11 deletions pkg/kubectl/metricsutil/BUILD → .../src/k8s.io/kubectl/pkg/metricsutil/BUILD
View file
Open in desktop
@@ -1,18 +1,14 @@
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
load("@io_bazel_rules_go//go:def.bzl", "go_library")

go_library(
name = "go_default_library",
srcs = [
"metrics_client.go",
"metrics_printer.go",
],
importpath = "k8s.io/kubernetes/pkg/kubectl/metricsutil",
visibility = [
"//build/visible_to:pkg_kubectl_metricsutil_CONSUMERS",
],
importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/metricsutil",
importpath = "k8s.io/kubectl/pkg/metricsutil",
visibility = ["//visibility:public"],
deps = [
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
Expand All @@ -32,13 +28,12 @@ filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)

filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = [
"//build/visible_to:pkg_kubectl_metricsutil_CONSUMERS",
],
visibility = ["//visibility:public"],
)
0 pkg/kubectl/metricsutil/metrics_client.go → ...kubectl/pkg/metricsutil/metrics_client.go
View file
Open in desktop
File renamed without changes.
0 pkg/kubectl/metricsutil/metrics_printer.go → ...ubectl/pkg/metricsutil/metrics_printer.go
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions vendor/modules.txt
View file
Open in desktop
Expand Up @@ -1650,6 +1650,7 @@ k8s.io/kubectl/pkg/describe
k8s.io/kubectl/pkg/describe/versioned
k8s.io/kubectl/pkg/drain
k8s.io/kubectl/pkg/generated
k8s.io/kubectl/pkg/metricsutil
k8s.io/kubectl/pkg/rawhttp
k8s.io/kubectl/pkg/scheme
k8s.io/kubectl/pkg/util
Expand Down