github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

[kube-controller-manager] fix some reference from cmd/*-controller-manager about kubeControllerManagerConfiguration

Browse Source
This commit is contained in:
stewart-yu
2018-09-03 22:45:47 +08:00
parent a226928dc9
commit 6a90b7f780
27 changed files with 79 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/kube-controller-manager/app/options/options_test.go
View File

@@ -31,7 +31,7 @@ import (
apiserverconfig "k8s.io/apiserver/pkg/apis/config"
apiserveroptions "k8s.io/apiserver/pkg/server/options"
cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options"
"k8s.io/kubernetes/pkg/apis/componentconfig"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
)
func TestAddFlags(t *testing.T) {
@@ -185,7 +185,7 @@ func TestAddFlags(t *testing.T) {
},
GarbageCollectorController: &GarbageCollectorControllerOptions{
ConcurrentGCSyncs: 30,
GCIgnoredResources: []componentconfig.GroupResource{
GCIgnoredResources: []kubectrlmgrconfig.GroupResource{
{Group: "", Resource: "events"},
},
EnableGarbageCollector: false,
@@ -222,11 +222,11 @@ func TestAddFlags(t *testing.T) {
},
PersistentVolumeBinderController: &PersistentVolumeBinderControllerOptions{
PVClaimBinderSyncPeriod: metav1.Duration{Duration: 30 * time.Second},
VolumeConfiguration: componentconfig.VolumeConfiguration{
VolumeConfiguration: kubectrlmgrconfig.VolumeConfiguration{
EnableDynamicProvisioning: false,
EnableHostPathProvisioning: true,
FlexVolumePluginDir: "/flex-volume-plugin",
PersistentVolumeRecyclerConfiguration: componentconfig.PersistentVolumeRecyclerConfiguration{
PersistentVolumeRecyclerConfiguration: kubectrlmgrconfig.PersistentVolumeRecyclerConfiguration{
MaximumRetry: 3,
MinimumTimeoutNFS: 200,
IncrementTimeoutNFS: 45,
@@ -298,7 +298,7 @@ func TestAddFlags(t *testing.T) {
}
}
type sortedGCIgnoredResources []componentconfig.GroupResource
type sortedGCIgnoredResources []kubectrlmgrconfig.GroupResource
func (r sortedGCIgnoredResources) Len() int {
return len(r)