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

Bump klipper-helm version 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/4314/head
Brad Davidson 2021-10-22 13:30:08 -07:00 committed by Brad Davidson
parent bfc22ca613
commit 50bcc9a214
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

@ -88,7 +88,7 @@ require (
github.com/google/uuid v1.2.0 github.com/google/uuid v1.2.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.10.5 github.com/k3s-io/helm-controller v0.10.8
github.com/k3s-io/kine v0.6.2 github.com/k3s-io/kine v0.6.2
github.com/klauspost/compress v1.12.2 github.com/klauspost/compress v1.12.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

@ -535,8 +535,8 @@ github.com/k3s-io/cri-tools v1.21.0-k3s1 h1:MWQtAsx4HCNXenqU/B4V9eU6HMyafkd1PnW6
github.com/k3s-io/cri-tools v1.21.0-k3s1/go.mod h1:Qsz54zxINPR+WVWX9Kc3CTmuDFB1dNLCNV8jE8lUbtU= github.com/k3s-io/cri-tools v1.21.0-k3s1/go.mod h1:Qsz54zxINPR+WVWX9Kc3CTmuDFB1dNLCNV8jE8lUbtU=
github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea h1:7cwby0GoNAi8IsVrT0q+JfQpB6V76ZaEGhj6qts/mvU= github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea h1:7cwby0GoNAi8IsVrT0q+JfQpB6V76ZaEGhj6qts/mvU=
github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
github.com/k3s-io/helm-controller v0.10.5 h1:zrStmx4ZkhtFU/OqJYoAZFGFB1Bu+jZs0N8dtlVRxDk= github.com/k3s-io/helm-controller v0.10.8 h1:O7zoqUBp3W+6+nRCUWNiAoQMzOX6xw9IsBDXc5lP3Ns=
github.com/k3s-io/helm-controller v0.10.5/go.mod h1:nZP8FH3KZrNNUf5r+SwwiMR63HS6lxdHdpHijgPfF74= github.com/k3s-io/helm-controller v0.10.8/go.mod h1:nZP8FH3KZrNNUf5r+SwwiMR63HS6lxdHdpHijgPfF74=
github.com/k3s-io/kine v0.6.2 h1:1aJTPfB8HG4exqMKFVE5H0z4bepF05tJHtYNXotWXa4= github.com/k3s-io/kine v0.6.2 h1:1aJTPfB8HG4exqMKFVE5H0z4bepF05tJHtYNXotWXa4=
github.com/k3s-io/kine v0.6.2/go.mod h1:rzCs93+rQHZGOiewMd84PDrER92QeZ6eeHbWkfEy4+w= github.com/k3s-io/kine v0.6.2/go.mod h1:rzCs93+rQHZGOiewMd84PDrER92QeZ6eeHbWkfEy4+w=
github.com/k3s-io/kubernetes v1.21.5-k3s1 h1:XN3kDM8+HNdyM6gB8dH3A8OrVcNfqPtGe1VrepI6ed0= github.com/k3s-io/kubernetes v1.21.5-k3s1 h1:XN3kDM8+HNdyM6gB8dH3A8OrVcNfqPtGe1VrepI6ed0=

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.6-build20211022
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.6-build20211022"
) )
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

@ -700,7 +700,7 @@ github.com/jmespath/go-jmespath
github.com/jonboulle/clockwork github.com/jonboulle/clockwork
# github.com/json-iterator/go v1.1.10 # github.com/json-iterator/go v1.1.10
github.com/json-iterator/go github.com/json-iterator/go
# github.com/k3s-io/helm-controller v0.10.5 # github.com/k3s-io/helm-controller v0.10.8
## 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