Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor/dockers/apply build for 2 platform #2267

Merged
merged 20 commits into from
Dec 12, 2023
Merged

Refactor/dockers/apply build for 2 platform #2267

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2696959
Implement base of continuous benchmark tool (#1776)
vankichi Feb 13, 2023
8364531
:sparkles: impl status handle of continuous benchmark crds (#1955)
vankichi Mar 8, 2023
5593b86
Impl benchmark jobs (#1977)
vankichi Apr 26, 2023
b772b7f
create helm template for benchmark operator (#2027)
vankichi May 24, 2023
96a976d
Refactor helm template and operator logic (#2043)
vankichi Jun 23, 2023
3257500
style: Format code with prettier and gofumpt
deepsource-autofix[bot] Aug 17, 2023
7ff2e89
Update charts and improvement conbench (#2119)
vankichi Aug 25, 2023
fbebac6
:recycle: Apply new internal/sync for continous benchmark (#2175)
vankichi Sep 11, 2023
27b9e9f
:whale: fix Dockerfile
vankichi Sep 25, 2023
6fee4cf
:recycle: Fix license and format
vankichi Oct 11, 2023
ebb58fb
:white_check_mark: add benchmark operator reconcile test
vankichi Oct 19, 2023
2cb4d27
:recycle: Refactor from deepsource feedback (#2222)
vankichi Oct 30, 2023
f85f4bc
:recycle: use modulo to calc idx, fix Makefile, add error handling
vankichi Nov 13, 2023
5284f39
Apply suggestions from code review
vankichi Nov 16, 2023
3a59386
:recycle: Fix feedback
vankichi Nov 29, 2023
a546a5d
:whale: Fix dockerfile
vankichi Dec 8, 2023
ce7414d
:whale: Fix dockerfile
vankichi Dec 8, 2023
643f7a8
Merge branch 'feature/continuous-benchmark' into refactore/dockers/ap…
vankichi Dec 11, 2023
6f03f03
Update Makefile.d/build.mk
vankichi Dec 11, 2023
168a1b2
Update Makefile.d/build.mk
vankichi Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ TELEPRESENCE_VERSION := $(eval TELEPRESENCE_VERSION := $(shell cat versions
VALDCLI_VERSION := $(eval VALDCLI_VERSION := $(shell cat versions/VALDCLI_VERSION))$(VALDCLI_VERSION)
YQ_VERSION := $(eval YQ_VERSION := $(shell cat versions/YQ_VERSION))$(YQ_VERSION)
BUF_VERSION := $(eval BUF_VERSION := $(shell cat versions/BUF_VERSION))$(BUF_VERSION)
ZLIB_VERSION := $(eval ZLIB_VERSION := $(shell cat versions/ZLIB_VERSION))$(ZLIB_VERSION)
HDF5_VERSION := $(eval HDF5_VERSION := $(shell cat versions/HDF5_VERSION))$(HDF5_VERSION)

OTEL_OPERATOR_RELEASE_NAME ?= opentelemetry-operator
PROMETHEUS_RELEASE_NAME ?= prometheus
Expand Down
20 changes: 8 additions & 12 deletions Makefile.d/build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,30 +329,26 @@ cmd/tools/benchmark/job/job: \
$(PBGOS) \
$(shell find ./cmd/tools/benchmark/job -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \
$(shell find ./pkg/tools/benchmark/job -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go')
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
CGO_ENABLED=1 \
CGO_CXXFLAGS="-g -Ofast -march=native" \
CGO_FFLAGS="-g -Ofast -march=native" \
CGO_LDFLAGS="-g -Ofast -march=native" \
CGO_ENABLED=$(CGO_ENABLED) \
GO111MODULE=on \
GOPRIVATE=$(GOPRIVATE) \
go build \
--ldflags "-s -w \
--ldflags "-w -linkmode 'external' \
-extldflags '-static -fPIC -pthread -fopenmp -std=gnu++20 -lhdf5 -lhdf5_hl -lm -ldl' \
-X '$(GOPKG)/internal/info.Version=$(VERSION)' \
-X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \
-X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \
-X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \
-X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \
-X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \
-X '$(GOPKG)/internal/info.CGOEnabled=$${CGO_ENABLED}' \
-X '$(GOPKG)/internal/info.CGOEnabled=${CGO_ENABLED}' \
-X '$(GOPKG)/internal/info.NGTVersion=$(NGT_VERSION)' \
-X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \
-buildid=" \
-mod=readonly \
-modcacherw \
-a \
-tags "cgo osusergo netgo" \
-tags "osusergo netgo static_build" \
vankichi marked this conversation as resolved.
Show resolved Hide resolved
-trimpath \
-o $@ \
$(dir $@)main.go
Expand All @@ -372,15 +368,15 @@ cmd/tools/benchmark/operator/operator: \
GO111MODULE=on \
GOPRIVATE=$(GOPRIVATE) \
go build \
--ldflags "-s -w \
-X '$(GOPKG)/internal/info.CGOEnabled=$${CGO_ENABLED}' \
--ldflags "-w -extldflags=-static \
-X '$(GOPKG)/internal/info.CGOEnabled=${CGO_ENABLED}' \
-X '$(GOPKG)/internal/info.NGTVersion=$(NGT_VERSION)' \
-X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \
-buildid=" \
-mod=readonly \
-modcacherw \
-a \
-tags "cgo osusergo netgo" \
-tags "osusergo netgo static_build" \
vankichi marked this conversation as resolved.
Show resolved Hide resolved
-trimpath \
-o $@ \
$(dir $@)main.go
Expand Down
14 changes: 13 additions & 1 deletion Makefile.d/dependencies.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ update/libs: \
update/telepresence \
update/vald \
update/valdcli \
update/yq
update/yq \
update/zlib \
update/hdf5

.PHONY: go/download
## download Go package dependencies
Expand Down Expand Up @@ -163,6 +165,16 @@ update/telepresence:
update/yq:
curl --silent https://api.github.com/repos/mikefarah/yq/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/YQ_VERSION

.PHONY: update/zlib
## update zlib version
update/zlib:
curl --silent https://api.github.com/repos/madler/zlib/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/ZLIB_VERSION

.PHONY: update/hdf5
## update hdf5 version
update/hdf5:
curl --silent https://api.github.com/repos/HDFGroup/hdf5/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/HDF5_VERSION

.PHONY: update/vald
## update vald it's self version
update/vald:
Expand Down
21 changes: 7 additions & 14 deletions Makefile.d/docker.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,10 @@ docker/name/benchmark-job:
.PHONY: docker/build/benchmark-job
## build benchmark job
docker/build/benchmark-job:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/tools/benchmark/job/Dockerfile \
-t $(ORG)/$(BENCHMARK_JOB_IMAGE):$(TAG) . \
--build-arg GO_VERSION=$(GO_VERSION) \
--build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \
--build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG)
@make DOCKERFILE="$(ROOTDIR)/dockers/tools/benchmark/job/Dockerfile" \
IMAGE=$(BENCHMARK_JOB_IMAGE) \
DOCKER_OPTS="--build-arg ZLIB_VERSION=$(ZLIB_VERSION) --build-arg HDF5_VERSION=$(HDF5_VERSION)" \
docker/build/image

.PHONY: docker/name/benchmark-operator
docker/name/benchmark-operator:
Expand All @@ -251,10 +248,6 @@ docker/name/benchmark-operator:
.PHONY: docker/build/benchmark-operator
## build benchmark operator
docker/build/benchmark-operator:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/tools/benchmark/operator/Dockerfile \
-t $(ORG)/$(BENCHMARK_OPERATOR_IMAGE):$(TAG) . \
--build-arg GO_VERSION=$(GO_VERSION) \
--build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \
--build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG)
@make DOCKERFILE="$(ROOTDIR)/dockers/tools/benchmark/operator/Dockerfile" \
IMAGE=$(BENCHMARK_OPERATOR_IMAGE) \
docker/build/image
Loading
Loading