Merge pull request #3550 from Oats87/issues/k3s/3427

go.mod

@@ -84,7 +84,7 @@ require (
 	github.com/google/uuid v1.2.0
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.4.2
-	github.com/k3s-io/helm-controller v0.9.1
+	github.com/k3s-io/helm-controller v0.10.1
 	github.com/k3s-io/kine v0.6.0
 	github.com/klauspost/compress v1.12.2
 	github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000

go.sum

@@ -540,8 +540,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/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.9.1 h1:qtHWTNHiuCPRbA2YZ7z7jTgSHo7Yc5He52oMga72yUk=
-github.com/k3s-io/helm-controller v0.9.1/go.mod h1:nZP8FH3KZrNNUf5r+SwwiMR63HS6lxdHdpHijgPfF74=
+github.com/k3s-io/helm-controller v0.10.1 h1:w98iQsKfA5RnvzdVzU4LTDuLzA3SyoN31ebDUKQUDpM=
+github.com/k3s-io/helm-controller v0.10.1/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.21.2-k3s1 h1:e5R77BWsEEiZqoZ68t9iKF08KwSVBqASwy4N9Uq4FHw=

scripts/airgap/image-list.txt

 docker.io/rancher/coredns-coredns:1.8.3
-docker.io/rancher/klipper-helm:v0.5.0-build20210505
+docker.io/rancher/klipper-helm:v0.6.1-build20210616
 docker.io/rancher/klipper-lb:v0.2.0
 docker.io/rancher/library-busybox:1.32.1
 docker.io/rancher/library-traefik:2.4.8

vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/types.go

@@ -27,6 +27,7 @@ type HelmChartSpec struct {
 	Bootstrap       bool                          `json:"bootstrap,omitempty"`
 	ChartContent    string                        `json:"chartContent,omitempty"`
 	JobImage        string                        `json:"jobImage,omitempty"`
+	Timeout         *metav1.Duration              `json:"timeout,omitempty"`
 }
 
 type HelmChartStatus struct {

vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_deepcopy.go

@@ -21,6 +21,7 @@ limitations under the License.
 package v1
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	intstr "k8s.io/apimachinery/pkg/util/intstr"
 )
@@ -172,6 +173,11 @@ func (in *HelmChartSpec) DeepCopyInto(out *HelmChartSpec) {
 			(*out)[key] = val
 		}
 	}
+	if in.Timeout != nil {
+		in, out := &in.Timeout, &out.Timeout
+		*out = new(metav1.Duration)
+		**out = **in
+	}
 	return
 }
 

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.5.0-build20210505"
+	DefaultJobImage = "rancher/klipper-helm:v0.6.1-build20210616"
 )
 
 type Controller struct {
@@ -272,23 +272,40 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
 		},
 	}
 
+	if chart.Spec.Timeout != nil {
+		job.Spec.Template.Spec.Containers[0].Env = append(job.Spec.Template.Spec.Containers[0].Env, core.EnvVar{
+			Name:  "TIMEOUT",
+			Value: chart.Spec.Timeout.String(),
+		})
+	}
+
 	if chart.Spec.Bootstrap {
 		job.Spec.Template.Spec.HostNetwork = true
 		job.Spec.Template.Spec.Tolerations = []core.Toleration{
 			{
 				Key:    "node.kubernetes.io/not-ready",
-				Effect: "NoSchedule",
+				Effect: core.TaintEffectNoSchedule,
 			},
 			{
 				Key:      "node.cloudprovider.kubernetes.io/uninitialized",
 				Operator: core.TolerationOpEqual,
 				Value:    "true",
-				Effect:   "NoSchedule",
+				Effect:   core.TaintEffectNoSchedule,
 			},
 			{
 				Key:      "CriticalAddonsOnly",
 				Operator: core.TolerationOpExists,
 			},
+			{
+				Key:      "node-role.kubernetes.io/etcd",
+				Operator: core.TolerationOpExists,
+				Effect:   core.TaintEffectNoExecute,
+			},
+			{
+				Key:      "node-role.kubernetes.io/control-plane",
+				Operator: core.TolerationOpExists,
+				Effect:   core.TaintEffectNoSchedule,
+			},
 		}
 		job.Spec.Template.Spec.Containers[0].Env = append(job.Spec.Template.Spec.Containers[0].Env, []core.EnvVar{
 			{
@@ -399,12 +416,10 @@ func args(chart *helmv1.HelmChart) []string {
 
 	for _, k := range keys(spec.Set) {
 		val := spec.Set[k]
-		if val.StrVal == "false" || val.StrVal == "true" {
-			args = append(args, "--set", fmt.Sprintf("%s=%s", k, val.StrVal))
-		} else if val.StrVal != "" {
-			args = append(args, "--set-string", fmt.Sprintf("%s=%s", k, commaRE.ReplaceAllStringFunc(val.StrVal, escapeComma)))
+		if typedVal(val) {
+			args = append(args, "--set", fmt.Sprintf("%s=%s", k, val.String()))
 		} else {
-			args = append(args, "--set", fmt.Sprintf("%s=%d", k, val.IntVal))
+			args = append(args, "--set-string", fmt.Sprintf("%s=%s", k, commaRE.ReplaceAllStringFunc(val.String(), escapeComma)))
 		}
 	}
 
@@ -420,6 +435,21 @@ func keys(val map[string]intstr.IntOrString) []string {
 	return keys
 }
 
+// typedVal is a modified version of helm's typedVal function that operates on kubernetes IntOrString types.
+// Things that look like an integer, boolean, or null should use --set; everything else should use --set-string.
+// Ref: https://github.com/helm/helm/blob/v3.5.4/pkg/strvals/parser.go#L415
+func typedVal(val intstr.IntOrString) bool {
+	if intstr.Int == val.Type {
+		return true
+	}
+	switch strings.ToLower(val.StrVal) {
+	case "true", "false", "null":
+		return true
+	default:
+		return false
+	}
+}
+
 // escapeComma should be passed a string consisting of zero or more backslashes, followed by a comma.
 // If there are an even number of characters (such as `\,` or `\\\,`) then the comma is escaped.
 // If there are an uneven number of characters (such as `,` or `\\,` then the comma is not escaped,

vendor/modules.txt

@@ -692,7 +692,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.9.1
+# github.com/k3s-io/helm-controller v0.10.1
 ## explicit
 github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io
 github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1