Merge pull request #144 from rdoxenham/rdo-capbm-4.7

Bug 1936844: [release-4.7] Changing the default behaviour of the CAPBM to request hard reboot

Makefile

@@ -14,7 +14,7 @@ all: test manager
 test: generate fmt vet unit
 
 .PHONY: unit
-unit: manifests unit-test
+unit: unit-test
 
 .PHONY: unit-test
 unit-test:
@@ -27,17 +27,10 @@ run: generate fmt vet
 
 # Install CRDs into a cluster
 .PHONY: install
-install: manifests
+install:
 	kubectl apply -f vendor/github.com/openshift/machine-api-operator/install
-	kubectl apply -f config/crds
 	kustomize build config | kubectl apply -f -
 
-# Generate manifests e.g. CRD, RBAC etc.
-.PHONY: manifests
-manifests:
-	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go crd paths=./pkg/apis/... output:crd:dir=./config/crds/
-	@sed -i '/^    controller-gen.kubebuilder.io\/version: (devel)/d' config/crds/*
-
 # Run go fmt against code
 .PHONY: fmt
 fmt:

cmd/manager/main.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"time"
 
-	bmoapis "github.com/metal3-io/baremetal-operator/pkg/apis"
+	bmoapis "github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1"
 	"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"

go.mod

@@ -14,12 +14,12 @@ require (
 	k8s.io/client-go v12.0.0+incompatible
 	k8s.io/klog/v2 v2.4.0
 	sigs.k8s.io/controller-runtime v0.7.0
-	sigs.k8s.io/controller-tools v0.3.0
+	sigs.k8s.io/controller-tools v0.4.1
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace (
-	github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20200715132148-0f91f62a41fe // Use OpenShift fork
+	github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20210303141721-86a42dcb0150 // Use OpenShift fork
 	k8s.io/client-go => k8s.io/client-go v0.20.0
 	sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20201125052318-b85a18cbf338
 	sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20201130182513-88b90230f2a4