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

Bump helm-controller and klipper-helm image version 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/4019/head
Brad Davidson 2021-09-14 15:33:46 -07:00 committed by Brad Davidson
parent b72306ce3d
commit 5e0fae914f
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -92,7 +92,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.3 github.com/k3s-io/helm-controller v0.11.5
github.com/k3s-io/kine v0.8.0 github.com/k3s-io/kine v0.8.0
github.com/klauspost/compress v1.13.5 github.com/klauspost/compress v1.13.5
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

@ -570,8 +570,8 @@ github.com/k3s-io/etcd/etcdutl/v3 v3.5.0-k3s2 h1:Feifl9EStGdmkUnOtouh0VD9n+UbgTx
github.com/k3s-io/etcd/etcdutl/v3 v3.5.0-k3s2/go.mod h1:o98rKMCibbFAG8QS9KmvlYDGDShmmIbmRE8vSofzYNg= github.com/k3s-io/etcd/etcdutl/v3 v3.5.0-k3s2/go.mod h1:o98rKMCibbFAG8QS9KmvlYDGDShmmIbmRE8vSofzYNg=
github.com/k3s-io/etcd/server/v3 v3.5.0-k3s2 h1:yw8t2/k8Gwsv462XkEVawYGn5N+FI2xG97O3lleSSMI= github.com/k3s-io/etcd/server/v3 v3.5.0-k3s2 h1:yw8t2/k8Gwsv462XkEVawYGn5N+FI2xG97O3lleSSMI=
github.com/k3s-io/etcd/server/v3 v3.5.0-k3s2/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= github.com/k3s-io/etcd/server/v3 v3.5.0-k3s2/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4=
github.com/k3s-io/helm-controller v0.11.3 h1:DSPAOCGHxF5pmF4vzQP5AgPT3tiGRJRZu+08hwWtbGI= github.com/k3s-io/helm-controller v0.11.5 h1:s3pVbNj112drfSYfZsZqIf32OMQzzK+x6mgZUJfOT34=
github.com/k3s-io/helm-controller v0.11.3/go.mod h1:z0ExsRRIkTO/QC//3/Esn5ItTD6AiQSluwzMaS7RI/4= github.com/k3s-io/helm-controller v0.11.5/go.mod h1:z0ExsRRIkTO/QC//3/Esn5ItTD6AiQSluwzMaS7RI/4=
github.com/k3s-io/kine v0.8.0 h1:k6T9bI9DID7lIbktukXxg1QfeFoAQK4EIvAHoyPAe08= github.com/k3s-io/kine v0.8.0 h1:k6T9bI9DID7lIbktukXxg1QfeFoAQK4EIvAHoyPAe08=
github.com/k3s-io/kine v0.8.0/go.mod h1:gaezUQ9c8iw8vxDV/DI8vc93h2rCpTvY37kMdYPMsyc= github.com/k3s-io/kine v0.8.0/go.mod h1:gaezUQ9c8iw8vxDV/DI8vc93h2rCpTvY37kMdYPMsyc=
github.com/k3s-io/klog v1.0.0-k3s1 h1:Bg+gRta3s4sfbaYUSWbHcMEyVdxdaU1cJCRtWcaxjBE= github.com/k3s-io/klog v1.0.0-k3s1 h1:Bg+gRta3s4sfbaYUSWbHcMEyVdxdaU1cJCRtWcaxjBE=

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

@ -1,4 +1,4 @@
docker.io/rancher/klipper-helm:v0.6.4-build20210813 docker.io/rancher/klipper-helm:v0.6.5-build20210915
docker.io/rancher/klipper-lb:v0.2.0 docker.io/rancher/klipper-lb:v0.2.0
docker.io/rancher/local-path-provisioner:v0.0.20 docker.io/rancher/local-path-provisioner:v0.0.20
docker.io/rancher/mirrored-coredns-coredns:1.8.4 docker.io/rancher/mirrored-coredns-coredns:1.8.4

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

@ -30,7 +30,7 @@ import (
var ( var (
trueVal = true trueVal = true
commaRE = regexp.MustCompile(`\\*,`) commaRE = regexp.MustCompile(`\\*,`)
DefaultJobImage = "rancher/klipper-helm:v0.6.4-build20210813" DefaultJobImage = "rancher/klipper-helm:v0.6.5-build20210915"
) )
type Controller struct { type Controller struct {
@ -47,6 +47,11 @@ const (
CRDName = "helmcharts.helm.cattle.io" CRDName = "helmcharts.helm.cattle.io"
ConfigCRDName = "helmchartconfigs.helm.cattle.io" ConfigCRDName = "helmchartconfigs.helm.cattle.io"
Name = "helm-controller" Name = "helm-controller"
TaintExternalCloudProvider = "node.cloudprovider.kubernetes.io/uninitialized"
LabelNodeRolePrefix = "node-role.kubernetes.io/"
LabelControlPlaneSuffix = "control-plane"
LabelEtcdSuffix = "etcd"
) )
func Register(ctx context.Context, apply apply.Apply, func Register(ctx context.Context, apply apply.Apply,
@ -279,15 +284,19 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
}) })
} }
job.Spec.Template.Spec.NodeSelector = make(map[string]string)
job.Spec.Template.Spec.NodeSelector[core.LabelOSStable] = "linux"
if chart.Spec.Bootstrap { if chart.Spec.Bootstrap {
job.Spec.Template.Spec.NodeSelector[LabelNodeRolePrefix+LabelControlPlaneSuffix] = "true"
job.Spec.Template.Spec.HostNetwork = true job.Spec.Template.Spec.HostNetwork = true
job.Spec.Template.Spec.Tolerations = []core.Toleration{ job.Spec.Template.Spec.Tolerations = []core.Toleration{
{ {
Key: "node.kubernetes.io/not-ready", Key: core.TaintNodeNotReady,
Effect: core.TaintEffectNoSchedule, Effect: core.TaintEffectNoSchedule,
}, },
{ {
Key: "node.cloudprovider.kubernetes.io/uninitialized", Key: TaintExternalCloudProvider,
Operator: core.TolerationOpEqual, Operator: core.TolerationOpEqual,
Value: "true", Value: "true",
Effect: core.TaintEffectNoSchedule, Effect: core.TaintEffectNoSchedule,
@ -297,12 +306,12 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
Operator: core.TolerationOpExists, Operator: core.TolerationOpExists,
}, },
{ {
Key: "node-role.kubernetes.io/etcd", Key: LabelNodeRolePrefix + LabelEtcdSuffix,
Operator: core.TolerationOpExists, Operator: core.TolerationOpExists,
Effect: core.TaintEffectNoExecute, Effect: core.TaintEffectNoExecute,
}, },
{ {
Key: "node-role.kubernetes.io/control-plane", Key: LabelNodeRolePrefix + LabelControlPlaneSuffix,
Operator: core.TolerationOpExists, Operator: core.TolerationOpExists,
Effect: core.TaintEffectNoSchedule, Effect: core.TaintEffectNoSchedule,
}, },
@ -318,8 +327,6 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
Name: "BOOTSTRAP", Name: "BOOTSTRAP",
Value: "true"}, Value: "true"},
}...) }...)
job.Spec.Template.Spec.NodeSelector = make(map[string]string)
job.Spec.Template.Spec.NodeSelector["node-role.kubernetes.io/master"] = "true"
} }
setProxyEnv(job) setProxyEnv(job)

2
vendor/modules.txt vendored
View File

@ -735,7 +735,7 @@ github.com/jonboulle/clockwork
github.com/josharian/intern github.com/josharian/intern
# github.com/json-iterator/go v1.1.11 # github.com/json-iterator/go v1.1.11
github.com/json-iterator/go github.com/json-iterator/go
# github.com/k3s-io/helm-controller v0.11.3 # github.com/k3s-io/helm-controller v0.11.5
## explicit ## explicit
github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io
github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1 github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1