Skip to content

Commit

Permalink
Bump cluster-api
Browse files Browse the repository at this point in the history
  • Loading branch information
@spangenberg
spangenberg committed Aug 26, 2019
1 parent 9f6d377 commit 9cd6298
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 13 deletions.
3 changes: 1 addition & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ require (
github.com/hashicorp/golang-lru v0.5.0 // indirect
github.com/onsi/ginkgo v1.8.0
github.com/onsi/gomega v1.5.0
github.com/openshift/cluster-api v0.0.0-20190805113604-f8de78af80fc
github.com/openshift/cluster-api v0.0.0-20190820083002-b2bf995e2bba
github.com/openshift/cluster-api-actuator-pkg v0.0.0-20190527090340-7628df78fb4c
github.com/openshift/cluster-autoscaler-operator v0.0.0-20190521201101-62768a6ba480 // indirect
github.com/openshift/kubernetes-drain v0.0.0-20190712013109-4b061affbd00 // indirect
github.com/openshift/machine-api-operator v0.0.0-20190312153711-9650e16c9880 // indirect
github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 // indirect
github.com/prometheus/client_golang v0.9.2 // indirect
Expand Down
6 changes: 2 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,12 @@ github.com/onsi/gomega v1.4.2 h1:3mYCb7aPxS/RU7TI1y4rkEn1oKmPRjNJLNEXgw7MH2I=
github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/openshift/cluster-api v0.0.0-20190805113604-f8de78af80fc h1:6Nf3TaiooyEZNk+3ZHonNOujT+HacuSj9cxyeGTc/zg=
github.com/openshift/cluster-api v0.0.0-20190805113604-f8de78af80fc/go.mod h1:mNsD1dsD4T57kV4/C6zTHke/Ro166xgnyyRZqkamiEU=
github.com/openshift/cluster-api v0.0.0-20190820083002-b2bf995e2bba h1:4krj3ro7WpAdWiebb6PrAbG42/mnPWUyynYVVuriEpg=
github.com/openshift/cluster-api v0.0.0-20190820083002-b2bf995e2bba/go.mod h1:mNsD1dsD4T57kV4/C6zTHke/Ro166xgnyyRZqkamiEU=
github.com/openshift/cluster-api-actuator-pkg v0.0.0-20190527090340-7628df78fb4c h1:tXfKL0ifKs+3DZCBVkXQXcW9qRYuSm7LWCGGXkRreMk=
github.com/openshift/cluster-api-actuator-pkg v0.0.0-20190527090340-7628df78fb4c/go.mod h1:KNPaA64x3Ok7z538kvS2acwC5fEwvPfF0RdTx2geQEE=
github.com/openshift/cluster-autoscaler-operator v0.0.0-20190521201101-62768a6ba480 h1:iIrMvq8qRMfmuhw/TVB4usRN/BlH2huBKgtrRjucOU4=
github.com/openshift/cluster-autoscaler-operator v0.0.0-20190521201101-62768a6ba480/go.mod h1:/XmV44Fh28Vo3Ye93qFrxAbcFJ/Uy+7LPD+jGjmfJYc=
github.com/openshift/kubernetes-drain v0.0.0-20190712013109-4b061affbd00 h1:GQZfSYxP4n8eizZV+Pf0R6LSPGLwHUcH4W7xc8+xni8=
github.com/openshift/kubernetes-drain v0.0.0-20190712013109-4b061affbd00/go.mod h1:Qjq5nGWuMWEjosMJNDhpFQuhJLdmNB2yRFeHTb9cgAU=
github.com/openshift/machine-api-operator v0.0.0-20190312153711-9650e16c9880 h1:2LnH3rWJp4PbMyIocA7nyPawWAr4MxzuZsNhK9cDwjk=
github.com/openshift/machine-api-operator v0.0.0-20190312153711-9650e16c9880/go.mod h1:7HeAh0v04zQn1L+4ItUjvpBQYsm2Nf81WaZLiXTcnkc=
github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
Expand Down
5 changes: 3 additions & 2 deletions hack/e2e.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
set -euo pipefail

unset GOFLAGS
tmp="$(mktemp -d)"

git clone "https://github.com/openshift/cluster-api-actuator-pkg.git" cluster-api-actuator-pkg
git clone "https://github.com/openshift/cluster-api-actuator-pkg.git" "$tmp"

exec make -C cluster-api-actuator-pkg test-e2e
exec make -C "$tmp" test-e2e
3 changes: 1 addition & 2 deletions pkg/client/mock/client_generated.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ github.com/onsi/gomega/matchers/support/goraph/bipartitegraph
github.com/onsi/gomega/matchers/support/goraph/edge
github.com/onsi/gomega/matchers/support/goraph/node
github.com/onsi/gomega/matchers/support/goraph/util
# github.com/openshift/cluster-api v0.0.0-20190805113604-f8de78af80fc
# github.com/openshift/cluster-api v0.0.0-20190820083002-b2bf995e2bba
github.com/openshift/cluster-api/cmd/manager
github.com/openshift/cluster-api/pkg/apis/machine/v1beta1
github.com/openshift/cluster-api/pkg/apis
Expand All @@ -177,6 +177,7 @@ github.com/openshift/cluster-api/pkg/controller/error
github.com/openshift/cluster-api/pkg/errors
github.com/openshift/cluster-api/pkg/controller
github.com/openshift/cluster-api/pkg/apis/machine/common
github.com/openshift/cluster-api/pkg/drain
github.com/openshift/cluster-api/pkg/util
github.com/openshift/cluster-api/pkg/apis/cluster/common
github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset
Expand All @@ -193,8 +194,6 @@ github.com/openshift/cluster-api-actuator-pkg/pkg/manifests
# github.com/openshift/cluster-autoscaler-operator v0.0.0-20190521201101-62768a6ba480
github.com/openshift/cluster-autoscaler-operator/pkg/apis/autoscaling/v1
github.com/openshift/cluster-autoscaler-operator/pkg/apis/autoscaling/v1beta1
# github.com/openshift/kubernetes-drain v0.0.0-20190712013109-4b061affbd00
github.com/openshift/kubernetes-drain
# github.com/openshift/machine-api-operator v0.0.0-20190312153711-9650e16c9880
github.com/openshift/machine-api-operator/pkg/apis/healthchecking/v1alpha1
github.com/openshift/machine-api-operator/pkg/generated/clientset/versioned
Expand Down

0 comments on commit 9cd6298

Please sign in to comment.