Skip to content

Commit

Permalink
go mod updates for kubernetes client
Browse files Browse the repository at this point in the history
* go mod download (go.sum)
* go mod updates for helm-operator package
* go mod download (helm-operator)
* remove github.com/Azure/go-autorest pin (it was failing go mod tidy)

Signed-off-by: Kingdon Barrett <kingdon@weave.works>
  • Loading branch information
Kingdon Barrett committed Aug 17, 2021
1 parent feaedf3 commit 5700253
Show file tree
Hide file tree
Showing 2 changed files with 217 additions and 171 deletions.
15 changes: 5 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ replace github.com/docker/distribution => github.com/fluxcd/distribution v0.0.0-

// fix go-autorest ambiguous import caused by sops
// sops needs to update their deps ref: https://github.com/kubernetes/client-go/issues/628
replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.2.0+incompatible
// replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.2.0+incompatible

// transitive requirement from Helm Operator
replace (
github.com/docker/docker => github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0
github.com/fluxcd/helm-operator => github.com/fluxcd/helm-operator v1.2.0
github.com/fluxcd/helm-operator => github.com/fluxcd/helm-operator v1.4.0
github.com/fluxcd/helm-operator/pkg/install => github.com/fluxcd/helm-operator/pkg/install v0.0.0-20200213151218-f7e487142b46
)

Expand All @@ -31,16 +31,12 @@ replace github.com/fluxcd/flux/pkg/install => ./pkg/install

require (
github.com/Azure/azure-sdk-for-go v38.0.0+incompatible // indirect
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.1.1
github.com/Microsoft/go-winio v0.4.16 // indirect
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.8
github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e // 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.11.0+incompatible
Expand Down Expand Up @@ -68,16 +64,15 @@ require (
github.com/weaveworks/common v0.0.0-20190410110702-87611edc252e
github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab
github.com/whilp/git-urls v1.0.0
github.com/xeipuuv/gojsonschema v1.1.0
github.com/xeipuuv/gojsonschema v1.2.0
go.mozilla.org/sops/v3 v3.6.1
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/api v0.21.3
k8s.io/apiextensions-apiserver v0.21.3
k8s.io/apimachinery v0.19.8
k8s.io/apimachinery v0.21.3
k8s.io/client-go v11.0.0+incompatible
k8s.io/klog v1.0.0
)
Loading

0 comments on commit 5700253

Please sign in to comment.