kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #65634 from wojtek-t/fix_code_content_type 

Automatic merge from submit-queue (batch tested with PRs 65319, 64513, 65474, 65601, 65634). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix apiserver metrics

Kubernetes-commit: 4f465fac5b395b2395b65c91035b3803e8631e59
This commit is contained in:
Kubernetes Publisher 2018-06-29 12:15:19 -07:00
parent e0104d0596 7ff366ebcb
commit 192d26ec9a
2 changed files with 98 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

252
Godeps/Godeps.json generated
View File

@ -1,6 +1,6 @@
{
"ImportPath": "k8s.io/apiserver",
"GoVersion": "go1.10",
"GoVersion": "go1.9",
"GodepVersion": "v80",
"Packages": [
"./..."
@ -832,335 +832,335 @@
},
{
"ImportPath": "k8s.io/api/admission/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/coordination/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/scheduling/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "ded72da34a273a447508135b315f865aa6e48fc8"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/rand",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/waitgroup",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
"Rev": "97cca6cc910b472c65890ea424e84795ef4ddfb9"
},
{
"ImportPath": "k8s.io/client-go/discovery",
@ -1170,6 +1170,10 @@
"ImportPath": "k8s.io/client-go/discovery/fake",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/informers",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/informers/admissionregistration",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
@ -1342,6 +1346,10 @@
"ImportPath": "k8s.io/client-go/kubernetes",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/fake",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/scheme",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
@ -1730,6 +1738,10 @@
"ImportPath": "k8s.io/client-go/tools/cache",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
@ -1805,78 +1817,6 @@
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "91cfa479c814065e420cee7ed227db0f63a5854e"
},
{
"ImportPath": "k8s.io/client-go/discovery",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/informers",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/kubernetes",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/fake",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/scheme",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1beta1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/listers/core/v1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/rest",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/testing",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/tools/cache",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api/v1",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/util/cert",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
},
{
"ImportPath": "k8s.io/client-go/util/flowcontrol",
"Rev": "03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb"
}
]
}

4
pkg/endpoints/metrics/metrics.go
View File

@ -163,9 +163,9 @@ func Record(req *http.Request, requestInfo *request.RequestInfo, contentType str
}
scope := CleanScope(requestInfo)
if requestInfo.IsResourceRequest {
MonitorRequest(req, strings.ToUpper(requestInfo.Verb), requestInfo.Resource, requestInfo.Subresource, contentType, scope, code, responseSizeInBytes, elapsed)
MonitorRequest(req, strings.ToUpper(requestInfo.Verb), requestInfo.Resource, requestInfo.Subresource, scope, contentType, code, responseSizeInBytes, elapsed)
} else {
MonitorRequest(req, strings.ToUpper(requestInfo.Verb), "", requestInfo.Path, contentType, scope, code, responseSizeInBytes, elapsed)
MonitorRequest(req, strings.ToUpper(requestInfo.Verb), "", requestInfo.Path, scope, contentType, code, responseSizeInBytes, elapsed)
}
}