Update dependencies
- github.com/Masterminds/semver/v3 to v3.1.1 - github.com/ProtonMail/go-crypto to v0.0.0-20220113124808-70ae35bab23f - github.com/cyphar/filepath-securejoin to v0.2.3 - github.com/fluxcd/pkg/kustomize to v0.0.3 - github.com/fluxcd/pkg/runtime to v0.13.2 - github.com/fluxcd/pkg/ssa to v0.15.1 - github.com/fluxcd/pkg/ssh to v0.3.2 - github.com/fluxcd/pkg/untar to v0.1.0 - github.com/fluxcd/pkg/version to v0.1.0 - github.com/gonvenience/bunt to v1.3.3 - github.com/gonvenience/ytbx to v1.4.4 - github.com/google/go-containerregistry to v0.8.0 - github.com/homeport/dyff to v1.5.1 - github.com/olekukonko/tablewriter to v0.0.5 - github.com/spf13/cobra to v1.4.0 - golang.org/x/crypto to v0.0.0-20220321153916-2c7772ba3064 - k8s.io/kubectl to v0.23.4 - k8s.io/cli-runtime to v0.23.4 - sigs.k8s.io/cli-utils to v0.29.3 Signed-off-by: Hidde Beydals <hello@hidde.co>
This commit is contained in:
4
Makefile
4
Makefile
@@ -16,8 +16,8 @@ rwildcard=$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call rwildcard,$(d)/,$(2
|
||||
all: test build
|
||||
|
||||
tidy:
|
||||
go mod tidy
|
||||
cd tests/azure && go mod tidy
|
||||
go mod tidy -compat=1.17
|
||||
cd tests/azure && go mod tidy -compat=1.17
|
||||
|
||||
fmt:
|
||||
go fmt ./...
|
||||
|
||||
58
go.mod
58
go.mod
@@ -3,9 +3,9 @@ module github.com/fluxcd/flux2
|
||||
go 1.17
|
||||
|
||||
require (
|
||||
github.com/Masterminds/semver/v3 v3.1.0
|
||||
github.com/ProtonMail/go-crypto v0.0.0-20211221144345-a4f6767435ab
|
||||
github.com/cyphar/filepath-securejoin v0.2.2
|
||||
github.com/Masterminds/semver/v3 v3.1.1
|
||||
github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f
|
||||
github.com/cyphar/filepath-securejoin v0.2.3
|
||||
github.com/fluxcd/go-git-providers v0.5.4
|
||||
github.com/fluxcd/helm-controller/api v0.18.0
|
||||
github.com/fluxcd/image-automation-controller/api v0.21.0
|
||||
@@ -13,36 +13,36 @@ require (
|
||||
github.com/fluxcd/kustomize-controller/api v0.22.0
|
||||
github.com/fluxcd/notification-controller/api v0.23.0
|
||||
github.com/fluxcd/pkg/apis/meta v0.12.1
|
||||
github.com/fluxcd/pkg/kustomize v0.0.2
|
||||
github.com/fluxcd/pkg/runtime v0.12.5
|
||||
github.com/fluxcd/pkg/ssa v0.14.1
|
||||
github.com/fluxcd/pkg/ssh v0.3.1
|
||||
github.com/fluxcd/pkg/untar v0.0.5
|
||||
github.com/fluxcd/pkg/version v0.0.1
|
||||
github.com/fluxcd/pkg/kustomize v0.0.3
|
||||
github.com/fluxcd/pkg/runtime v0.13.2
|
||||
github.com/fluxcd/pkg/ssa v0.15.1
|
||||
github.com/fluxcd/pkg/ssh v0.3.2
|
||||
github.com/fluxcd/pkg/untar v0.1.0
|
||||
github.com/fluxcd/pkg/version v0.1.0
|
||||
github.com/fluxcd/source-controller/api v0.22.0
|
||||
github.com/go-git/go-git/v5 v5.4.2
|
||||
github.com/gonvenience/bunt v1.3.2
|
||||
github.com/gonvenience/ytbx v1.4.2
|
||||
github.com/gonvenience/bunt v1.3.3
|
||||
github.com/gonvenience/ytbx v1.4.4
|
||||
github.com/google/go-cmp v0.5.7
|
||||
github.com/google/go-containerregistry v0.2.0
|
||||
github.com/google/go-containerregistry v0.8.0
|
||||
github.com/hashicorp/go-multierror v1.1.1
|
||||
github.com/homeport/dyff v1.4.6
|
||||
github.com/homeport/dyff v1.5.1
|
||||
github.com/lucasb-eyer/go-colorful v1.2.0
|
||||
github.com/manifoldco/promptui v0.9.0
|
||||
github.com/mattn/go-shellwords v1.0.12
|
||||
github.com/olekukonko/tablewriter v0.0.4
|
||||
github.com/spf13/cobra v1.3.0
|
||||
github.com/olekukonko/tablewriter v0.0.5
|
||||
github.com/spf13/cobra v1.4.0
|
||||
github.com/spf13/pflag v1.0.5
|
||||
github.com/theckman/yacspin v0.13.12
|
||||
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
|
||||
golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
|
||||
k8s.io/api v0.23.4
|
||||
k8s.io/apiextensions-apiserver v0.23.4
|
||||
k8s.io/apimachinery v0.23.4
|
||||
k8s.io/cli-runtime v0.23.2
|
||||
k8s.io/cli-runtime v0.23.4
|
||||
k8s.io/client-go v0.23.4
|
||||
k8s.io/kubectl v0.23.2
|
||||
sigs.k8s.io/cli-utils v0.28.0
|
||||
k8s.io/kubectl v0.23.4
|
||||
sigs.k8s.io/cli-utils v0.29.3
|
||||
sigs.k8s.io/controller-runtime v0.11.1
|
||||
sigs.k8s.io/kustomize/api v0.11.2
|
||||
sigs.k8s.io/kustomize/kyaml v0.13.3
|
||||
@@ -58,9 +58,9 @@ require (
|
||||
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
|
||||
github.com/Azure/go-autorest/logger v0.2.1 // indirect
|
||||
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
|
||||
github.com/BurntSushi/toml v0.4.1 // indirect
|
||||
github.com/BurntSushi/toml v1.0.0 // indirect
|
||||
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
|
||||
github.com/Microsoft/go-winio v0.4.16 // indirect
|
||||
github.com/Microsoft/go-winio v0.5.1 // indirect
|
||||
github.com/PuerkitoBio/purell v1.1.1 // indirect
|
||||
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
|
||||
github.com/acomagu/bufpipe v1.0.3 // indirect
|
||||
@@ -86,10 +86,10 @@ require (
|
||||
github.com/go-openapi/swag v0.19.14 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/golang/protobuf v1.5.2 // indirect
|
||||
github.com/gonvenience/neat v1.3.7 // indirect
|
||||
github.com/gonvenience/term v1.0.1 // indirect
|
||||
github.com/gonvenience/text v1.0.6 // indirect
|
||||
github.com/gonvenience/wrap v1.1.0 // indirect
|
||||
github.com/gonvenience/neat v1.3.9 // indirect
|
||||
github.com/gonvenience/term v1.0.2 // indirect
|
||||
github.com/gonvenience/text v1.0.7 // indirect
|
||||
github.com/gonvenience/wrap v1.1.1 // indirect
|
||||
github.com/google/btree v1.0.1 // indirect
|
||||
github.com/google/go-github/v41 v41.0.0 // indirect
|
||||
github.com/google/go-querystring v1.1.0 // indirect
|
||||
@@ -125,8 +125,6 @@ require (
|
||||
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
|
||||
github.com/pkg/errors v0.9.1 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
github.com/prometheus/common v0.32.1 // indirect
|
||||
github.com/prometheus/procfs v0.7.3 // indirect
|
||||
github.com/rivo/uniseg v0.2.0 // indirect
|
||||
github.com/russross/blackfriday v1.5.2 // indirect
|
||||
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
||||
@@ -138,7 +136,7 @@ require (
|
||||
github.com/xanzy/ssh-agent v0.3.0 // indirect
|
||||
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
|
||||
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
|
||||
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
|
||||
golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba // indirect
|
||||
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
|
||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
|
||||
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
|
||||
@@ -157,7 +155,3 @@ require (
|
||||
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
|
||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
|
||||
)
|
||||
|
||||
// Fix for CVE-2020-29652: https://github.com/golang/crypto/commit/8b5274cf687fd9316b4108863654cc57385531e8
|
||||
// Fix for CVE-2021-43565: https://github.com/golang/crypto/commit/5770296d904e90f15f38f77dfc2e43fdf5efc083
|
||||
replace golang.org/x/crypto => golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
|
||||
|
||||
Reference in New Issue
Block a user