From ee7399ae27db00ba16344ca9a4c44c1a0507140b Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 21 Aug 2020 12:14:50 -0700 Subject: [PATCH] Update helm-controller Related to https://github.com/rancher/rke2/issues/218 Signed-off-by: Brad Davidson --- go.mod | 2 +- go.sum | 4 ++-- .../github.com/rancher/helm-controller/pkg/helm/controller.go | 2 +- vendor/modules.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 6b7ec26046..107df23ece 100644 --- a/go.mod +++ b/go.mod @@ -95,7 +95,7 @@ require ( github.com/opencontainers/selinux v1.5.3-0.20200613095409-bb88c45a3863 github.com/pkg/errors v0.9.1 github.com/rancher/dynamiclistener v0.2.1 - github.com/rancher/helm-controller v0.7.0 + github.com/rancher/helm-controller v0.7.2 github.com/rancher/kine v0.4.0 github.com/rancher/remotedialer v0.2.0 github.com/rancher/spur v0.0.0-20200617165101-8702c8e4ce7a diff --git a/go.sum b/go.sum index facfcd194c..4981d03782 100644 --- a/go.sum +++ b/go.sum @@ -640,8 +640,8 @@ github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79 h1:UeC0rjrIe github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79/go.mod h1:xi4WpK6Op4m1Lknq61/e+VSjYlTs9bulVOaDNyBdzvk= github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373 h1:BePi97poJ4hXnkP9yX96EmNQgMg+dGScvB1sqIheJ7w= github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373/go.mod h1:Vz8oLnHgttpo/aZrTpjbcpZEDzzElqNau2zmorToY0E= -github.com/rancher/helm-controller v0.7.0 h1:UMMRwTpBzUt2mPH89vFNm4pVpUHPaFj1Z5+WnS7jEOk= -github.com/rancher/helm-controller v0.7.0/go.mod h1:ZylsxIMGNADRPRNW+NiBWhrwwks9vnKLQiCHYWb6Bi0= +github.com/rancher/helm-controller v0.7.2 h1:noDPX08rnEoYhTGfgyLdEqG7DvihYbWJagbdS9OiA7s= +github.com/rancher/helm-controller v0.7.2/go.mod h1:ZylsxIMGNADRPRNW+NiBWhrwwks9vnKLQiCHYWb6Bi0= github.com/rancher/kine v0.4.0 h1:1IhWy3TzjExG8xnj46eyUEWdzqNAD1WrgL4eEBKm6Uc= github.com/rancher/kine v0.4.0/go.mod h1:IImtCJ68AIkE+VY/kUI0NkyJL5q5WzO8QvMsSXqbrpA= github.com/rancher/kubernetes v1.18.8-k3s1 h1:dqukpA38pR5V7opoTDDslVYIxlM3sP5535u3Zd23W2I= diff --git a/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go b/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go index 1c99f2a740..ec94214e82 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go +++ b/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go @@ -437,7 +437,7 @@ func contentConfigMap(chart *helmv1.HelmChart) *core.ConfigMap { if chart.Spec.ChartContent != "" { key := fmt.Sprintf("%s.tgz.base64", chart.Name) - configMap.Data[key] = chart.Spec.ValuesContent + configMap.Data[key] = chart.Spec.ChartContent } return configMap diff --git a/vendor/modules.txt b/vendor/modules.txt index 812f7719ff..18e362bddb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -736,7 +736,7 @@ github.com/rancher/dynamiclistener/storage/memory # github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79 github.com/rancher/go-powershell/backend github.com/rancher/go-powershell/utils -# github.com/rancher/helm-controller v0.7.0 +# github.com/rancher/helm-controller v0.7.2 github.com/rancher/helm-controller/pkg/apis/helm.cattle.io github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1 github.com/rancher/helm-controller/pkg/generated/clientset/versioned