From f6b5b970b2e5ff7a8ae09f3049295934ebb86d61 Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Thu, 25 Feb 2021 11:25:44 -0700 Subject: [PATCH] Upgrade helm-controller / klipper-helm --- go.mod | 4 ++-- go.sum | 4 ++-- scripts/build-images | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 72b9717a8a..7b63f0ab25 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ replace ( github.com/docker/libnetwork => github.com/docker/libnetwork v0.8.0-dev.2.0.20190624125649-f0e46a78ea34 github.com/golang/protobuf => github.com/golang/protobuf v1.3.5 github.com/juju/errors => github.com/k3s-io/nocode v0.0.0-20200630202308-cb097102c09f - github.com/k3s-io/helm-controller => github.com/k3s-io/helm-controller v0.8.3 + github.com/k3s-io/helm-controller => github.com/k3s-io/helm-controller v0.8.4 github.com/kubernetes-sigs/cri-tools => github.com/rancher/cri-tools v1.19.0-k3s1 github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc92 @@ -53,7 +53,7 @@ replace ( require ( github.com/containerd/containerd v1.4.3 // indirect github.com/google/go-containerregistry v0.0.0-20190617215043-876b8855d23c - github.com/k3s-io/helm-controller v0.8.3 + github.com/k3s-io/helm-controller v0.8.4 github.com/pkg/errors v0.9.1 github.com/rancher/k3s v1.19.8-rc1.0.20210218212206-95fc76b206b1 github.com/rancher/wrangler v0.6.1 diff --git a/go.sum b/go.sum index 1c871c7245..a5b68c2fe4 100644 --- a/go.sum +++ b/go.sum @@ -476,8 +476,8 @@ github.com/k3s-io/containerd v1.4.3-k3s3/go.mod h1:qHmUrsocqXRZQBvPKgoYfsBDfZ/tC github.com/k3s-io/cri v1.4.0-k3s.2/go.mod h1:fGPUUHMKQik/vIegSe05DtX/m4miovdtvVLqRUFAkK0= 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.8.3 h1:GWxavyMz7Bw2ClxH5okkeOL8o5U6IBK7uauc44SDCjU= -github.com/k3s-io/helm-controller v0.8.3/go.mod h1:nZP8FH3KZrNNUf5r+SwwiMR63HS6lxdHdpHijgPfF74= +github.com/k3s-io/helm-controller v0.8.4 h1:LwNVTXPJGfiA+rnbirsJ1DJJ4w0lAz8XkaPSTGUWb3g= +github.com/k3s-io/helm-controller v0.8.4/go.mod h1:nZP8FH3KZrNNUf5r+SwwiMR63HS6lxdHdpHijgPfF74= github.com/k3s-io/kubernetes v1.19.8-k3s1 h1:MoOcLARL41TK95Da/4Xj+y+F7Y5u2VOf6fMZ9RSO7OA= github.com/k3s-io/kubernetes v1.19.8-k3s1/go.mod h1:6R5K7prywmLDOVGBGd50Ig6lKkgGYaiUT7/r3GZXhsM= github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.19.8-k3s1 h1:tyR1urDN8IIyZurUxL8F79adwon2XJ/wYCdLgf2ijOc= diff --git a/scripts/build-images b/scripts/build-images index 1d39db1999..7ccc1dd8b6 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -15,7 +15,7 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images.txt docker.io/rancher/hardened-flannel:v0.13.0-rancher1-build20210223 docker.io/rancher/hardened-k8s-metrics-server:v0.3.6-build20210223 docker.io/rancher/hardened-kube-proxy:${KUBERNETES_VERSION} - docker.io/rancher/klipper-helm:v0.4.3 + docker.io/rancher/klipper-helm:v0.4.3-build20210225 docker.io/rancher/pause:3.2 docker.io/rancher/nginx-ingress-controller-defaultbackend:1.5-rancher1 docker.io/rancher/nginx-ingress-controller:nginx-0.30.0-rancher1