Merge pull request #14707 from smarterclayton/autoscaler_block

smarterclayton · web-flow · commit d651f305b20c · 2017-06-16T18:23:46.000-04:00
Autoscaler should GC via autoscaling v1
diff --git a/pkg/cmd/server/kubernetes/master/master_config.go b/pkg/cmd/server/kubernetes/master/master_config.go
@@ -345,6 +345,8 @@ func buildControllerManagerServer(masterConfig configapi.MasterConfig) (*cmapp.C
 		componentconfig.GroupResource{Group: "batch", Resource: "scheduledjobs"},
 		// exposed already as extensions v1beta1 by other controllers
 		componentconfig.GroupResource{Group: "apps", Resource: "deployments"},
+		// exposed as autoscaling v1
+		componentconfig.GroupResource{Group: "extensions", Resource: "horizontalpodautoscalers"},
 	)
 
 	// resolve extended arguments

Original file line number	Diff line number	Diff line change
`@@ -345,6 +345,8 @@ func buildControllerManagerServer(masterConfig configapi.MasterConfig) (*cmapp.C`
`345`	`345`	`componentconfig.GroupResource{Group: "batch", Resource: "scheduledjobs"},`
`346`	`346`	`// exposed already as extensions v1beta1 by other controllers`
`347`	`347`	`componentconfig.GroupResource{Group: "apps", Resource: "deployments"},`
	`348`	`+ // exposed as autoscaling v1`
	`349`	`+ componentconfig.GroupResource{Group: "extensions", Resource: "horizontalpodautoscalers"},`
`348`	`350`	`)`
`349`	`351`
`350`	`352`	`// resolve extended arguments`