Move single main package to root of the repository

The binary is called pyrra

Author: metalmatze

.dockerignore

@@ -0,0 +1,7 @@
+.github/
+config/
+cue.mod/
+docs/
+examples/
+ui/build/
+ui/node_modules/

.gitignore

@@ -22,4 +22,4 @@ bin
 *.swo
 *~
 
-/cmd/api/ui/
+/pyrra

cmd/api/Dockerfile renamed to Dockerfile

@@ -16,21 +16,21 @@ FROM golang:1.16 as builder
 
 WORKDIR /workspace
 
-COPY cmd/api/ cmd/api/
 COPY kubernetes/ kubernetes/
 COPY openapi/ openapi/
 COPY slo/ slo/
-COPY go.mod go.mod
-COPY go.sum go.sum
+COPY *.go ./
+COPY go.mod ./
+COPY go.sum ./
 COPY Makefile Makefile
-COPY --from=uibuilder /workspace/ui/build /workspace/cmd/api/ui/build
+COPY --from=uibuilder /workspace/ui/build /workspace/ui/build
 # 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
 RUN go mod download
-RUN make api
+RUN make pyrra
 
 FROM alpine:3.14
 WORKDIR /
-COPY --from=builder /workspace/bin/api /usr/bin/api
+COPY --from=builder /workspace/pyrra /usr/bin/pyrra
 
-ENTRYPOINT ["/usr/bin/api"]
+ENTRYPOINT ["/usr/bin/pyrra"]

Makefile

@@ -1,5 +1,5 @@
 # Image URL to use all building/pushing image targets
-IMG_API ?= api:latest
+IMG ?= ghcr.io/pyrra-dev/pyrra:main
 
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:trivialVersions=true"
@@ -16,20 +16,23 @@ OPENAPI ?= docker run --rm \
 		-v ${PWD}:${PWD} \
 		openapitools/openapi-generator-cli:v5.1.1
 
-all: ui build lint
+all: ui/build build lint
+
+.PHONY: install
+install: ui/node_modules
 
 clean:
-	rm -rf ui/build ui/node_modules cmd/api/ui/build
+	rm -rf ui/build ui/node_modules
 
 # Run tests
 test: generate fmt vet manifests
 	go test -race ./... -coverprofile cover.out
 
-build: api
+build: pyrra
 
 # Build api binary
-api: fmt vet
-	CGO_ENABLED=0 go build -v -ldflags '-w -extldflags '-static'' -o bin/api ./cmd/api
+pyrra: fmt vet
+	CGO_ENABLED=0 go build -v -ldflags '-w -extldflags '-static'' -o pyrra
 
 # Deploy controller in the configured Kubernetes cluster in ~/.kube/config
 deploy: manifests config/api.yaml config/kubernetes.yaml
@@ -41,13 +44,15 @@ deploy: manifests config/api.yaml config/kubernetes.yaml
 manifests: controller-gen
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=pyrra-kubernetes webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
+config: config/api.yaml config/kubernetes.yaml
+
 config/api.yaml: config/api.cue
 	cue fmt -s ./config/
-	cue cmd --inject imageAPI=${IMG_API} "api.yaml" ./config
+	cue cmd --inject image=${IMG} "api.yaml" ./config
 
 config/kubernetes.yaml: config/kubernetes.cue
 	cue fmt -s ./config/
-	cue cmd --inject imageKubernetes=${IMG_KUBERNETES} "kubernetes.yaml" ./config
+	cue cmd --inject image=${IMG} "kubernetes.yaml" ./config
 
 # Run code linters
 lint: fmt vet
@@ -64,17 +69,11 @@ vet:
 generate: controller-gen manifests
 	$(CONTROLLER_GEN) object:headerFile="kubernetes/hack/boilerplate.go.txt" paths="./..."
 
-# Build the docker image
-docker-build: docker-build-api
-
-docker-build-api:
-	docker build . -t ${IMG_API} -f ./cmd/api/Dockerfile
-
-# Push the docker image
-docker-push: docker-push-api
+docker-build:
+	docker build . -t ${IMG}
 
-docker-push-api:
-	docker push ${IMG_API}
+docker-push:
+	docker push ${IMG}
 
 # find or download controller-gen
 # download controller-gen if necessary
@@ -114,19 +113,8 @@ ui/src/client: api.yaml
 	-rm -f $@
 	$(OPENAPI) generate -i ${PWD}/api.yaml -g typescript-fetch -o ${PWD}/ui/src/client
 
-.PHONY: install
-install: ui/node_modules
-
 ui/node_modules:
 	cd ui && npm install
 
-.PHONY: ui
-ui: cmd/api/ui/build
-
 ui/build:
 	cd ui && npm run build
-
-cmd/api/ui/build: ui/build
-	rm -rf ./cmd/api/ui
-	mkdir -p ./cmd/api/ui/
-	cp -r ./ui/build ./cmd/api/ui/

config/api.cue

@@ -9,7 +9,7 @@ api: {
 	_name:      "pyrra-api"
 	_namespace: "monitoring"
 	_replicas:  1
-	_image:     "api:latest" | string @tag(imageAPI)
+	_image:     "pyrra:latest" | string @tag(image)
 	_ports: http: 9099
 
 	service: corev1.#Service & {
@@ -41,6 +41,7 @@ api: {
 				metadata: labels: "app.kubernetes.io/name": _name
 				spec: containers: [{
 					args: [
+						"api",
 						"--prometheus.url=http://prometheus-k8s.monitoring.svc.cluster.local:9090",
 						"--api.url=http://\( kubernetes._name ).\(kubernetes._namespace).svc.cluster.local:\(kubernetes._ports.api)",
 					]

config/api.yaml

@@ -29,9 +29,10 @@ spec:
     spec:
       containers:
       - args:
+        - api
         - --prometheus.url=http://prometheus-k8s.monitoring.svc.cluster.local:9090
         - --api.url=http://pyrra-kubernetes.monitoring.svc.cluster.local:9444
-        image: api:latest
+        image: ghcr.io/pyrra-dev/pyrra:main
         name: pyrra-api
         ports:
         - name: http

config/kubernetes.cue

@@ -10,7 +10,7 @@ kubernetes: {
 	_name:      "pyrra-kubernetes"
 	_namespace: "monitoring"
 	_replicas:  1
-	_image:     "controller:latest" | string @tag(imageKubernetes)
+	_image:     "pyrra:latest" | string @tag(image)
 	_ports: {
 		internal: 9443
 		api:      9444

config/kubernetes.yaml

@@ -33,7 +33,7 @@ spec:
       containers:
       - command:
         - /kubernetes
-        image: kubernetes:latest
+        image: ghcr.io/pyrra-dev/pyrra:main
         name: pyrra-kubernetes
         resources:
           limits: