From 540d19b09730db2c55facb16f64c930d599a39e5 Mon Sep 17 00:00:00 2001 From: Hussein Galal Date: Thu, 6 Apr 2023 22:17:21 +0200 Subject: [PATCH] [release-1.25] Update klipper lb and helm-controller (#7240) * Update klipper lb and helm-controller Signed-off-by: galal-hussein * update klipper helm image Signed-off-by: galal-hussein --------- Signed-off-by: galal-hussein --- go.mod | 2 +- go.sum | 4 ++-- pkg/cloudprovider/servicelb.go | 2 +- scripts/airgap/image-list.txt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 2d7a830d6bd0..a1bc6d28e7dc 100644 --- a/go.mod +++ b/go.mod @@ -85,7 +85,7 @@ require ( github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.5.0 github.com/json-iterator/go v1.1.12 - github.com/k3s-io/helm-controller v0.13.1 + github.com/k3s-io/helm-controller v0.13.3 github.com/k3s-io/kine v0.9.9 github.com/klauspost/compress v1.15.12 github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000 diff --git a/go.sum b/go.sum index 472209317add..288ac9f5121b 100644 --- a/go.sum +++ b/go.sum @@ -593,8 +593,8 @@ github.com/k3s-io/etcd/etcdutl/v3 v3.5.3-k3s1 h1:uPCEhACmVoFJnI9Izb2Y+UKRS5JM/F/ github.com/k3s-io/etcd/etcdutl/v3 v3.5.3-k3s1/go.mod h1:F9bW3+f+cKZIcjWHkdfJ3lnCajF4FnPh7DjcgiBRb7g= github.com/k3s-io/etcd/server/v3 v3.5.3-k3s1 h1:MVTrb5cp75kSMA9K240VMa5I+GKuYYP9xN/Nj+US27w= github.com/k3s-io/etcd/server/v3 v3.5.3-k3s1/go.mod h1:xwZlQLuAWsWw5rpb/Gwzi3nFie9STKcrKQbM6evLi5g= -github.com/k3s-io/helm-controller v0.13.1 h1:eG2yZ0QzbtcfMe8GpTVtRtP6HgMDO/Pr9Q1EGbMKKCA= -github.com/k3s-io/helm-controller v0.13.1/go.mod h1:f8aOuHQDpkshmUK/GiE+jJCJkUL8vp+EzCjV0uCFcsY= +github.com/k3s-io/helm-controller v0.13.3 h1:zlJkqZtKJNt1e738G77t5MN0X2RCIYr9PPU5KAuJHzs= +github.com/k3s-io/helm-controller v0.13.3/go.mod h1:I6EYR7hCs4rcNv/KRWYU5CUgpCP+jn4PZ88j+eXYsMU= github.com/k3s-io/kine v0.9.9 h1:DuKVDn4lFw9BDcni8bu+B+cBaWKcWm8ajXnpbGPSfeI= github.com/k3s-io/kine v0.9.9/go.mod h1:iQvdpQ7EAyI+24mEITK5nlOBglOOLUa7+4YIaTB8vX8= github.com/k3s-io/klog v1.0.0-k3s2 h1:yyvD2bQbxG7m85/pvNctLX2bUDmva5kOBvuZ77tTGBA= diff --git a/pkg/cloudprovider/servicelb.go b/pkg/cloudprovider/servicelb.go index 40e9ae34bb96..6c24843afdeb 100644 --- a/pkg/cloudprovider/servicelb.go +++ b/pkg/cloudprovider/servicelb.go @@ -43,7 +43,7 @@ var ( const ( Ready = condition.Cond("Ready") DefaultLBNS = meta.NamespaceSystem - DefaultLBImage = "rancher/klipper-lb:v0.4.0" + DefaultLBImage = "rancher/klipper-lb:v0.4.3" ) func (k *k3s) Register(ctx context.Context, diff --git a/scripts/airgap/image-list.txt b/scripts/airgap/image-list.txt index b09729ed8ffa..9afc657c4674 100644 --- a/scripts/airgap/image-list.txt +++ b/scripts/airgap/image-list.txt @@ -1,5 +1,5 @@ -docker.io/rancher/klipper-helm:v0.7.4-build20221121 -docker.io/rancher/klipper-lb:v0.4.0 +docker.io/rancher/klipper-helm:v0.7.7-build20230403 +docker.io/rancher/klipper-lb:v0.4.3 docker.io/rancher/local-path-provisioner:v0.0.24 docker.io/rancher/mirrored-coredns-coredns:1.10.1 docker.io/rancher/mirrored-library-busybox:1.34.1