Skip to content

K
k3s
Commit 02a314c6 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Bump klipper-helm version

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 918945da
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
go.mod
View file @ 02a314c6
...@@ -91,7 +91,7 @@ require ( ...@@ -91,7 +91,7 @@ require (
github.com/google/uuid v1.3.0 github.com/google/uuid v1.3.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.11.5 github.com/k3s-io/helm-controller v0.11.7
github.com/k3s-io/kine v0.8.0 github.com/k3s-io/kine v0.8.0
github.com/klauspost/compress v1.13.5 github.com/klauspost/compress v1.13.5
github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000 github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000
......
go.sum
View file @ 02a314c6
...@@ -569,8 +569,8 @@ github.com/k3s-io/etcd/etcdutl/v3 v3.5.0-k3s2 h1:Feifl9EStGdmkUnOtouh0VD9n+UbgTx ...@@ -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/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 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/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.7 h1:fNpBImB3h5aHvPf3zwU9sFWmeVQh0nTG1sLCoBhEeUg=
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/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 h1:k6T9bI9DID7lIbktukXxg1QfeFoAQK4EIvAHoyPAe08=
github.com/k3s-io/kine v0.8.0/go.mod h1:gaezUQ9c8iw8vxDV/DI8vc93h2rCpTvY37kMdYPMsyc= 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= github.com/k3s-io/klog v1.0.0-k3s2 h1:yyvD2bQbxG7m85/pvNctLX2bUDmva5kOBvuZ77tTGBA=
......
scripts/airgap/image-list.txt
View file @ 02a314c6
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/klipper-lb:v0.3.2
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
......
vendor/github.com/k3s-io/helm-controller/pkg/helm/controller.go
View file @ 02a314c6
...@@ -30,7 +30,8 @@ import ( ...@@ -30,7 +30,8 @@ import (
var ( var (
trueVal = true trueVal = true
commaRE = regexp.MustCompile(`\\*,`) 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 { type Controller struct {
...@@ -64,7 +65,7 @@ func Register(ctx context.Context, apply apply.Apply, ...@@ -64,7 +65,7 @@ func Register(ctx context.Context, apply apply.Apply,
apply = apply.WithSetID(Name). apply = apply.WithSetID(Name).
WithCacheTypes(helms, confs, jobs, crbs, sas, cm). 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) { 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 { if err == nil {
return nil, fmt.Errorf("replace job") return nil, fmt.Errorf("replace job")
} }
......
vendor/modules.txt
View file @ 02a314c6
...@@ -735,7 +735,7 @@ github.com/jonboulle/clockwork ...@@ -735,7 +735,7 @@ github.com/jonboulle/clockwork
github.com/josharian/intern github.com/josharian/intern
# github.com/json-iterator/go v1.1.11 # github.com/json-iterator/go v1.1.11
github.com/json-iterator/go github.com/json-iterator/go
# github.com/k3s-io/helm-controller v0.11.5 # github.com/k3s-io/helm-controller v0.11.7
## 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment