github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update helm-controller 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/5275/head
Brad Davidson 2022-03-15 12:01:55 -07:00 committed by Brad Davidson
parent 66e350ea88
commit a93b9b6d53
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -80,7 +80,7 @@ require (
github.com/google/uuid v1.3.0 github.com/google/uuid v1.3.0
github.com/gorilla/mux v1.8.0 github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.4.2 github.com/gorilla/websocket v1.4.2
github.com/k3s-io/helm-controller v0.11.7 github.com/k3s-io/helm-controller v0.12.0
github.com/k3s-io/kine v0.8.1 github.com/k3s-io/kine v0.8.1
github.com/klauspost/compress v1.14.2 github.com/klauspost/compress v1.14.2
github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000 github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000

4
go.sum
View File

@ -654,8 +654,8 @@ github.com/k3s-io/etcd/etcdutl/v3 v3.5.1-k3s1 h1:FK0fnJI8kvP3P2yjxypkFVnokeQwXgA
github.com/k3s-io/etcd/etcdutl/v3 v3.5.1-k3s1/go.mod h1:fDeCOsFfxdcMIbjSoKLJQDCFRv0ixQY+tyOuPF7uEQU= github.com/k3s-io/etcd/etcdutl/v3 v3.5.1-k3s1/go.mod h1:fDeCOsFfxdcMIbjSoKLJQDCFRv0ixQY+tyOuPF7uEQU=
github.com/k3s-io/etcd/server/v3 v3.5.1-k3s1 h1:B9DDdjIwQo2UXIflhSinSEDrihQOKJwEYjUejPpH6Js= github.com/k3s-io/etcd/server/v3 v3.5.1-k3s1 h1:B9DDdjIwQo2UXIflhSinSEDrihQOKJwEYjUejPpH6Js=
github.com/k3s-io/etcd/server/v3 v3.5.1-k3s1/go.mod h1:yBKYw++NWu6ciuWoKuL7UXgGKDP7ICBCuVQrIcYbPdw= github.com/k3s-io/etcd/server/v3 v3.5.1-k3s1/go.mod h1:yBKYw++NWu6ciuWoKuL7UXgGKDP7ICBCuVQrIcYbPdw=
github.com/k3s-io/helm-controller v0.11.7 h1:fNpBImB3h5aHvPf3zwU9sFWmeVQh0nTG1sLCoBhEeUg= github.com/k3s-io/helm-controller v0.12.0 h1:OIi43oEqIggVdc1z4BRzGPpNzvr5xV5EcG+RldJrIag=
github.com/k3s-io/helm-controller v0.11.7/go.mod h1:z0ExsRRIkTO/QC//3/Esn5ItTD6AiQSluwzMaS7RI/4= github.com/k3s-io/helm-controller v0.12.0/go.mod h1:yBS3F5emwVjyzUUi3VWAuj9+Ogoq84Mf7CBXbAnKI1U=
github.com/k3s-io/kine v0.8.1 h1:cuxZmENBUL5lvJORWGBjn87kKtIo8GK7o8H1hu+vd98= github.com/k3s-io/kine v0.8.1 h1:cuxZmENBUL5lvJORWGBjn87kKtIo8GK7o8H1hu+vd98=
github.com/k3s-io/kine v0.8.1/go.mod h1:gaezUQ9c8iw8vxDV/DI8vc93h2rCpTvY37kMdYPMsyc= github.com/k3s-io/kine v0.8.1/go.mod h1:gaezUQ9c8iw8vxDV/DI8vc93h2rCpTvY37kMdYPMsyc=
github.com/k3s-io/klog v1.0.0-k3s2 h1:yyvD2bQbxG7m85/pvNctLX2bUDmva5kOBvuZ77tTGBA= github.com/k3s-io/klog v1.0.0-k3s2 h1:yyvD2bQbxG7m85/pvNctLX2bUDmva5kOBvuZ77tTGBA=

1
pkg/server/server.go
View File

@ -206,6 +206,7 @@ func coreControllers(ctx context.Context, sc *Context, config *Config) error {
if !config.ControlConfig.DisableHelmController { if !config.ControlConfig.DisableHelmController {
helm.Register(ctx, helm.Register(ctx,
sc.K8s,
sc.Apply, sc.Apply,
sc.Helm.Helm().V1().HelmChart(), sc.Helm.Helm().V1().HelmChart(),
sc.Helm.Helm().V1().HelmChartConfig(), sc.Helm.Helm().V1().HelmChartConfig(),

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

@ -1,4 +1,4 @@
docker.io/rancher/klipper-helm:v0.6.6-build20211022 docker.io/rancher/klipper-helm:v0.7.0-build20220315
docker.io/rancher/klipper-lb:v0.3.4 docker.io/rancher/klipper-lb:v0.3.4
docker.io/rancher/local-path-provisioner:v0.0.21 docker.io/rancher/local-path-provisioner:v0.0.21
docker.io/rancher/mirrored-coredns-coredns:1.8.6 docker.io/rancher/mirrored-coredns-coredns:1.8.6