Skip to content

Commit

Permalink
Merge pull request #8 from open-cluster-management/merge_locutus_fix
Browse files Browse the repository at this point in the history
Merge locutus fix
  • Loading branch information
clyang82 authored Nov 24, 2020
2 parents 5f7f07b + ebc0f7a commit 378753d
Show file tree
Hide file tree
Showing 3 changed files with 406 additions and 357 deletions.
25 changes: 20 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,28 @@ module github.com/open-cluster-management/observatorium-operator
go 1.14

require (
github.com/brancz/locutus v0.0.0-20200430073700-65b7640ed9bc
github.com/brancz/locutus v0.0.0-20201009124404-2b6852bd3b57
github.com/go-logr/logr v0.2.1 // indirect
github.com/google/go-cmp v0.5.2 // indirect
github.com/google/go-jsonnet v0.16.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/googleapis/gnostic v0.5.1 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/jsonnet-bundler/jsonnet-bundler v0.4.0
github.com/observatorium/observatorium v0.1.1
github.com/stretchr/testify v1.5.1 // indirect
google.golang.org/appengine v1.6.1 // indirect
k8s.io/api v0.18.0
k8s.io/apimachinery v0.18.2
github.com/prometheus/common v0.14.0 // indirect
github.com/prometheus/procfs v0.2.0 // indirect
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect
golang.org/x/net v0.0.0-20200927032502-5d4f70055728 // indirect
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 // indirect
golang.org/x/sys v0.0.0-20200926100807-9d91bd62050c // indirect
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
k8s.io/api v0.19.2
k8s.io/apimachinery v0.19.2
k8s.io/klog/v2 v2.3.0 // indirect
k8s.io/utils v0.0.0-20200912215256-4140de9c8800 // indirect
sigs.k8s.io/controller-runtime v0.5.0
sigs.k8s.io/controller-tools v0.2.8
)
Loading

0 comments on commit 378753d

Please sign in to comment.