Commit 8d28a38a authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson

Update helm-controller to pull in refactor

parent 647c1ab7
......@@ -85,7 +85,7 @@ require (
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.4.2
github.com/gruntwork-io/terratest v0.40.6
github.com/k3s-io/helm-controller v0.12.3
github.com/k3s-io/helm-controller v0.13.0
github.com/k3s-io/kine v0.9.6
github.com/klauspost/compress v1.15.9
github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000
......
......@@ -11,7 +11,8 @@ import (
"sync"
"time"
"github.com/k3s-io/helm-controller/pkg/helm"
helm "github.com/k3s-io/helm-controller/pkg/controllers/chart"
helmcommon "github.com/k3s-io/helm-controller/pkg/controllers/common"
"github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/k3s-io/k3s/pkg/daemons/config"
......@@ -192,11 +193,17 @@ func coreControllers(ctx context.Context, sc *Context, config *Config) error {
if !config.ControlConfig.DisableHelmController {
helm.Register(ctx,
metav1.NamespaceAll,
helmcommon.Name,
sc.K8s,
sc.Apply,
util.BuildControllerEventRecorder(sc.K8s, helmcommon.Name, metav1.NamespaceAll),
sc.Helm.Helm().V1().HelmChart(),
sc.Helm.Helm().V1().HelmChart().Cache(),
sc.Helm.Helm().V1().HelmChartConfig(),
sc.Helm.Helm().V1().HelmChartConfig().Cache(),
sc.Batch.Batch().V1().Job(),
sc.Batch.Batch().V1().Job().Cache(),
sc.Auth.Rbac().V1().ClusterRoleBinding(),
sc.Core.Core().V1().ServiceAccount(),
sc.Core.Core().V1().ConfigMap())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment