Merge pull request #60 from dhellmann/divorce-fork

complete forking of openshift version from metal3 verison

Dockerfile

@@ -1,5 +1,5 @@
 FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
-WORKDIR /go/src/github.com/metal3-io/cluster-api-provider-baremetal
+WORKDIR /go/src/github.com/openshift/cluster-api-provider-baremetal
 COPY . .
 RUN go build -o machine-controller-manager ./cmd/manager
 RUN go build -o manager ./vendor/github.com/openshift/cluster-api/cmd/manager
@@ -11,5 +11,5 @@ FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
 #    yum install -y $INSTALL_PKGS && \
 #    rpm -V $INSTALL_PKGS && \
 #    yum clean all
-COPY --from=builder /go/src/github.com/metal3-io/cluster-api-provider-baremetal/manager /
-COPY --from=builder /go/src/github.com/metal3-io/cluster-api-provider-baremetal/machine-controller-manager /
+COPY --from=builder /go/src/github.com/openshift/cluster-api-provider-baremetal/manager /
+COPY --from=builder /go/src/github.com/openshift/cluster-api-provider-baremetal/machine-controller-manager /

Makefile

@@ -18,7 +18,7 @@ unit: manifests
 
 # Build manager binary
 manager: generate fmt vet
-	go build -o bin/manager github.com/metal3-io/cluster-api-provider-baremetal/cmd/manager
+	go build -o bin/manager github.com/openshift/cluster-api-provider-baremetal/cmd/manager
 
 # Run against the configured Kubernetes cluster in ~/.kube/config
 run: generate fmt vet

PROJECT

@@ -1,3 +1,3 @@
 version: "1"
 domain: cluster.k8s.io
-repo: github.com/metal3-io/cluster-api-provider-baremetal
+repo: github.com/openshift/cluster-api-provider-baremetal

cmd/manager/main.go

@@ -23,10 +23,10 @@ import (
 	"time"
 
 	bmoapis "github.com/metal3-io/baremetal-operator/pkg/apis"
-	"github.com/metal3-io/cluster-api-provider-baremetal/pkg/apis"
-	"github.com/metal3-io/cluster-api-provider-baremetal/pkg/cloud/baremetal/actuators/machine"
-	"github.com/metal3-io/cluster-api-provider-baremetal/pkg/controller"
-	"github.com/metal3-io/cluster-api-provider-baremetal/pkg/manager/wrapper"
+	"github.com/openshift/cluster-api-provider-baremetal/pkg/apis"
+	"github.com/openshift/cluster-api-provider-baremetal/pkg/cloud/baremetal/actuators/machine"
+	"github.com/openshift/cluster-api-provider-baremetal/pkg/controller"
+	"github.com/openshift/cluster-api-provider-baremetal/pkg/manager/wrapper"
 	clusterapis "github.com/openshift/cluster-api/pkg/apis"
 	capimachine "github.com/openshift/cluster-api/pkg/controller/machine"
 	"k8s.io/apimachinery/pkg/runtime/schema"

config/default/manager_image_patch.yaml

@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-      - image: quay.io/metal3-io/cluster-api-provider-baremetal:master
+      - image: quay.io/openshift/cluster-api-provider-baremetal:master
         name: manager

pkg/apis/addtoscheme_baremetal_v1alpha1.go

@@ -17,7 +17,7 @@ limitations under the License.
 package apis
 
 import (
-	"github.com/metal3-io/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1"
+	"github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1"
 )
 
 func init() {

pkg/apis/baremetal/v1alpha1/doc.go

@@ -17,7 +17,7 @@ limitations under the License.
 // Package v1alpha1 contains API Schema definitions for the baremetal v1alpha1 API group
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=github.com/metal3-io/cluster-api-provider-baremetal/pkg/apis/baremetal
+// +k8s:conversion-gen=github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=baremetal.cluster.k8s.io
 package v1alpha1

pkg/apis/baremetal/v1alpha1/register.go

@@ -19,7 +19,7 @@ limitations under the License.
 // Package v1alpha1 contains API Schema definitions for the baremetal v1alpha1 API group
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=github.com/metal3-io/cluster-api-provider-baremetal/pkg/apis/baremetal
+// +k8s:conversion-gen=github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=baremetal.cluster.k8s.io
 package v1alpha1

pkg/cloud/baremetal/actuators/machine/actuator.go

@@ -26,7 +26,7 @@ import (
 
 	bmh "github.com/metal3-io/baremetal-operator/pkg/apis/metal3/v1alpha1"
 	"github.com/metal3-io/baremetal-operator/pkg/utils"
-	bmv1alpha1 "github.com/metal3-io/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1"
+	bmv1alpha1 "github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1"
 	clusterv1 "github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1"
 	"github.com/openshift/cluster-api/pkg/apis/machine/common"
 	machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"

pkg/cloud/baremetal/actuators/machine/actuator_test.go

@@ -7,7 +7,7 @@ import (
 
 	bmoapis "github.com/metal3-io/baremetal-operator/pkg/apis"
 	bmh "github.com/metal3-io/baremetal-operator/pkg/apis/metal3/v1alpha1"
-	bmv1alpha1 "github.com/metal3-io/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1"
+	bmv1alpha1 "github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1"
 	clusterapis "github.com/openshift/cluster-api/pkg/apis"
 	machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	clustererror "github.com/openshift/cluster-api/pkg/controller/error"

pkg/controller/add_machineset.go

@@ -17,7 +17,7 @@ limitations under the License.
 package controller
 
 import (
-	"github.com/metal3-io/cluster-api-provider-baremetal/pkg/controller/machineset"
+	"github.com/openshift/cluster-api-provider-baremetal/pkg/controller/machineset"
 )
 
 func init() {

pkg/controller/machineset/machineset_controller.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 
 	bmh "github.com/metal3-io/baremetal-operator/pkg/apis/metal3/v1alpha1"
-	actuator "github.com/metal3-io/cluster-api-provider-baremetal/pkg/cloud/baremetal/actuators/machine"
+	actuator "github.com/openshift/cluster-api-provider-baremetal/pkg/cloud/baremetal/actuators/machine"
 	machinev1beta1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/controller/machineset/machineset_controller_test.go

@@ -22,7 +22,7 @@ import (
 
 	bmoapis "github.com/metal3-io/baremetal-operator/pkg/apis"
 	bmh "github.com/metal3-io/baremetal-operator/pkg/apis/metal3/v1alpha1"
-	bmv1alpha1 "github.com/metal3-io/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1"
+	bmv1alpha1 "github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1"
 	machinev1beta1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	"golang.org/x/net/context"
 	v1 "k8s.io/api/core/v1"

pkg/controller/machineset/mapper.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	bmh "github.com/metal3-io/baremetal-operator/pkg/apis/metal3/v1alpha1"
-	actuator "github.com/metal3-io/cluster-api-provider-baremetal/pkg/cloud/baremetal/actuators/machine"
+	actuator "github.com/openshift/cluster-api-provider-baremetal/pkg/cloud/baremetal/actuators/machine"
 	machinev1beta1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"

pkg/controller/machineset/mapper_test.go

@@ -22,7 +22,7 @@ import (
 
 	bmoapis "github.com/metal3-io/baremetal-operator/pkg/apis"
 	bmh "github.com/metal3-io/baremetal-operator/pkg/apis/metal3/v1alpha1"
-	bmv1alpha1 "github.com/metal3-io/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1"
+	bmv1alpha1 "github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1"
 	machinev1beta1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"