Skip to content

Commit

Permalink
Merge pull request fluxcd#3512 from fluxcd/go-mod-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Kingdon Barrett committed Jul 26, 2021
2 parents dcbef57 + e2552eb commit 20e5073
Show file tree
Hide file tree
Showing 6 changed files with 648 additions and 92 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile.flux
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.12
FROM alpine:3.14

WORKDIR /home/flux

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.fluxctl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.14

WORKDIR /home/flux

Expand Down
44 changes: 19 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -34,55 +34,49 @@ require (
github.com/Azure/go-autorest/autorest v0.9.3 // indirect
github.com/Azure/go-autorest/autorest/adal v0.8.1 // indirect
github.com/Jeffail/gabs v1.4.0
github.com/Masterminds/semver/v3 v3.0.3
github.com/Masterminds/semver/v3 v3.1.1
github.com/Microsoft/go-winio v0.4.16 // indirect
github.com/aws/aws-sdk-go v1.33.18
github.com/aws/aws-sdk-go v1.40.7
github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668
github.com/cheggaaa/pb/v3 v3.0.2
github.com/cheggaaa/pb/v3 v3.0.8
github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e // indirect
github.com/containerd/stargz-snapshotter/estargz v0.4.1 // indirect
github.com/docker/cli v20.10.3+incompatible // indirect
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/docker v20.10.3+incompatible // indirect
github.com/evanphx/json-patch v4.9.0+incompatible
github.com/evanphx/json-patch v4.11.0+incompatible
github.com/fluxcd/flux/pkg/install v0.0.0-00010101000000-000000000000
github.com/fluxcd/helm-operator v1.2.0
github.com/fluxcd/helm-operator v1.4.0
github.com/ghodss/yaml v1.0.0
github.com/go-kit/kit v0.9.0
github.com/go-kit/kit v0.11.0
github.com/golang/gddo v0.0.0-20190312205958-5a2505f3dbf0
github.com/google/go-cmp v0.5.4 // indirect
github.com/google/go-containerregistry v0.4.0
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/go-containerregistry v0.5.1
github.com/google/go-github/v28 v28.1.1
github.com/gorilla/mux v1.7.3
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.4.2
github.com/imdario/mergo v0.3.8
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/magefile/mage v1.11.0 // indirect
github.com/imdario/mergo v0.3.12
github.com/opencontainers/go-digest v1.0.0
github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
github.com/pkg/errors v0.9.1
github.com/pkg/term v0.0.0-20190109203006-aa71e9d9e942
github.com/prometheus/client_golang v1.7.1
github.com/pkg/term v1.1.0
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/client_model v0.2.0
github.com/ryanuber/go-glob v1.0.0
github.com/sirupsen/logrus v1.8.0 // indirect
github.com/spf13/cobra v1.1.3
github.com/spf13/cobra v1.2.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.5.1
github.com/stretchr/testify v1.7.0
github.com/weaveworks/common v0.0.0-20190410110702-87611edc252e
github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab
github.com/whilp/git-urls v0.0.0-20160530060445-31bac0d230fa
github.com/whilp/git-urls v1.0.0
github.com/xeipuuv/gojsonschema v1.1.0
go.mozilla.org/sops/v3 v3.6.1
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
gopkg.in/yaml.v2 v2.4.0
gotest.tools/v3 v3.0.3 // indirect
k8s.io/api v0.19.8
k8s.io/apiextensions-apiserver v0.17.4
k8s.io/apiextensions-apiserver v0.21.3
k8s.io/apimachinery v0.19.8
k8s.io/client-go v11.0.0+incompatible
k8s.io/klog v1.0.0
Expand Down
Loading

0 comments on commit 20e5073

Please sign in to comment.