Skip to content

Commit

Permalink
Vendor cluster-api to update InvalidConfigurationMachineError
Browse files Browse the repository at this point in the history
This commit updates cluster-api to ensure that invalid machines
can be deleted.  We already raise InvalidConfigurationMachineError
in the appropriate place for appropriate conditions, this
updates the machine-controller portion.
  • Loading branch information
michaelgugino committed Aug 29, 2019
1 parent 1a25c53 commit 7148c8d
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 6 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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-20190820083002-b2bf995e2bba
github.com/openshift/cluster-api v0.0.0-20190829140302-072f7d777dc8
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/machine-api-operator v0.0.0-20190312153711-9650e16c9880 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ 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-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 v0.0.0-20190829140302-072f7d777dc8 h1:L3tal3e86m4sx7BHr4m2xO4MA43clI52GBLurB/Vdl8=
github.com/openshift/cluster-api v0.0.0-20190829140302-072f7d777dc8/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=
Expand Down

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

2 changes: 1 addition & 1 deletion vendor/modules.txt
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-20190820083002-b2bf995e2bba
# github.com/openshift/cluster-api v0.0.0-20190829140302-072f7d777dc8
github.com/openshift/cluster-api/cmd/manager
github.com/openshift/cluster-api/pkg/apis/machine/v1beta1
github.com/openshift/cluster-api/pkg/apis
Expand Down

0 comments on commit 7148c8d

Please sign in to comment.