From 30345b69743784fee276cee59491c18c3d6156f5 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 7 Aug 2020 12:17:58 -0700 Subject: [PATCH] Update helm-controller Signed-off-by: Brad Davidson --- go.mod | 2 +- go.sum | 4 ++-- .../rancher/helm-controller/pkg/helm/controller.go | 6 ++++++ vendor/modules.txt | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 42e0b34c63..dcc5cf428f 100644 --- a/go.mod +++ b/go.mod @@ -95,7 +95,7 @@ require ( github.com/opencontainers/selinux v1.5.3-0.20200613095409-bb88c45a3863 github.com/pkg/errors v0.9.1 github.com/rancher/dynamiclistener v0.2.1-0.20200418023342-52ede5ec9234 - github.com/rancher/helm-controller v0.6.3 + github.com/rancher/helm-controller v0.6.4 github.com/rancher/kine v0.4.0 github.com/rancher/remotedialer v0.2.0 github.com/rancher/spur v0.0.0-20200617165101-8702c8e4ce7a diff --git a/go.sum b/go.sum index 1dacd1fc28..ef313d2b58 100644 --- a/go.sum +++ b/go.sum @@ -638,8 +638,8 @@ github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79 h1:UeC0rjrIe github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79/go.mod h1:xi4WpK6Op4m1Lknq61/e+VSjYlTs9bulVOaDNyBdzvk= github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373 h1:BePi97poJ4hXnkP9yX96EmNQgMg+dGScvB1sqIheJ7w= github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373/go.mod h1:Vz8oLnHgttpo/aZrTpjbcpZEDzzElqNau2zmorToY0E= -github.com/rancher/helm-controller v0.6.3 h1:tsqSXndQ7Ms8S0mBd2zWOcTV1tiZ4BUYkemYnijNXio= -github.com/rancher/helm-controller v0.6.3/go.mod h1:ZylsxIMGNADRPRNW+NiBWhrwwks9vnKLQiCHYWb6Bi0= +github.com/rancher/helm-controller v0.6.4 h1:Q1N89ad5ejaBlQ4FFwDzfn/4C64FVwkqLatdFcqLn1Q= +github.com/rancher/helm-controller v0.6.4/go.mod h1:ZylsxIMGNADRPRNW+NiBWhrwwks9vnKLQiCHYWb6Bi0= github.com/rancher/kine v0.4.0 h1:1IhWy3TzjExG8xnj46eyUEWdzqNAD1WrgL4eEBKm6Uc= github.com/rancher/kine v0.4.0/go.mod h1:IImtCJ68AIkE+VY/kUI0NkyJL5q5WzO8QvMsSXqbrpA= github.com/rancher/kubernetes v1.18.6-k3s1 h1:UyO6rKHsFg48cG7V19Ji0XPXScNxPJRlPPYWBKMmo6Y= diff --git a/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go b/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go index 46991ae2e5..498d000269 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go +++ b/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go @@ -236,6 +236,12 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap) Key: "node.kubernetes.io/not-ready", Effect: "NoSchedule", }, + { + Key: "node.cloudprovider.kubernetes.io/uninitialized", + Operator: "=", + Value: "true", + Effect: "NoSchedule", + }, } job.Spec.Template.Spec.Containers[0].Env = append(job.Spec.Template.Spec.Containers[0].Env, []core.EnvVar{ { diff --git a/vendor/modules.txt b/vendor/modules.txt index 0e68e4ea82..40b0803162 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -736,7 +736,7 @@ github.com/rancher/dynamiclistener/storage/memory # github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79 github.com/rancher/go-powershell/backend github.com/rancher/go-powershell/utils -# github.com/rancher/helm-controller v0.6.3 +# github.com/rancher/helm-controller v0.6.4 github.com/rancher/helm-controller/pkg/apis/helm.cattle.io github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1 github.com/rancher/helm-controller/pkg/generated/clientset/versioned