Update codegen to produce proper packages (nginx#9)

* Update codegen to produce proper packages

We had mistakenly left off the CRD name leading to invalid golang
being generated.

Tag along, "gateway" removed from .gitignore. Moving artifacts to
build/.out so files don't get hidden and ignored.

Author: miledxz

.gitignore

@@ -21,5 +21,5 @@
 # GoLand IDE
 .idea
 
-# Binary
-gateway
+# Binary and Artifacts
+build/.out

Makefile

@@ -8,6 +8,7 @@ DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 TARGET ?= local
 
 KIND_KUBE_CONFIG_FOLDER = $${HOME}/.kube/kind
+OUT_DIR=$(shell pwd)/build/.out
 
 export DOCKER_BUILDKIT = 1
 
@@ -18,9 +19,17 @@ container: build
 .PHONY: build
 build:
 ifeq (${TARGET},local)
-	CGO_ENABLED=0 GOOS=linux go build -trimpath -a -ldflags "-s -w -X main.version=${VERSION} -X main.commit=${GIT_COMMIT} -X main.date=${DATE}" -o gateway github.com/nginxinc/nginx-gateway-kubernetes/cmd/gateway
+	CGO_ENABLED=0 GOOS=linux go build -trimpath -a -ldflags "-s -w -X main.version=${VERSION} -X main.commit=${GIT_COMMIT} -X main.date=${DATE}" -o $(OUT_DIR)/gateway github.com/nginxinc/nginx-gateway-kubernetes/cmd/gateway
 endif
 
+.PHONY: out_dir
+out_dir:
+	mkdir -p $(OUT_DIR)
+
+.PHONY: clean
+clean: out_dir
+	rm -rf $(OUT_DIR)
+
 .PHONY: deps
 deps:
 	@go mod tidy && go mod verify && go mod download
@@ -46,4 +55,4 @@ create-kind-cluster:
 
 .PHONY: delete-kind-cluster
 delete-kind-cluster:
-	kind delete cluster
+	kind delete cluster

build/Dockerfile

@@ -11,7 +11,7 @@ RUN go mod download
 COPY cmd /go/src/github.com/nginxinc/nginx-gateway-kubernetes/cmd
 COPY internal /go/src/github.com/nginxinc/nginx-gateway-kubernetes/internal
 COPY pkg /go/src/github.com/nginxinc/nginx-gateway-kubernetes/pkg
-RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -a -ldflags "-s -w -X main.version=${VERSION} -X main.commit=${GIT_COMMIT} -X main.date=${DATE}" -o gateway .
+RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -a -ldflags "-s -w -X main.version=${VERSION} -X main.commit=${GIT_COMMIT} -X main.date=${DATE}" -o ./build/.out/gateway .
 
 FROM scratch as common
 USER 1001:1001
@@ -21,4 +21,4 @@ FROM common as container
 COPY --from=builder /go/src/github.com/nginxinc/nginx-gateway-kubernetes/cmd/gateway/gateway /usr/bin/
 
 FROM common as local
-COPY ./gateway /usr/bin/
+COPY ./build/.out/gateway /usr/bin/

hack/update-codegen.sh

@@ -32,7 +32,8 @@ fi
 #                  k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
 #                  instead of the $GOPATH directly. For normal projects this can be dropped.
 bash "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \
-  github.com/nginxinc/nginx-gateway-kubernetes/pkg/client github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis \
-  :v1alpha1 \
+  github.com/nginxinc/nginx-gateway-kubernetes/pkg/client \
+  github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis \
+  gateway:v1alpha1 \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \
   --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt

internal/controller/controller.go

@@ -7,7 +7,7 @@ import (
 	gw "github.com/nginxinc/nginx-gateway-kubernetes/internal/implementations/gateway"
 	gc "github.com/nginxinc/nginx-gateway-kubernetes/internal/implementations/gatewayclass"
 	gcfg "github.com/nginxinc/nginx-gateway-kubernetes/internal/implementations/gatewayconfig"
-	nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/v1alpha1"
+	nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1"
 	"github.com/nginxinc/nginx-gateway-kubernetes/pkg/sdk"
 
 	"k8s.io/apimachinery/pkg/runtime"

internal/implementations/gatewayconfig/gatewayconfig.go

@@ -5,7 +5,7 @@ import (
 	"github.com/nginxinc/nginx-gateway-kubernetes/internal/config"
 	"github.com/nginxinc/nginx-gateway-kubernetes/pkg/sdk"
 
-	nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/v1alpha1"
+	nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1"
 )
 
 type gatewayConfigImplementation struct {

pkg/apis/gateway/register.go

@@ -0,0 +1,5 @@
+// Package gateway defines the API group for NGINX Gateway configuration resources.
+package gateway
+
+// GroupName identifies the API Group Name for NGINX Gateway configuration resources.
+const GroupName = "gateway.nginx.org"

pkg/apis/v1alpha1/doc.go renamed to pkg/apis/gateway/v1alpha1/doc.go

@@ -1,13 +1,15 @@
 package v1alpha1
 
 import (
+	"github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // SchemeGroupVersion is group version used to register these object.
-var SchemeGroupVersion = schema.GroupVersion{Group: "gateway.nginx.org", Version: "v1alpha1"}
+var SchemeGroupVersion = schema.GroupVersion{Group: gateway.GroupName, Version: "v1alpha1"}
 
 // Kind takes an unqualified kind and returns back a Group qualified GroupKind.
 func Kind(kind string) schema.GroupKind {