Merge pull request #604 from fredr/update-helm

docker/helm2.version

@@ -1,4 +1,4 @@
-HELM2_VERSION=2.16.3
-HELM2_CHECKSUM_amd64=9678eb726d6870e8eded204190357a0f494ed9d1803781b4bb80dde6427b086e
-HELM2_CHECKSUM_arm=3f469d52845b067d8a6911eae3b01c677409d8251c0acfd9e8d8627e46c92a79
-HELM2_CHECKSUM_arm64=98341cebb37d9a3c5ff552c239d5225b8c8d34923f5e035135b6e4797da4374c
+HELM2_VERSION=2.17.0
+HELM2_CHECKSUM_amd64=f3bec3c7c55f6a9eb9e6586b8c503f370af92fe987fcbf741f37707606d70296
+HELM2_CHECKSUM_arm=bf972150ba0b950119a3fe7ac9ed19d467c703fa552ba4ac79a0ad7f1f9e70c4
+HELM2_CHECKSUM_arm64=c3ebe8fa04b4e235eb7a9ab030a98d3002f93ecb842f0a8741f98383a9493d7f

docker/helm3.version

@@ -1,4 +1,4 @@
-HELM3_VERSION=3.1.2
-HELM3_CHECKSUM_amd64=e6be589df85076108c33e12e60cfb85dcd82c5d756a6f6ebc8de0ee505c9fd4c
-HELM3_CHECKSUM_arm=49fada092d28c81cc574d98dc91dee46dbdca2b1f3f286eef17bc9ff87089e9b
-HELM3_CHECKSUM_arm64=9d5fd03616d6aa211e62723fbe9adb650eb8fe51f939364e877d843cb276cb25
+HELM3_VERSION=3.5.4
+HELM3_CHECKSUM_amd64=a8ddb4e30435b5fd45308ecce5eaad676d64a5de9c89660b56face3fe990b318
+HELM3_CHECKSUM_arm=1a9cc09ef06db29a0232d265f73625056a0cb089e5a16b0a5ef8e810e0533157
+HELM3_CHECKSUM_arm64=9db01522150a83a5d65b420171147448d8396c142d2c91af95e5ee77c1694176

go.mod

@@ -10,43 +10,44 @@ require (
 	github.com/fluxcd/flux v1.17.2-0.20200121140732-3903cf8e71c3
 	github.com/fluxcd/helm-operator/pkg/install v0.0.0-00010101000000-000000000000
 	github.com/garyburd/redigo v1.6.0 // indirect
-	github.com/go-kit/kit v0.9.0
+	github.com/go-kit/kit v0.10.0
 	github.com/gofrs/uuid v3.2.0+incompatible // indirect
-	github.com/golang/protobuf v1.3.2
-	github.com/google/go-cmp v0.4.0
+	github.com/golang/protobuf v1.4.3
+	github.com/google/go-cmp v0.5.2
 	github.com/gorilla/mux v1.7.3
-	github.com/helm/helm-2to3 v0.5.1
+	github.com/helm/helm-2to3 v0.8.2
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.2.1
+	github.com/prometheus/client_golang v1.7.1
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.4.0
+	github.com/stretchr/testify v1.7.0
 	github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
 	github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
-	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
-	golang.org/x/sys v0.0.0-20200327173247-9dae0f8f5775 // indirect
-	google.golang.org/grpc v1.27.0
-	helm.sh/helm/v3 v3.1.2
-	k8s.io/api v0.17.2
-	k8s.io/apiextensions-apiserver v0.17.2
-	k8s.io/apimachinery v0.17.2
-	k8s.io/cli-runtime v0.17.2
+	google.golang.org/grpc v1.27.1
+	helm.sh/helm/v3 v3.5.4
+	k8s.io/api v0.20.4
+	k8s.io/apiextensions-apiserver v0.20.4
+	k8s.io/apimachinery v0.20.4
+	k8s.io/cli-runtime v0.20.4
 	k8s.io/client-go v11.0.0+incompatible
-	k8s.io/helm v2.16.3+incompatible
+	k8s.io/helm v2.17.0+incompatible
 	k8s.io/klog v1.0.0
-	k8s.io/kubectl v0.17.2
-	k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
-	sigs.k8s.io/yaml v1.1.0
+	k8s.io/kubectl v0.20.4
+	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
+	sigs.k8s.io/yaml v1.2.0
 )
 
 // github.com/fluxcd/helm-operator/pkg/install lives in this very reprository, so use that
 replace github.com/fluxcd/helm-operator/pkg/install => ./pkg/install
 
-// Transitive requirement from Helm: https://github.com/helm/helm/blob/v3.1.0/go.mod#L44
-replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
+// Transitive requirement from Helm: https://github.com/helm/helm/blob/v3.5.2/go.mod#L52-L53
+replace (
+	github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
+	github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
+)
 
 // Pin Flux to 1.18.0
 replace (
@@ -58,16 +59,16 @@ replace (
 // github.com/fluxcd/helm-operator
 // +-> github.com/fluxcd/flux@v1.17.2
 //     +-> k8s.io/client-go@v11.0.0+incompatible
-replace k8s.io/client-go => k8s.io/client-go v0.17.2
+replace k8s.io/client-go => k8s.io/client-go v0.20.4
 
 // Force upgrade because of a transitive downgrade.
 // github.com/fluxcd/flux
 // +-> github.com/fluxcd/helm-operator@v1.0.0-rc6
 //     +-> helm.sh/helm/v3@v3.1.2
 //     +-> helm.sh/helm@v2.16.1
 replace (
-	helm.sh/helm/v3 => helm.sh/helm/v3 v3.1.2
-	k8s.io/helm => k8s.io/helm v2.16.3+incompatible
+	helm.sh/helm/v3 => helm.sh/helm/v3 v3.5.4
+	k8s.io/helm => k8s.io/helm v2.17.0+incompatible
 )
 
 // Force upgrade because of transitive downgrade.
@@ -77,6 +78,3 @@ replace (
 // +-> helm.sh/helm/v3@v3.1.2
 //     +-> github.com/opencontainers/runc@v0.1.1
 replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc10
-
-// helm-2to3 package replaces these packages in its go.mod
-replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible