Skip to content

Commit b49783d

Browse files
Merge pull request #5 from Nordix/mod-mael
✨Update go dependencies to remove BMO and CAPM3
2 parents 382649b + 9d8eac4 commit b49783d

File tree

2 files changed

+78
-65
lines changed

2 files changed

+78
-65
lines changed

go.mod

Lines changed: 18 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -3,79 +3,32 @@ module github.com/metal3-io/ip-address-manager
33
go 1.13
44

55
require (
6-
4d63.com/gochecknoglobals v0.0.0-20190306162314-7c3491d2b6ec // indirect
7-
4d63.com/gochecknoinits v0.0.0-20200108094044-eb73b47b9fc4 // indirect
8-
cloud.google.com/go v0.56.0 // indirect
9-
github.com/alecthomas/gocyclo v0.0.0-20150208221726-aa8f8b160214 // indirect
10-
github.com/alexkohler/nakedret v1.0.0 // indirect
6+
cloud.google.com/go v0.57.0 // indirect
117
github.com/go-logr/logr v0.1.0
12-
github.com/go-openapi/swag v0.19.9 // indirect
138
github.com/golang/mock v1.4.3
14-
github.com/golang/protobuf v1.4.0 // indirect
15-
github.com/google/gofuzz v1.1.0
16-
github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf // indirect
9+
github.com/golang/protobuf v1.4.2 // indirect
10+
github.com/google/go-cmp v0.4.1 // indirect
11+
github.com/hashicorp/golang-lru v0.5.4 // indirect
1712
github.com/imdario/mergo v0.3.9 // indirect
18-
github.com/jgautheron/goconst v0.0.0-20200227150835-cda7ea3bf591 // indirect
19-
github.com/mdempsky/unconvert v0.0.0-20200228143138-95ecdbfc0b5f // indirect
20-
github.com/metal3-io/baremetal-operator v0.0.0-20200424085833-a1dd8aca186d
21-
github.com/metal3-io/cluster-api-provider-metal3 v0.3.1
22-
github.com/mibk/dupl v1.0.0 // indirect
23-
github.com/onsi/ginkgo v1.12.0
24-
github.com/onsi/gomega v1.9.0
25-
github.com/opennota/check v0.0.0-20180911053232-0c771f5545ff // indirect
13+
github.com/opencontainers/go-digest v1.0.0 // indirect
2614
github.com/pkg/errors v0.9.1
27-
github.com/stripe/safesql v0.2.0 // indirect
28-
github.com/tsenart/deadcode v0.0.0-20160724212837-210d2dc333e9 // indirect
29-
github.com/walle/lll v1.0.1 // indirect
30-
golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 // indirect
31-
golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0
32-
golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f // indirect
15+
github.com/prometheus/client_golang v1.6.0 // indirect
16+
github.com/prometheus/common v0.10.0 // indirect
17+
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 // indirect
18+
golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2 // indirect
19+
golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect
3320
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
34-
google.golang.org/appengine v1.6.6 // indirect
35-
gopkg.in/yaml.v2 v2.2.8
21+
gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
22+
gopkg.in/yaml.v2 v2.3.0 // indirect
3623
k8s.io/api v0.19.0-alpha.2
37-
k8s.io/apiextensions-apiserver v0.18.2
24+
k8s.io/apiextensions-apiserver v0.18.3 // indirect
3825
k8s.io/apimachinery v0.19.0-alpha.2
39-
k8s.io/client-go v12.0.0+incompatible
40-
k8s.io/cluster-bootstrap v0.18.2 // indirect
26+
k8s.io/client-go v11.0.0+incompatible
4127
k8s.io/klog v1.0.0
42-
k8s.io/kube-openapi v0.0.0-20200413232311-afe0b5e9f729 // indirect
43-
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66
44-
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
45-
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
46-
mvdan.cc/unparam v0.0.0-20200314162735-0ac8026f7d06 // indirect
47-
sigs.k8s.io/cluster-api v0.3.3
28+
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9 // indirect
29+
k8s.io/utils v0.0.0-20200520001619-278ece378a50
30+
sigs.k8s.io/cluster-api v0.3.6
4831
sigs.k8s.io/controller-runtime v0.6.0
49-
sigs.k8s.io/kind v0.8.0 // indirect
50-
sigs.k8s.io/yaml v1.2.0
5132
)
5233

53-
replace (
54-
k8s.io/api => k8s.io/api v0.19.0-alpha.2
55-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0-alpha.2
56-
k8s.io/apimachinery => k8s.io/apimachinery v0.19.0-alpha.2
57-
k8s.io/apiserver => k8s.io/apiserver v0.19.0-alpha.2
58-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0-alpha.2
59-
k8s.io/client-go => k8s.io/client-go v0.19.0-alpha.2
60-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.0-alpha.2
61-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0-alpha.2
62-
k8s.io/code-generator => k8s.io/code-generator v0.19.0-alpha.2
63-
k8s.io/component-base => k8s.io/component-base v0.19.0-alpha.2
64-
k8s.io/cri-api => k8s.io/cri-api v0.19.0-alpha.2
65-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.0-alpha.2
66-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.0-alpha.2
67-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0-alpha.2
68-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0-alpha.2
69-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0-alpha.2
70-
k8s.io/kubectl => k8s.io/kubectl v0.19.0-alpha.2
71-
k8s.io/kubelet => k8s.io/kubelet v0.19.0-alpha.2
72-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.0-alpha.2
73-
k8s.io/metrics => k8s.io/metrics v0.19.0-alpha.2
74-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0-alpha.2
75-
) // Required by BMO
76-
77-
replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by BMO
78-
79-
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20190924102528-32369d4db2ad // Required by BMO until https://github.com/operator-framework/operator-lifecycle-manager/pull/1241 is resolved
80-
81-
//replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.0 // Issue with go-client version
34+
replace k8s.io/client-go => k8s.io/client-go v0.19.0-alpha.2

0 commit comments

Comments
 (0)