Merge pull request #67 from enxebre/revendor

Bug 1752088: UPSTREAM: <carry>: openshift: Revendor to bring openshift/cluster-api#72
openshift · Sep 17, 2019 · 15af0c0 · 15af0c0
2 parents 0032e55 + 932e0f2
commit 15af0c0
Show file tree

Hide file tree

Showing 19 changed files with 860 additions and 86 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/vendor/github.com/openshift/cluster-api/Gopkg.lock b/vendor/github.com/openshift/cluster-api/Gopkg.lock
diff --git a/vendor/github.com/openshift/cluster-api/Gopkg.toml b/vendor/github.com/openshift/cluster-api/Gopkg.toml
diff --git a/vendor/github.com/openshift/cluster-api/Makefile b/vendor/github.com/openshift/cluster-api/Makefile
diff --git a/vendor/github.com/openshift/cluster-api/config/crds/machine_v1beta1_machine.yaml b/vendor/github.com/openshift/cluster-api/config/crds/machine_v1beta1_machine.yaml
diff --git a/vendor/github.com/openshift/cluster-api/config/crds/machine_v1beta1_machineset.yaml b/vendor/github.com/openshift/cluster-api/config/crds/machine_v1beta1_machineset.yaml
diff --git a/vendor/github.com/openshift/cluster-api/hack/goimports.sh b/vendor/github.com/openshift/cluster-api/hack/goimports.sh
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/apis/machine/v1beta1/machineset_types.go b/vendor/github.com/openshift/cluster-api/pkg/apis/machine/v1beta1/machineset_types.go
diff --git a/vendor/github.com/openshift/cluster-api/pkg/controller/BUILD.bazel b/vendor/github.com/openshift/cluster-api/pkg/controller/BUILD.bazel
diff --git a/vendor/github.com/openshift/cluster-api/pkg/controller/add_node.go b/vendor/github.com/openshift/cluster-api/pkg/controller/add_node.go