Skip to content

Commit

Permalink
Merge pull request #23 from arangodb-managed/zutano-fix
Browse files Browse the repository at this point in the history
OAS-1361 | Fixing zutano fetching
  • Loading branch information
ewoutp authored Aug 21, 2020
2 parents 313426f + 133b26f commit 820fea7
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 71 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ test-acc:
TF_ACC=1 go test -v ./...

bootstrap:
go get github.com/arangodb-managed/zutano
GOSUMDB=off GOPROXY=direct GO111MODULE=on go get github.com/arangodb-managed/zutano
go get github.com/mitchellh/gox
go get github.com/jstemmer/go-junit-report
go get github.com/hashicorp/terraform-plugin-sdk/plugin
Expand Down
58 changes: 31 additions & 27 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
module github.com/arangodb-managed/terraform-provider-oasis

require (
github.com/arangodb-managed/apis v0.41.2
github.com/arangodb-managed/apis v0.45.2
github.com/arangodb-managed/log-helper v0.1.4
github.com/gogo/protobuf v1.3.0
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/terraform-plugin-sdk v1.4.1
github.com/rs/zerolog v1.17.2
github.com/stretchr/testify v1.4.0
google.golang.org/grpc v1.27.1
google.golang.org/grpc v1.29.1
)

go 1.13

replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.0+incompatible
replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.0.1+incompatible

replace github.com/arangodb/kube-arangodb => github.com/arangodb/kube-arangodb v0.0.0-20200325103723-b449baf82554
replace github.com/arangodb/kube-arangodb => github.com/arangodb/kube-arangodb v0.0.0-20200525105428-e506978cb648

replace github.com/coreos/go-systemd => github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a

Expand Down Expand Up @@ -43,31 +43,31 @@ replace golang.org/x/sys => golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e

replace google.golang.org/api => google.golang.org/api v0.7.0

replace google.golang.org/grpc => google.golang.org/grpc v1.21.1
replace google.golang.org/grpc => google.golang.org/grpc v1.29.1

replace k8s.io/api => k8s.io/api v0.15.11
replace k8s.io/api => k8s.io/api v0.16.9

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.15.11
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.16.9

replace k8s.io/apimachinery => k8s.io/apimachinery v0.15.11
replace k8s.io/apimachinery => k8s.io/apimachinery v0.16.9

replace k8s.io/apiserver => k8s.io/apiserver v0.15.11
replace k8s.io/apiserver => k8s.io/apiserver v0.16.9

replace k8s.io/client-go => k8s.io/client-go v0.15.11
replace k8s.io/client-go => k8s.io/client-go v0.16.9

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.15.11
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.16.9

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.15.11
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.16.9

replace k8s.io/code-generator => k8s.io/code-generator v0.15.11
replace k8s.io/code-generator => k8s.io/code-generator v0.16.9

replace k8s.io/component-base => k8s.io/component-base v0.15.11
replace k8s.io/component-base => k8s.io/component-base v0.16.9

replace k8s.io/kubernetes => k8s.io/kubernetes v1.15.11
replace k8s.io/kubernetes => k8s.io/kubernetes v1.16.9

replace k8s.io/metrics => k8s.io/metrics v0.15.11
replace k8s.io/metrics => k8s.io/metrics v0.16.9

replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.2.0-beta.2
replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.4.0

replace sourcegraph.com/sourcegraph/go-diff => github.com/sourcegraph/go-diff v0.5.0

Expand All @@ -77,22 +77,26 @@ replace github.com/cilium/cilium => github.com/cilium/cilium v1.7.2

replace github.com/optiopay/kafka => github.com/optiopay/kafka v2.0.4+incompatible

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.15.11
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.16.9

replace k8s.io/cri-api => k8s.io/cri-api v0.15.11
replace k8s.io/cri-api => k8s.io/cri-api v0.16.9

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.15.11
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.16.9

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.15.11
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.16.9

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.15.11
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.16.9

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.15.11
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.16.9

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.15.11
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.16.9

replace k8s.io/kubelet => k8s.io/kubelet v0.15.11
replace k8s.io/kubelet => k8s.io/kubelet v0.16.9

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.15.11
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.16.9

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.15.11
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.16.9

replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20191206224255-0243a4be9c8f

replace k8s.io/kubectl => k8s.io/kubectl v0.16.9
Loading

0 comments on commit 820fea7

Please sign in to comment.