UPSTREAM: <carry>: openshift: Revendor to bring openshift/cluster-api#72

enxebre · Sep 17, 2019 · f14d88b · f14d88b
1 parent d91a793
commit f14d88b
Show file tree

Hide file tree

Showing 42 changed files with 174 additions and 10,651 deletions.
diff --git a/go.mod b/go.mod
@@ -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-20190829140302-072f7d777dc8
+	github.com/openshift/cluster-api v0.0.0-20190917100308-655e2d6ccdd5
 	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

diff --git a/go.sum b/go.sum
@@ -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-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 v0.0.0-20190917100308-655e2d6ccdd5 h1:r1srojcJfutWWqI++8p7j4xRX0n4e88nCBOqkIdYsa0=
+github.com/openshift/cluster-api v0.0.0-20190917100308-655e2d6ccdd5/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=

diff --git a/vendor/github.com/openshift/cluster-api/pkg/controller/machine/controller.go b/vendor/github.com/openshift/cluster-api/pkg/controller/machine/controller.go