Merge pull request nephio-project#107 from nokia/single-module

Merge all of porch's go modules into a single go module

Makefile

@@ -156,7 +156,7 @@ GO_MODULES = \
 
 .PHONY: tidy
 tidy:
-	@for f in $(GO_MODULES); do (cd $$f; echo "Tidying $$f"; go mod tidy) || exit 1; done
+	go mod tidy
 
 .PHONY: configure-git
 configure-git:

build/Dockerfile

@@ -21,12 +21,9 @@ WORKDIR /go/src
 # and so that source changes don't invalidate our downloaded layer
 
 COPY go.mod go.sum ./
-COPY api/go.mod api/go.sum ./api/
 
 RUN echo "Downloading porch modules ..." \
  && go mod download
-RUN echo "Downloading api modules ..." \
- && cd api && go mod download
 
 ENV CGO_ENABLED=0
 # Prebuild some library dependencies to warm the cache

controllers/Dockerfile

@@ -19,12 +19,9 @@ WORKDIR /go/src
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
 COPY go.mod go.sum ./
-COPY api/go.mod api/go.sum ./api/
 
 RUN echo "Downloading porch modules ..." \
  && go mod download
-RUN echo "Downloading api modules ..." \
- && cd api && go mod download
 
 ENV CGO_ENABLED=0
 # Prebuild some library dependencies to warm the cache

controllers/Makefile

@@ -16,15 +16,6 @@ IMAGE_TAG ?= latest
 IMAGE_REPO ?= docker.io/nephio
 IMAGE_NAME ?= porch-controllers
 
-# This includes the following targets:
-#   test, unit, unit-clean,
-#   gosec, lint,
-#   fmt, vet
-include ../default-go.mk
-
-# This includes the 'help' target that prints out all targets with their descriptions organized by categories
-include ../default-help.mk
-
 .PHONY: build-image docker-build
 build-image docker-build:
 	docker buildx build --load --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) -f Dockerfile ..