Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump helm-controller to v0.4.1

Browse Source
This commit is contained in:
Erik Wilson 2020-01-21 11:47:22 -07:00
parent 3b1d656082
commit d6370d9bfb
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -98,7 +98,7 @@ require (
github.com/pkg/errors v0.8.1
github.com/rakelkar/gonetsh v0.0.0-20190719023240-501daadcadf8 // indirect
github.com/rancher/dynamiclistener v0.2.0
github.com/rancher/helm-controller v0.4.1-0.20191223195946-ae918063bc54
github.com/rancher/helm-controller v0.4.1
github.com/rancher/kine v0.3.3
github.com/rancher/remotedialer v0.2.0
github.com/rancher/wrangler v0.4.0

4
go.sum
View File

@ -715,8 +715,8 @@ github.com/rancher/dynamiclistener v0.2.0 h1:KucYwJXVVGhZ/NndfMCeQoCafT/VN7kvqSG
github.com/rancher/dynamiclistener v0.2.0/go.mod h1:fs/dxyNcB3YT6W9fVz4bDGfhmSQS17QQup6BIcGF++s=
github.com/rancher/flannel v0.11.0-k3s.1 h1:mIwnfWDafjzQgFkZeJ1AkFrrAT3EdBaA1giE0eLJKo8=
github.com/rancher/flannel v0.11.0-k3s.1/go.mod h1:Hn4ZV+eq0LhLZP63xZnxdGwXEoRSxs5sxELxu27M3UA=
github.com/rancher/helm-controller v0.4.1-0.20191223195946-ae918063bc54 h1:S/IAloMp6MYYtoHKfJUS5M3Wv0CU+5Ixe1nnSv2pQUU=
github.com/rancher/helm-controller v0.4.1-0.20191223195946-ae918063bc54/go.mod h1:194LHuZRrxcD82bG1rJtOWsw98U4JbPhDWqvL7l3PAw=
github.com/rancher/helm-controller v0.4.1 h1:AbI3zXy2Qtw4e4A6IkxKozgnm6T3KKnUo6EzD1Pz0aU=
github.com/rancher/helm-controller v0.4.1/go.mod h1:194LHuZRrxcD82bG1rJtOWsw98U4JbPhDWqvL7l3PAw=
github.com/rancher/kine v0.3.3 h1:FTOQN1qHQMzMfA8/nd9/rWfdR3Xk4PbXcOqw5P3dJDw=
github.com/rancher/kine v0.3.3/go.mod h1:xEMl0tLCva9/9me7mXJ3m9Vo6yqHgC4OU3NiK4CPrGQ=
github.com/rancher/kubernetes v1.17.1-k3s.1 h1:dwL66NxvK0B5oaoHfxBHWf0Q7ejZt7RlyyT8RrwdfQI=

2
scripts/airgap/image-list.txt
View File

@ -1,6 +1,6 @@
docker.io/coredns/coredns:1.6.3
docker.io/library/traefik:1.7.19
docker.io/rancher/klipper-helm:v0.2.2
docker.io/rancher/klipper-helm:v0.2.3
docker.io/rancher/klipper-lb:v0.1.2
docker.io/rancher/local-path-provisioner:v0.0.11
docker.io/rancher/metrics-server:v0.3.6

6
vendor/github.com/rancher/helm-controller/pkg/helm/controller.go generated vendored
View File

@ -39,7 +39,7 @@ type Controller struct {
}
const (
image = "rancher/klipper-helm:v0.2.2"
image = "rancher/klipper-helm:v0.2.3"
label = "helmcharts.helm.cattle.io/chart"
name = "helm-controller"
)
@ -333,7 +333,9 @@ func args(chart *helmv1.HelmChart) []string {
for _, k := range keys(spec.Set) {
val := spec.Set[k]
if val.StrVal != "" {
if val.StrVal == "false" || val.StrVal == "true" {
args = append(args, "--set", fmt.Sprintf("%s=%s", k, val.StrVal))
} else if val.StrVal != "" {
args = append(args, "--set-string", fmt.Sprintf("%s=%s", k, val.StrVal))
} else {
args = append(args, "--set", fmt.Sprintf("%s=%d", k, val.IntVal))

2
vendor/modules.txt vendored
View File

@ -712,7 +712,7 @@ github.com/rancher/dynamiclistener/factory
github.com/rancher/dynamiclistener/storage/file
github.com/rancher/dynamiclistener/storage/kubernetes
github.com/rancher/dynamiclistener/storage/memory
# github.com/rancher/helm-controller v0.4.1-0.20191223195946-ae918063bc54
# github.com/rancher/helm-controller v0.4.1
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