From f07ee54d0c13b10464b464cebaabe1a4390a83af Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 22 Oct 2021 13:30:08 -0700 Subject: [PATCH] Bump klipper-helm version Signed-off-by: Brad Davidson --- go.mod | 2 +- go.sum | 4 ++-- scripts/airgap/image-list.txt | 2 +- .../helm-controller/pkg/helm/controller.go | 21 ++++++++++++------- vendor/modules.txt | 2 +- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 28acbac910..337d34889e 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( github.com/google/uuid v1.2.0 github.com/gorilla/mux v1.7.4 github.com/gorilla/websocket v1.4.1 - 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/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000 github.com/lib/pq v1.8.0 diff --git a/go.sum b/go.sum index 52577bf259..166bc23710 100644 --- a/go.sum +++ b/go.sum @@ -474,8 +474,8 @@ github.com/k3s-io/cri v1.4.0-k3s.7 h1:1ycdF3dMDJMW/k/UxDC6eMsyGSMZ/p0AoUBVdJvNGQ github.com/k3s-io/cri v1.4.0-k3s.7/go.mod h1:fGPUUHMKQik/vIegSe05DtX/m4miovdtvVLqRUFAkK0= 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/helm-controller v0.10.5 h1:zrStmx4ZkhtFU/OqJYoAZFGFB1Bu+jZs0N8dtlVRxDk= -github.com/k3s-io/helm-controller v0.10.5/go.mod h1:nZP8FH3KZrNNUf5r+SwwiMR63HS6lxdHdpHijgPfF74= +github.com/k3s-io/helm-controller v0.10.8 h1:O7zoqUBp3W+6+nRCUWNiAoQMzOX6xw9IsBDXc5lP3Ns= +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/go.mod h1:rzCs93+rQHZGOiewMd84PDrER92QeZ6eeHbWkfEy4+w= github.com/k3s-io/kubernetes v1.19.15-k3s1 h1:A1RJfAmS3JinAk0s9TJD5W82wnuuLMC8P88UZutZPQE= diff --git a/scripts/airgap/image-list.txt b/scripts/airgap/image-list.txt index 387b40fd9c..14c1e9421c 100644 --- a/scripts/airgap/image-list.txt +++ b/scripts/airgap/image-list.txt @@ -1,5 +1,5 @@ docker.io/rancher/coredns-coredns:1.8.3 -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/library-busybox:1.32.1 docker.io/rancher/library-traefik:1.7.19 diff --git a/vendor/github.com/k3s-io/helm-controller/pkg/helm/controller.go b/vendor/github.com/k3s-io/helm-controller/pkg/helm/controller.go index a89655f55b..d82dc10ad6 100644 --- a/vendor/github.com/k3s-io/helm-controller/pkg/helm/controller.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/helm/controller.go @@ -30,7 +30,7 @@ import ( var ( trueVal = true commaRE = regexp.MustCompile(`\\*,`) - DefaultJobImage = "rancher/klipper-helm:v0.6.4-build20210813" + DefaultJobImage = "rancher/klipper-helm:v0.6.6-build20211022" ) type Controller struct { @@ -47,6 +47,11 @@ const ( CRDName = "helmcharts.helm.cattle.io" ConfigCRDName = "helmchartconfigs.helm.cattle.io" 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, @@ -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 { + job.Spec.Template.Spec.NodeSelector[LabelNodeRolePrefix+LabelControlPlaneSuffix] = "true" job.Spec.Template.Spec.HostNetwork = true job.Spec.Template.Spec.Tolerations = []core.Toleration{ { - Key: "node.kubernetes.io/not-ready", + Key: core.TaintNodeNotReady, Effect: core.TaintEffectNoSchedule, }, { - Key: "node.cloudprovider.kubernetes.io/uninitialized", + Key: TaintExternalCloudProvider, Operator: core.TolerationOpEqual, Value: "true", Effect: core.TaintEffectNoSchedule, @@ -297,12 +306,12 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap) Operator: core.TolerationOpExists, }, { - Key: "node-role.kubernetes.io/etcd", + Key: LabelNodeRolePrefix + LabelEtcdSuffix, Operator: core.TolerationOpExists, Effect: core.TaintEffectNoExecute, }, { - Key: "node-role.kubernetes.io/control-plane", + Key: LabelNodeRolePrefix + LabelControlPlaneSuffix, Operator: core.TolerationOpExists, Effect: core.TaintEffectNoSchedule, }, @@ -318,8 +327,6 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap) Name: "BOOTSTRAP", Value: "true"}, }...) - job.Spec.Template.Spec.NodeSelector = make(map[string]string) - job.Spec.Template.Spec.NodeSelector["node-role.kubernetes.io/master"] = "true" } setProxyEnv(job) diff --git a/vendor/modules.txt b/vendor/modules.txt index 73c3f915d7..91fed33837 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -684,7 +684,7 @@ github.com/jmespath/go-jmespath github.com/jonboulle/clockwork # github.com/json-iterator/go v1.1.10 github.com/json-iterator/go -# github.com/k3s-io/helm-controller v0.10.5 +# github.com/k3s-io/helm-controller v0.10.8 ## explicit github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1