From 06b863906847aa6779385d7615b512d717458f1b Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 22 Oct 2021 13:08:24 -0700 Subject: [PATCH] Bump klipper-helm version Signed-off-by: Brad Davidson --- go.mod | 2 +- go.sum | 4 ++-- scripts/airgap/image-list.txt | 2 +- .../github.com/k3s-io/helm-controller/pkg/helm/controller.go | 5 +++-- vendor/modules.txt | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index c06ee836b1..c625be6006 100644 --- a/go.mod +++ b/go.mod @@ -91,7 +91,7 @@ require ( github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.4.2 - github.com/k3s-io/helm-controller v0.11.5 + github.com/k3s-io/helm-controller v0.11.7 github.com/k3s-io/kine v0.8.0 github.com/klauspost/compress v1.13.5 github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000 diff --git a/go.sum b/go.sum index f754453425..37332e4ac0 100644 --- a/go.sum +++ b/go.sum @@ -569,8 +569,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/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/helm-controller v0.11.5 h1:s3pVbNj112drfSYfZsZqIf32OMQzzK+x6mgZUJfOT34= -github.com/k3s-io/helm-controller v0.11.5/go.mod h1:z0ExsRRIkTO/QC//3/Esn5ItTD6AiQSluwzMaS7RI/4= +github.com/k3s-io/helm-controller v0.11.7 h1:fNpBImB3h5aHvPf3zwU9sFWmeVQh0nTG1sLCoBhEeUg= +github.com/k3s-io/helm-controller v0.11.7/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/go.mod h1:gaezUQ9c8iw8vxDV/DI8vc93h2rCpTvY37kMdYPMsyc= github.com/k3s-io/klog v1.0.0-k3s2 h1:yyvD2bQbxG7m85/pvNctLX2bUDmva5kOBvuZ77tTGBA= diff --git a/scripts/airgap/image-list.txt b/scripts/airgap/image-list.txt index df80f1c977..99bc17399b 100644 --- a/scripts/airgap/image-list.txt +++ b/scripts/airgap/image-list.txt @@ -1,4 +1,4 @@ -docker.io/rancher/klipper-helm:v0.6.5-build20210915 +docker.io/rancher/klipper-helm:v0.6.6-build20211022 docker.io/rancher/klipper-lb:v0.3.2 docker.io/rancher/local-path-provisioner:v0.0.20 docker.io/rancher/mirrored-coredns-coredns:1.8.4 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 0c7a391462..a3bdd4e213 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,8 @@ import ( var ( trueVal = true commaRE = regexp.MustCompile(`\\*,`) - DefaultJobImage = "rancher/klipper-helm:v0.6.5-build20210915" + deletePolicy = meta.DeletePropagationForeground + DefaultJobImage = "rancher/klipper-helm:v0.6.6-build20211022" ) type Controller struct { @@ -64,7 +65,7 @@ func Register(ctx context.Context, apply apply.Apply, apply = apply.WithSetID(Name). WithCacheTypes(helms, confs, jobs, crbs, sas, cm). WithStrictCaching().WithPatcher(batch.SchemeGroupVersion.WithKind("Job"), func(namespace, name string, pt types.PatchType, data []byte) (runtime.Object, error) { - err := jobs.Delete(namespace, name, &meta.DeleteOptions{}) + err := jobs.Delete(namespace, name, &meta.DeleteOptions{PropagationPolicy: &deletePolicy}) if err == nil { return nil, fmt.Errorf("replace job") } diff --git a/vendor/modules.txt b/vendor/modules.txt index 3aa56438b3..0a3db599bc 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -735,7 +735,7 @@ github.com/jonboulle/clockwork github.com/josharian/intern # github.com/json-iterator/go v1.1.11 github.com/json-iterator/go -# github.com/k3s-io/helm-controller v0.11.5 +# github.com/k3s-io/helm-controller v0.11.7 ## explicit github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1