ncdc

diff --git a/metrics/apis/metrics/install/install.go b/metrics/apis/metrics/install/install.go
index 208ac87..29aa18a 100644
--- a/metrics/apis/metrics/install/install.go
+++ b/metrics/apis/metrics/install/install.go
@@ -20,13 +20,8 @@ import (
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/client-go/pkg/api"
 )

ncdc

# HELP namespace_adds Total number of adds handled by workqueue: namespace
# TYPE namespace_adds counter
namespace_adds 3
# HELP namespace_controller_rate_limiter_use A metric measuring the saturation of the rate limiter for namespace_controller
# TYPE namespace_controller_rate_limiter_use gauge
namespace_controller_rate_limiter_use 0
# HELP namespace_depth Current depth of workqueue: namespace
# TYPE namespace_depth gauge
namespace_depth 0
# HELP namespace_queue_latency How long an item stays in workqueuenamespace before being requested.

ncdc

diff --git a/cmd/kube-controller-manager/app/core.go b/cmd/kube-controller-manager/app/core.go
index 1ee7f86..d76be44 100644
--- a/cmd/kube-controller-manager/app/core.go
+++ b/cmd/kube-controller-manager/app/core.go
@@ -194,7 +194,7 @@ func startGarbageCollectorController(ctx ControllerContext) (bool, error) {
 		clientPool,
 		restMapper,
 		deletableGroupVersionResources,
-		garbagecollector.DefaultIgnoredResources(),
+		ctx.Options.GCIgnoredResources,

ncdc

◆I0519 02:51:39.179740       5 wrap.go:42] DELETE /api/v1/namespaces/e2e-tests-projected-pz0sg: (7.537307ms) 200 [[e2e.test/v1.7.0 (linux/amd64) kubernetes/0489ff4] 104.197.119.77:54713]                                                                                     │
┌I0519 02:51:39.508087       5 namespaced_resources_deleter.go:522] namespace controller - deleteAllContent - namespace: e2e-tests-pods-thzx0, estimate: 0                                                                                                                     │
│I0519 02:51:39.755536       5 namespace_controller.go:159] Finished syncing namespace "e2e-tests-pods-thzx0" (7.656321931s)                                                                                                                                                   │
│I0519 02:51:39.755673       5 namespace_controller.go:159] Finished syncing namespace "e2e-tests-pv-dgnct" (53.053µs)                           l                                                           

ncdc

1.06473563
1.088043148
1.108841945
1.111224274
1.136667452
1.146242067
1.149582407
1.149655473
1.152874505
1.182253053

ncdc

diff --git a/pkg/controller/garbagecollector/graph_builder.go b/pkg/controller/garbagecollector/graph_builder.go
index c962452..1e3a79a 100644
--- a/pkg/controller/garbagecollector/graph_builder.go
+++ b/pkg/controller/garbagecollector/graph_builder.go
@@ -34,7 +34,6 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
-	"k8s.io/kubernetes/pkg/api"
 	informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions"

ncdc

vagrant@f25:~/go/src/github.com/openshift/origin (master) oc -n openshift describe policy/default
Name:                   default
Namespace:              openshift
Created:                About an hour ago
Labels:                 <none>
Annotations:            <none>
Last Modified:          2017-05-03 13:01:35 -0400 EDT
shared-resource-viewer  Verbs                   Non-Resource URLs       Extension       Resource Names  API Groups                    Resources
                        [get list watch]        []                                      []              [template.openshift.io ]      [templates]
                        [get list watch]        []                                      []              [image.openshift.io ]         [imagestreamimages imagestreams imagestreamtags]

ncdc

Starting watch for /apis/apps.openshift.io/v1/deploymentconfigs, rv=458 labels= fields= timeout=8m2s
Starting watch for /apis/apps/v1beta1/deployments, rv=458 labels= fields= timeout=5m40s
Starting watch for /apis/apps/v1beta1/statefulsets, rv=458 labels= fields= timeout=5m29s
Starting watch for /apis/apps/v1beta1/statefulsets, rv=458 labels= fields= timeout=8m21s
Starting watch for /apis/authorization.openshift.io/v1/clusterpolicies, rv=494 labels= fields= timeout=9m16s
Starting watch for /apis/authorization.openshift.io/v1/clusterpolicybindings, rv=472 labels= fields= timeout=9m31s
Starting watch for /apis/authorization.openshift.io/v1/policies, rv=458 labels= fields= timeout=9m21s
Starting watch for /apis/authorization.openshift.io/v1/policybindings, rv=508 labels= fields= timeout=7m7s
Starting watch for /apis/authorization.openshift.io/v1/rolebindingrestrictions, rv=458 labels= fields= timeout=9m39s
Starting watch for /apis/autoscaling/v1/horizontalpodautoscalers, rv=458 labels= fields= timeout=6m23s

ncdc

diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go
index cb82f6b..892db17 100644
--- a/cmd/kube-proxy/app/server.go
+++ b/cmd/kube-proxy/app/server.go
@@ -99,7 +99,7 @@ type Options struct {
 	//
 	// TODO remove these fields once the deprecated flags are removed.
 
-	//master is used to override the kubeconfig's URL to the apiserver.
+	// master is used to override the kubeconfig's URL to the apiserver.

ncdc

diff --git a/pkg/cmd/server/kubernetes/master/master_config.go b/pkg/cmd/server/kubernetes/master/master_config.go
index 7f0e38a..2af79c4 100644
--- a/pkg/cmd/server/kubernetes/master/master_config.go
+++ b/pkg/cmd/server/kubernetes/master/master_config.go
@@ -307,9 +307,9 @@ func buildControllerManagerServer(masterConfig configapi.MasterConfig) (*cmapp.C
 	// Adjust defaults
 	cmserver.ClusterSigningCertFile = ""
 	cmserver.ClusterSigningKeyFile = ""
-	cmserver.Address = ""                   // no healthz endpoint
-	cmserver.Port = 0                       // no healthz endpoint