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

Update helm-controller to v0.8.3 (#2793)

Browse Source 
* Update helm-controller to v0.8.3
* Update klipper-helm image

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Brad Davidson 2021-01-11 12:09:39 -08:00 committed by GitHub
parent c71060f288
commit 26d45287b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -82,7 +82,7 @@ require (
github.com/google/uuid v1.1.2
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.4.2
github.com/k3s-io/helm-controller v0.8.0
github.com/k3s-io/helm-controller v0.8.3
github.com/k3s-io/kine v0.6.0
github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000
github.com/lib/pq v1.8.0

4
go.sum
View File

@ -520,8 +520,8 @@ github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79 h1:9naOL3iARE
github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79/go.mod h1:lsDHcxq5ugFJff6YHEwpzLh31NDv0B2cIKki1ViQ65o=
github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7 h1:C+6IIP6yECS10qkq2EeGQjr2ts0k7UxrutGF+pLPSnU=
github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7/go.mod h1:wJnuh+xbDmskSfAM3UikTsGO8kaWLu3iycSgUKAiYjQ=
github.com/k3s-io/helm-controller v0.8.0 h1:ZxnXRMiVjerBqpTkZeR0soEtsC3Bcv3Sbq2AIZQPlhk=
github.com/k3s-io/helm-controller v0.8.0/go.mod h1:nZP8FH3KZrNNUf5r+SwwiMR63HS6lxdHdpHijgPfF74=
github.com/k3s-io/helm-controller v0.8.3 h1:GWxavyMz7Bw2ClxH5okkeOL8o5U6IBK7uauc44SDCjU=
github.com/k3s-io/helm-controller v0.8.3/go.mod h1:nZP8FH3KZrNNUf5r+SwwiMR63HS6lxdHdpHijgPfF74=
github.com/k3s-io/kine v0.6.0 h1:4l7wjgCxb2oD+7Hyf3xIhkGd/6s1sXpRFdQiyy+7Ki8=
github.com/k3s-io/kine v0.6.0/go.mod h1:rzCs93+rQHZGOiewMd84PDrER92QeZ6eeHbWkfEy4+w=
github.com/k3s-io/kubernetes v1.20.0-k3s1 h1:m/p4cZPfNoyMiGTMySXRITuHHlWMi6Ts9NLp6yNP97w=

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

@ -1,5 +1,5 @@
docker.io/rancher/coredns-coredns:1.8.0
docker.io/rancher/klipper-helm:v0.3.2
docker.io/rancher/klipper-helm:v0.4.3
docker.io/rancher/klipper-lb:v0.1.2
docker.io/rancher/library-busybox:1.31.1
docker.io/rancher/library-traefik:1.7.19

15
vendor/github.com/k3s-io/helm-controller/pkg/helm/controller.go generated vendored
View File

@ -39,7 +39,7 @@ type Controller struct {
}
const (
DefaultJobImage = "rancher/klipper-helm:v0.3.2"
DefaultJobImage = "rancher/klipper-helm:v0.4.3"
Label = "helmcharts.helm.cattle.io/chart"
Annotation = "helmcharts.helm.cattle.io/configHash"
CRDName = "helmcharts.helm.cattle.io"
@ -194,6 +194,11 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
action = "delete"
}
targetNamespace := chart.Namespace
if len(chart.Spec.TargetNamespace) != 0 {
targetNamespace = chart.Spec.TargetNamespace
}
job := &batch.Job{
TypeMeta: meta.TypeMeta{
APIVersion: "batch/v1",
@ -252,6 +257,10 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
Name: "HELM_VERSION",
Value: chart.Spec.HelmVersion,
},
{
Name: "TARGET_NAMESPACE",
Value: targetNamespace,
},
},
},
},
@ -274,6 +283,10 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
Value: "true",
Effect: "NoSchedule",
},
{
Key: "CriticalAddonsOnly",
Operator: core.TolerationOpExists,
},
}
job.Spec.Template.Spec.Containers[0].Env = append(job.Spec.Template.Spec.Containers[0].Env, []core.EnvVar{
{

2
vendor/modules.txt vendored
View File

@ -674,7 +674,7 @@ github.com/json-iterator/go
# github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79
github.com/k3s-io/go-powershell/backend
github.com/k3s-io/go-powershell/utils
# github.com/k3s-io/helm-controller v0.8.0
# github.com/k3s-io/helm-controller v0.8.3
## explicit
github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io
github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1