Merge pull request #60996 from deads2k/server-09-metrics

Automatic merge from submit-queue. 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>. update metrics to true like it is for kube-apiserver The kube-apiserver always hardcoded to true, but nothing else knew too. I changed the default to true (I can't think of why you wouldn't want it even if you don't often use it). @kubernetes/sig-api-machinery-bugs @MikeSpreitzer see if this fixes you? Kubernetes-commit: 02856b66564798c8b32e5b2a8a3d84fdcdfd94ca
2018-03-25 04:33:24 -07:00 · 2018-03-25 04:33:24 -07:00 · da27ab27b4
parent 4a8377c547 416f1ae672
commit da27ab27b4
3 changed files with 86 additions and 84 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@ -816,339 +816,339 @@
 		},
 		{
 			"ImportPath": "k8s.io/api/admission/v1beta1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta2",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1beta1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1beta1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v2beta1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1beta1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v2alpha1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/certificates/v1beta1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/core/v1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/events/v1beta1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/extensions/v1beta1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/networking/v1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/policy/v1beta1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1alpha1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1beta1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1alpha1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/settings/v1alpha1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1alpha1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1beta1",
-			"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
+			"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/validation",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/rand",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/waitgroup",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
+			"Rev": "00b86ef5712a9fafe489160774c254f46c254a30"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/discovery",
--- a/pkg/server/config.go
+++ b/pkg/server/config.go
@ -262,6 +262,7 @@ func NewConfig(codecs serializer.CodecFactory) *Config {
 		EnableIndex:                  true,
 		EnableDiscovery:              true,
 		EnableProfiling:              true,
+		EnableMetrics:                true,
 		MaxRequestsInFlight:          400,
 		MaxMutatingRequestsInFlight:  200,
 		RequestTimeout:               time.Duration(60) * time.Second,
--- a/pkg/server/config_test.go
+++ b/pkg/server/config_test.go
@ -109,6 +109,7 @@ func TestNewWithDelegate(t *testing.T) {
    "/healthz/poststarthook/generic-apiserver-start-informers",
    "/healthz/poststarthook/wrapping-post-start-hook",
    "/healthz/wrapping-health",
+    "/metrics",
    "/swaggerapi"
  ]
 }`, t)