From 5c837fe7dbd3e0caa23ce38dd7dd1c6ecfcf2274 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Mon, 11 Jan 2021 12:10:15 -0800 Subject: [PATCH] Update helm-controller to v0.8.3 (#655) * Update helm-controller to v0.8.3 Doing this via replace because there are some fixes to node password in k3s master that need to be resolved before we can update again. * Update klipper-helm image Signed-off-by: Brad Davidson --- go.mod | 3 ++- go.sum | 4 ++-- scripts/build-images | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index f2866b6a62..7b5c67c407 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +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/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 +54,7 @@ require ( github.com/containerd/containerd v1.4.3 // indirect github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible // indirect github.com/google/go-containerregistry v0.0.0-20190617215043-876b8855d23c - github.com/k3s-io/helm-controller v0.8.0 + github.com/k3s-io/helm-controller v0.8.3 github.com/pkg/errors v0.9.1 github.com/rancher/k3s v1.19.2-0.20201208230637-989c936993fb github.com/rancher/wrangler v0.6.1 diff --git a/go.sum b/go.sum index cac5a2fa12..46e31116f8 100644 --- a/go.sum +++ b/go.sum @@ -479,8 +479,8 @@ github.com/k3s-io/containerd v1.4.3-k3s2/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.0 h1:ZxnXRMiVjerBqpTkZeR0soEtsC3Bcv3Sbq2AIZQPlhk= -github.com/k3s-io/helm-controller v0.8.0/go.mod h1:nZP8FH3KZrNNUf5r+SwwiMR63HS6lxdHdpHijgPfF74= +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/kine v0.6.0 h1:4l7wjgCxb2oD+7Hyf3xIhkGd/6s1sXpRFdQiyy+7Ki8= github.com/k3s-io/kine v0.6.0/go.mod h1:rzCs93+rQHZGOiewMd84PDrER92QeZ6eeHbWkfEy4+w= github.com/k3s-io/kubernetes v1.19.5-k3s1 h1:BKdjKyO8LzVo94lVX40lGd6v+mn8phLzYsGoeNGW2eg= diff --git a/scripts/build-images b/scripts/build-images index b5ae5b851f..270fd49d7c 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 docker.io/rancher/hardened-k8s-metrics-server:v0.3.6 docker.io/rancher/hardened-kube-proxy:${KUBERNETES_VERSION} - docker.io/rancher/klipper-helm:v0.3.2 + docker.io/rancher/klipper-helm:v0.4.3 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