Merge pull request #38 from fluxcd/api-kg

Make the api package a dedicated module

Author: stefanprodan

Dockerfile

@@ -2,6 +2,9 @@ FROM golang:1.14-alpine as builder
 
 WORKDIR /workspace
 
+# copy api submodule
+COPY api/ api/
+
 # copy modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
@@ -11,7 +14,6 @@ RUN go mod download
 
 # copy source code
 COPY main.go main.go
-COPY api/ api/
 COPY controllers/ controllers/
 COPY internal/ internal/
 

Makefile

@@ -14,7 +14,7 @@ all: manager
 
 # Run tests
 test: generate fmt vet manifests api-docs
-	go test ./... -coverprofile cover.out
+	find . -maxdepth 2 -type f -name 'go.mod' -execdir go test ./... -coverprofile cover.out \;
 
 # Build manager binary
 manager: generate fmt vet
@@ -53,19 +53,20 @@ dev-cleanup: manifests
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role paths="./..." output:crd:artifacts:config="config/crd/bases"
+	cd api; $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role paths="./..." output:crd:artifacts:config="../config/crd/bases"
 
 # Generate API reference documentation
 api-docs: gen-crd-api-reference-docs
 	$(API_REF_GEN) -api-dir=./api/v1alpha1 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/notification.md
 
 # Run go fmt against code
 fmt:
-	go fmt ./...
+	find . -maxdepth 2 -type f -name 'go.mod' -execdir go fmt ./... \;
 
 # Run go vet against code
 vet:
-	go vet ./...
+	find . -maxdepth 2 -type f -name 'go.mod' -execdir go vet ./... \;
 
 # Generate code
 generate: controller-gen

api/go.mod

@@ -0,0 +1,9 @@
+module github.com/fluxcd/notification-controller/api
+
+go 1.14
+
+require (
+	k8s.io/api v0.18.8
+	k8s.io/apimachinery v0.18.8
+	sigs.k8s.io/controller-runtime v0.6.2
+)