From 7bb0819e48555ce55f3cec8ac9f98d2d34e59708 Mon Sep 17 00:00:00 2001 From: Martin McCaffery Date: Thu, 12 Feb 2026 11:47:51 +0100 Subject: [PATCH] ci: generate two separate binaries --- .goreleaser.yaml | 38 ++++++++++++++++++++++++++---- Dockerfile | 13 ++++------ Dockerfile.goreleaser | 5 ++-- Makefile | 4 ++-- go.mod | 13 ++++++++-- go.sum | 30 +++++++++++++++++++---- internal/receiver/store.go | 2 +- test/k8s/test-cgroup-grouping.yaml | 4 ++-- 8 files changed, 83 insertions(+), 26 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 7e27b2c..3f5f26e 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,6 +1,6 @@ version: 2 -project_name: resource-collector +project_name: optimiser gitea_urls: api: "{{ .Env.GITHUB_SERVER_URL }}/api/v1" @@ -11,9 +11,21 @@ before: - go mod tidy builds: - - id: resource-collector + - id: collector main: ./cmd/collector - binary: resource-collector + binary: collector + env: + - CGO_ENABLED=0 + goos: + - linux + goarch: + - amd64 + - arm64 + ldflags: + - -s -w + - id: receiver + main: ./cmd/receiver + binary: receiver env: - CGO_ENABLED=0 goos: @@ -37,12 +49,28 @@ snapshot: version_template: "{{ incpatch .Version }}-next" dockers_v2: - - images: - - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_ORG }}/resource-collector" + - id: collector + ids: + - collector + images: + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_ORG }}/forgejo-runner-optimiser-collector" tags: - "{{ .Version }}" - latest dockerfile: Dockerfile.goreleaser + build_args: + BINARY: collector + - id: receiver + ids: + - receiver + images: + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_ORG }}/forgejo-runner-optimiser-receiver" + tags: + - "{{ .Version }}" + - latest + dockerfile: Dockerfile.goreleaser + build_args: + BINARY: receiver changelog: sort: asc diff --git a/Dockerfile b/Dockerfile index 75f7b7f..61ae4e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,26 +10,23 @@ COPY . . # Collector build (no CGO needed) FROM builder-base AS builder-collector -RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o /resource-collector ./cmd/collector +RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o /optimiser ./cmd/collector -# Receiver build (CGO needed for SQLite) +# Receiver build FROM builder-base AS builder-receiver -RUN apk add --no-cache gcc musl-dev -RUN CGO_ENABLED=1 GOOS=linux go build -ldflags="-s -w" -o /metrics-receiver ./cmd/receiver +RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o /metrics-receiver ./cmd/receiver # Collector image FROM alpine:3.19 AS collector -COPY --from=builder-collector /resource-collector /usr/local/bin/resource-collector +COPY --from=builder-collector /optimiser /usr/local/bin/optimiser -ENTRYPOINT ["/usr/local/bin/resource-collector"] +ENTRYPOINT ["/usr/local/bin/optimiser"] # Receiver image FROM alpine:3.19 AS receiver -RUN apk add --no-cache sqlite-libs - COPY --from=builder-receiver /metrics-receiver /usr/local/bin/metrics-receiver EXPOSE 8080 diff --git a/Dockerfile.goreleaser b/Dockerfile.goreleaser index 69c2616..dc792e1 100644 --- a/Dockerfile.goreleaser +++ b/Dockerfile.goreleaser @@ -1,4 +1,5 @@ FROM gcr.io/distroless/static:nonroot ARG TARGETPLATFORM -COPY ${TARGETPLATFORM}/resource-collector /resource-collector -ENTRYPOINT ["/resource-collector"] +ARG BINARY +COPY ${TARGETPLATFORM}/${BINARY} /app +ENTRYPOINT ["/app"] diff --git a/Makefile b/Makefile index cb32d30..8bb918a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -# ABOUTME: Makefile for forgejo-runner-resource-collector project. +# ABOUTME: Makefile for forgejo-runner-optimiser project. # ABOUTME: Provides targets for building, formatting, linting, and testing. -BINARY_NAME := resource-collector +BINARY_NAME := optimiser CMD_PATH := ./cmd/collector GO := go GOLANGCI_LINT := $(GO) run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.6.2 diff --git a/go.mod b/go.mod index 300d84c..898904b 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,22 @@ module edp.buildth.ing/DevFW-CICD/forgejo-runner-optimiser go 1.25.6 require ( - gorm.io/driver/sqlite v1.6.0 + github.com/glebarez/sqlite v1.11.0 gorm.io/gorm v1.31.1 ) require ( + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/glebarez/go-sqlite v1.21.2 // indirect + github.com/google/uuid v1.3.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/mattn/go-sqlite3 v1.14.22 // indirect + github.com/mattn/go-isatty v0.0.17 // indirect + github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect + golang.org/x/sys v0.7.0 // indirect golang.org/x/text v0.20.0 // indirect + modernc.org/libc v1.22.5 // indirect + modernc.org/mathutil v1.5.0 // indirect + modernc.org/memory v1.5.0 // indirect + modernc.org/sqlite v1.23.1 // indirect ) diff --git a/go.sum b/go.sum index 330dd09..95df11c 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,34 @@ +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo= +github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k= +github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw= +github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ= +github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= +github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= -github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= -gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= -gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE= +modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY= +modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= +modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= +modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= +modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM= +modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk= diff --git a/internal/receiver/store.go b/internal/receiver/store.go index 1b934de..7b78487 100644 --- a/internal/receiver/store.go +++ b/internal/receiver/store.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "gorm.io/driver/sqlite" + "github.com/glebarez/sqlite" "gorm.io/gorm" "gorm.io/gorm/logger" ) diff --git a/test/k8s/test-cgroup-grouping.yaml b/test/k8s/test-cgroup-grouping.yaml index e46545b..4b2b1c1 100644 --- a/test/k8s/test-cgroup-grouping.yaml +++ b/test/k8s/test-cgroup-grouping.yaml @@ -55,7 +55,7 @@ spec: # Resource collector sidecar - name: collector - image: ghcr.io/your-org/forgejo-runner-resource-collector:latest # Replace with your image + image: ghcr.io/your-org/forgejo-runner-optimiser:latest # Replace with your image args: - --interval=5s - --top=3 @@ -121,7 +121,7 @@ spec: # Collector - name: collector - image: ghcr.io/your-org/forgejo-runner-resource-collector:latest # Replace with your image + image: ghcr.io/your-org/forgejo-runner-optimiser:latest # Replace with your image args: - --interval=2s - --top=5