Merge pull request #150 from ingvagabund/revendor-cluster-api

Revendor latest openshift/cluster-api
openshift · Apr 29, 2019 · 1ee6540 · 1ee6540
2 parents ba0dc75 + d3783b4
commit 1ee6540
Show file tree

Hide file tree

Showing 69 changed files with 1,582 additions and 1,815 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/cloud/libvirt/actuators/machine/actuator_test.go b/pkg/cloud/libvirt/actuators/machine/actuator_test.go
@@ -43,7 +43,6 @@ func TestMachineEvents(t *testing.T) {
 
 	machineInvalidProviderConfig := machine.DeepCopy()
 	machineInvalidProviderConfig.Spec.ProviderSpec.Value = nil
-	machineInvalidProviderConfig.Spec.ProviderSpec.ValueFrom = nil
 
 	cases := []struct {
 		name               string

diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/Gopkg.lock b/vendor/github.com/openshift/cluster-api-actuator-pkg/Gopkg.lock
diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/Gopkg.toml b/vendor/github.com/openshift/cluster-api-actuator-pkg/Gopkg.toml
diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/Makefile b/vendor/github.com/openshift/cluster-api-actuator-pkg/Makefile
diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/hack/ci-integration.sh b/vendor/github.com/openshift/cluster-api-actuator-pkg/hack/ci-integration.sh