Merge pull request kubernetes-sigs#203 from ingvagabund/sync-cluster-api

Sync with the latest openshift/cluster-api
enxebre · Apr 23, 2019 · 8f3ed44 · 8f3ed44
2 parents 91747f6 + 9954273
commit 8f3ed44
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 10 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/manifests/manifests.go b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/manifests/manifests.go
diff --git a/vendor/github.com/openshift/cluster-api/pkg/apis/machine/v1beta1/machine_types.go b/vendor/github.com/openshift/cluster-api/pkg/apis/machine/v1beta1/machine_types.go
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