Created
May 23, 2017 12:54
-
-
Save ncdc/cc366247ebda5b434a3da0668637613d to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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, | |
ctx.InformerFactory, | |
) | |
if err != nil { | |
diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go | |
index 4ff4dbb..b600d34 100644 | |
--- a/cmd/kube-controller-manager/app/options/options.go | |
+++ b/cmd/kube-controller-manager/app/options/options.go | |
@@ -24,11 +24,13 @@ import ( | |
"time" | |
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | |
+ "k8s.io/apimachinery/pkg/runtime/schema" | |
utilerrors "k8s.io/apimachinery/pkg/util/errors" | |
"k8s.io/apimachinery/pkg/util/sets" | |
utilfeature "k8s.io/apiserver/pkg/util/feature" | |
"k8s.io/kubernetes/pkg/apis/componentconfig" | |
"k8s.io/kubernetes/pkg/client/leaderelection" | |
+ "k8s.io/kubernetes/pkg/controller/garbagecollector" | |
"k8s.io/kubernetes/pkg/master/ports" | |
// add the kubernetes feature gates | |
@@ -41,8 +43,9 @@ import ( | |
type CMServer struct { | |
componentconfig.KubeControllerManagerConfiguration | |
- Master string | |
- Kubeconfig string | |
+ Master string | |
+ Kubeconfig string | |
+ GCIgnoredResources map[schema.GroupVersionResource]struct{} | |
} | |
// NewCMServer creates a new CMServer with a default config. | |
@@ -109,6 +112,7 @@ func NewCMServer() *CMServer { | |
EnableTaintManager: true, | |
HorizontalPodAutoscalerUseRESTClients: false, | |
}, | |
+ GCIgnoredResources: garbagecollector.DefaultIgnoredResources(), | |
} | |
s.LeaderElection.LeaderElect = true | |
return &s |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment