mirror of
https://github.com/k3s-io/k3s.git
synced 2024-06-07 19:41:36 +00:00
Merge pull request #2150 from brandond/fix_chartcontent
Update helm-controller
This commit is contained in:
commit
037d8b1393
2
go.mod
2
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
|
||||
|
4
go.sum
4
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=
|
||||
|
2
vendor/github.com/rancher/helm-controller/pkg/helm/controller.go
generated
vendored
2
vendor/github.com/rancher/helm-controller/pkg/helm/controller.go
generated
vendored
@ -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
|
||||
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user