Merge pull request #553 from ibuildthecloud/master

pkg/server/server.go

@@ -133,7 +133,8 @@ func masterControllers(ctx context.Context, sc *Context, config *Config) error {
 		sc.Helm.Helm().V1().HelmChart(),
 		sc.Batch.Batch().V1().Job(),
 		sc.Auth.Rbac().V1().ClusterRoleBinding(),
-		sc.Core.Core().V1().ServiceAccount())
+		sc.Core.Core().V1().ServiceAccount(),
+		sc.Core.Core().V1().ConfigMap())
 	if err := servicelb.Register(ctx,
 		sc.K8s,
 		sc.Apply,

trash.lock

@@ -227,7 +227,7 @@ import:
 - package: github.com/rancher/dynamiclistener
   version: 077eb13a904f2c62496f31b158135d9743526f82
 - package: github.com/rancher/helm-controller
-  version: 4f3b43bfd868bcb74fe847f8df88c482e9b70ff8
+  version: d5f5c830231110722f14d446d3b2038e5cdf1532
 - package: github.com/rancher/remotedialer
   version: 20ec38853712bb6d348f0db9ac47d34c954c6b00
 - package: github.com/rancher/wrangler

vendor.conf

@@ -15,7 +15,7 @@ github.com/rancher/wrangler         4202dbfa88013c19238bb004d82e013f0593493d
 github.com/rancher/wrangler-api     efe26ac6a9d720e1bfa5a8cc5f8dce5ad598ce26
 github.com/rancher/dynamiclistener  077eb13a904f2c62496f31b158135d9743526f82
 github.com/rancher/remotedialer     20ec38853712bb6d348f0db9ac47d34c954c6b00
-github.com/rancher/helm-controller  4f3b43bfd868bcb74fe847f8df88c482e9b70ff8
+github.com/rancher/helm-controller  d5f5c830231110722f14d446d3b2038e5cdf1532
 github.com/matryer/moq              ee5226d43009                              https://github.com/rancher/moq.git
 github.com/coreos/flannel           823afe66b2266bf71f5bec24e6e28b26d70cfc7c  https://github.com/ibuildthecloud/flannel.git
 github.com/natefinch/lumberjack     aee4629129445bbdfb69aa565537dcfa16544311

vendor/github.com/rancher/helm-controller/pkg/helm/controller.go

@@ -46,9 +46,10 @@ func Register(ctx context.Context, apply apply.Apply,
 	helms helmcontroller.HelmChartController,
 	jobs batchcontroller.JobController,
 	crbs rbaccontroller.ClusterRoleBindingController,
-	sas corecontroller.ServiceAccountController) {
+	sas corecontroller.ServiceAccountController,
+	cm corecontroller.ConfigMapController) {
 	apply = apply.WithSetID(name).
-		WithCacheTypes(helms, jobs, crbs, sas).
+		WithCacheTypes(helms, jobs, crbs, sas, cm).
 		WithStrictCaching()
 
 	relatedresource.Watch(ctx, "helm-pod-watch",