Merge pull request kubernetes-sigs#276 from enxebre/revendor-mao

Drop openshift/cluster-api in favour of machine-api-operator

Makefile

@@ -66,7 +66,7 @@ build: ## build binaries
 	$(DOCKER_CMD) go build $(GOGCFLAGS) -o "bin/machine-controller-manager" \
                -ldflags "$(LD_FLAGS)" "$(REPO_PATH)/cmd/manager"
 	$(DOCKER_CMD) go build $(GOGCFLAGS) -o bin/manager -ldflags '-extldflags "-static"' \
-               "$(REPO_PATH)/vendor/github.com/openshift/cluster-api/cmd/manager"
+               "$(REPO_PATH)/vendor/github.com/openshift/machine-api-operator/cmd/machineset"
 
 
 aws-actuator:

cmd/aws-actuator/main.go

@@ -32,7 +32,7 @@ import (
 
 	"k8s.io/client-go/kubernetes/scheme"
 
-	machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
+	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
 )
 
 const (
@@ -106,7 +106,7 @@ func createCommand() *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("unable to create actuator: %v", err)
 			}
-			result, err := actuator.CreateMachine(nil, machine)
+			result, err := actuator.CreateMachine(machine)
 			if err != nil {
 				return fmt.Errorf("unable to create machine: %v", err)
 			}
@@ -144,7 +144,7 @@ func deleteCommand() *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("unable to create actuator: %v", err)
 			}
-			if err = actuator.DeleteMachine(nil, machine); err != nil {
+			if err = actuator.DeleteMachine(machine); err != nil {
 				return fmt.Errorf("unable to delete machine: %v", err)
 			}
 
@@ -178,7 +178,7 @@ func existsCommand() *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("unable to create actuator: %v", err)
 			}
-			exists, err := actuator.Exists(context.TODO(), nil, machine)
+			exists, err := actuator.Exists(context.TODO(), machine)
 			if err != nil {
 				return fmt.Errorf("unable to check if machine exists: %v", err)
 			}

cmd/aws-actuator/utils.go

@@ -14,7 +14,7 @@ import (
 	"k8s.io/client-go/tools/record"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
-	machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
+	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
 	machineactuator "sigs.k8s.io/cluster-api-provider-aws/pkg/actuators/machine"
 	"sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1"
 	awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/client"

cmd/manager/main.go

@@ -20,8 +20,8 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	clusterapis "github.com/openshift/cluster-api/pkg/apis"
-	"github.com/openshift/cluster-api/pkg/controller/machine"
+	mapiv1beta1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
+	"github.com/openshift/machine-api-operator/pkg/controller/machine"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	"k8s.io/klog"
 	machineactuator "sigs.k8s.io/cluster-api-provider-aws/pkg/actuators/machine"
@@ -79,7 +79,7 @@ func main() {
 	}
 
 	// Setup Scheme for all resources
-	if err := clusterapis.AddToScheme(mgr.GetScheme()); err != nil {
+	if err := mapiv1beta1.AddToScheme(mgr.GetScheme()); err != nil {
 		glog.Fatalf("Error setting up scheme: %v", err)
 	}
 

go.mod

@@ -5,28 +5,44 @@ go 1.12
 require (
 	github.com/aws/aws-sdk-go v1.15.66
 	github.com/blang/semver v3.5.1+incompatible
+	github.com/coreos/etcd v3.3.15+incompatible // indirect
+	github.com/coreos/go-oidc v2.1.0+incompatible // indirect
+	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/ghodss/yaml v1.0.0
-	github.com/go-log/log v0.0.0-20181211034820-a514cf01a3eb // indirect
+	github.com/go-openapi/validate v0.19.2 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect
 	github.com/golang/mock v1.2.0
+	github.com/gorilla/websocket v1.4.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
+	github.com/jonboulle/clockwork v0.1.0 // indirect
 
 	// kube 1.16
-	github.com/openshift/cluster-api v0.0.0-20191004145247-2f02e328bd96
-	github.com/openshift/cluster-api-actuator-pkg v0.0.0-20190527090340-7628df78fb4c
-	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
-	github.com/prometheus/procfs v0.0.0-20190209105433-f8d8b3f739bd // indirect
+	github.com/openshift/machine-api-operator v0.2.1-0.20191128180243-986b771e661d
+	github.com/sirupsen/logrus v1.4.2 // indirect
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.3
 	github.com/stretchr/testify v1.3.0
 	golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
-	k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
+	google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 // indirect
+	google.golang.org/grpc v1.23.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
+	gopkg.in/square/go-jose.v2 v2.2.2 // indirect
+	k8s.io/api v0.0.0-20191003000013-35e20aa79eb8
 	k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
-	k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
+	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
 	k8s.io/klog v0.4.0
-	sigs.k8s.io/controller-runtime v0.2.0-beta.1.0.20190918234459-801e12a50160
+	k8s.io/utils v0.0.0-20190923111123-69764acb6e8e
+	sigs.k8s.io/controller-runtime v0.3.1-0.20191016212439-2df793d02076
 	sigs.k8s.io/controller-tools v0.2.2-0.20190930215132-4752ed2de7d2
+	sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca // indirect
 
 )
 
-replace sigs.k8s.io/controller-runtime => github.com/enxebre/controller-runtime v0.2.0-beta.1.0.20190930160522-58015f7fc885
+replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.4.0
+
+// kubernetes-1.16.1
+replace k8s.io/api => k8s.io/api v0.0.0-20191003000013-35e20aa79eb8
+
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
+
+replace k8s.io/client-go => k8s.io/client-go v0.0.0-20191003000419-f68efa97b39e