Skip to content
This repository was archived by the owner on Nov 1, 2022. It is now read-only.

Commit 4cda273

Browse files
author
Kingdon Barrett
committed
test-upgrades-4
Update module github.com/docker/distribution to v2.8.1 Update module github.com/gorilla/websocket to v1.5.0 Update golang.org/x/oauth2 digest to 6242fa9 Update module github.com/fluxcd/helm-operator to v1.4.2 Update module github.com/google/go-containerregistry to v0.8.0 Update module github.com/fluxcd/distribution to v2 Signed-off-by: Kingdon Barrett <[email protected]>
1 parent e8be4bb commit 4cda273

File tree

6 files changed

+62
-18
lines changed

6 files changed

+62
-18
lines changed

docker/Dockerfile.flux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.14
1+
FROM alpine:3.15
22

33
WORKDIR /home/flux
44

docker/Dockerfile.fluxctl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.14
1+
FROM alpine:3.15
22

33
WORKDIR /home/flux
44

go.mod

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.16
44

55
// remove when https://github.com/docker/distribution/pull/2905 is released.
66
// Update: on 2021-02-25 this has been merged, 2.7.2 should include it soon!
7-
replace github.com/docker/distribution => github.com/fluxcd/distribution v0.0.0-20190419185413-6c9727e5e5de
7+
replace github.com/docker/distribution => github.com/fluxcd/distribution/v2 v2.7.1
88

99
// fix go-autorest ambiguous import caused by sops
1010
// sops needs to update their deps ref: https://github.com/kubernetes/client-go/issues/628
@@ -37,18 +37,18 @@ require (
3737
github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d
3838
github.com/cheggaaa/pb/v3 v3.0.8
3939
github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e // indirect
40-
github.com/docker/distribution v2.7.1+incompatible
40+
github.com/docker/distribution v2.8.1+incompatible
4141
github.com/docker/docker v20.10.3+incompatible // indirect
4242
github.com/evanphx/json-patch v4.11.0+incompatible
4343
github.com/fluxcd/flux/pkg/install v0.0.0-00010101000000-000000000000
44-
github.com/fluxcd/helm-operator v1.4.0
44+
github.com/fluxcd/helm-operator v1.4.2
4545
github.com/ghodss/yaml v1.0.0
4646
github.com/go-kit/kit v0.12.0
47-
github.com/golang/gddo v0.0.0-20190312205958-5a2505f3dbf0
48-
github.com/google/go-containerregistry v0.5.1
47+
github.com/golang/gddo v0.0.0-20210115222349-20d68f94ee1f
48+
github.com/google/go-containerregistry v0.8.0
4949
github.com/google/go-github/v28 v28.1.1
5050
github.com/gorilla/mux v1.8.0
51-
github.com/gorilla/websocket v1.4.2
51+
github.com/gorilla/websocket v1.5.0
5252
github.com/imdario/mergo v0.3.12
5353
github.com/opencontainers/go-digest v1.0.0
5454
github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
@@ -59,15 +59,15 @@ require (
5959
github.com/ryanuber/go-glob v1.0.0
6060
github.com/spf13/cobra v1.2.1
6161
github.com/spf13/pflag v1.0.5
62-
github.com/stretchr/testify v1.7.0
62+
github.com/stretchr/testify v1.7.1
6363
github.com/weaveworks/common v0.0.0-20220302160857-00e2e238a230
6464
github.com/weaveworks/go-checkpoint v0.0.0-20220223124739-fd9899e2b4f2
6565
github.com/whilp/git-urls v1.0.0
6666
github.com/xeipuuv/gojsonschema v1.2.0
67-
go.mozilla.org/sops/v3 v3.7.1
68-
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
67+
go.mozilla.org/sops/v3 v3.7.2
68+
golang.org/x/oauth2 6242fa91716a
6969
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886
70-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
70+
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65
7171
gopkg.in/yaml.v2 v2.4.0
7272
k8s.io/api v0.21.3
7373
k8s.io/apiextensions-apiserver v0.21.3

0 commit comments

Comments
 (0)