stop generating CRDs for provider spec and status

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:

hack/generate.sh

@@ -12,8 +12,8 @@ eval "$(go env)"
 cd "${GOPATH}"/src/github.com/openshift/cluster-api-provider-baremetal
 export XDG_CACHE_HOME="/tmp/.cache"
 
-INPUT_FILES="config/crds/*.yaml pkg/apis/baremetal/v1alpha1//zz_generated.*.go"
+INPUT_FILES="pkg/apis/baremetal/v1alpha1//zz_generated.*.go"
 cksum $INPUT_FILES > "$ARTIFACTS/lint.cksums.before"
-make manifests generate
+make generate
 cksum $INPUT_FILES > "$ARTIFACTS/lint.cksums.after"
 diff "$ARTIFACTS/lint.cksums.before" "$ARTIFACTS/lint.cksums.after"

pkg/apis/baremetal/v1alpha1/baremetalmachineproviderspec_types.go

@@ -29,7 +29,6 @@ import (
 
 // BareMetalMachineProviderSpec holds data that the actuator needs to provision
 // and manage a Machine.
-// +k8s:openapi-gen=true
 type BareMetalMachineProviderSpec struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

pkg/apis/baremetal/v1alpha1/baremetalmachineproviderspec_types_test.go

@@ -19,11 +19,7 @@ package v1alpha1
 import (
 	"testing"
 
-	"github.com/onsi/gomega"
-	"golang.org/x/net/context"
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
 )
 
 func TestProviderSpecIsValid(t *testing.T) {
@@ -160,39 +156,3 @@ func TestProviderSpecIsValid(t *testing.T) {
 		}
 	}
 }
-
-func TestStorageBareMetalMachineProviderSpec(t *testing.T) {
-	key := types.NamespacedName{
-		Name:      "foo",
-		Namespace: "default",
-	}
-	created := &BareMetalMachineProviderSpec{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "foo",
-			Namespace: "default",
-		},
-		UserData: &corev1.SecretReference{
-			Name: "foo",
-		},
-	}
-	g := gomega.NewGomegaWithT(t)
-
-	// Test Create
-	fetched := &BareMetalMachineProviderSpec{}
-	g.Expect(c.Create(context.TODO(), created)).NotTo(gomega.HaveOccurred())
-
-	g.Expect(c.Get(context.TODO(), key, fetched)).NotTo(gomega.HaveOccurred())
-	g.Expect(fetched).To(gomega.Equal(created))
-
-	// Test Updating the Labels
-	updated := fetched.DeepCopy()
-	updated.Labels = map[string]string{"hello": "world"}
-	g.Expect(c.Update(context.TODO(), updated)).NotTo(gomega.HaveOccurred())
-
-	g.Expect(c.Get(context.TODO(), key, fetched)).NotTo(gomega.HaveOccurred())
-	g.Expect(fetched).To(gomega.Equal(updated))
-
-	// Test Delete
-	g.Expect(c.Delete(context.TODO(), fetched)).NotTo(gomega.HaveOccurred())
-	g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.HaveOccurred())
-}

pkg/apis/baremetal/v1alpha1/baremetalmachineproviderstatus_types.go

@@ -24,7 +24,6 @@ import (
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // BareMetalMachineProviderStatus is the Schema for the baremetalmachineproviderstatuses API
-// +k8s:openapi-gen=true
 type BareMetalMachineProviderStatus struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`