@@ -29,68 +29,65 @@ manifests: controller-gen generate ## Generate ClusterRole and CustomResourceDef
2929generate : controller-gen # # Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
3030 $(CONTROLLER_GEN ) object:headerFile=" api/hack/boilerplate.go.txt" paths=" ./api/..."
3131
32- # # Workspace modules
33- MODULES := api core adk
34-
3532# #@ Development
3633
3734.PHONY : fmt
38- fmt : # # Run go fmt against all modules .
39- @for m in $( MODULES ) ; do echo " fmt $$ m " ; (cd $$ m && go fmt ./...) ; done
35+ fmt : # # Run go fmt.
36+ go fmt ./...
4037
4138.PHONY : vet
42- vet : # # Run go vet against all modules .
43- @for m in $( MODULES ) ; do echo " vet $$ m " ; (cd $$ m && go vet ./...) ; done
39+ vet : # # Run go vet.
40+ go vet ./...
4441
4542.PHONY : lint
46- lint : golangci-lint # # Run golangci-lint against all modules .
47- @for m in $( MODULES ) ; do echo " lint $$ m " ; (cd $$ m && $( GOLANGCI_LINT) run) || exit 1 ; done
43+ lint : golangci-lint # # Run golangci-lint.
44+ $( GOLANGCI_LINT ) run
4845
4946.PHONY : lint-fix
50- lint-fix : golangci-lint # # Run golangci-lint with auto-fix against all modules .
51- @for m in $( MODULES ) ; do echo " lint-fix $$ m " ; (cd $$ m && $( GOLANGCI_LINT) run --fix) || exit 1 ; done
47+ lint-fix : golangci-lint # # Run golangci-lint with auto-fix.
48+ $( GOLANGCI_LINT ) run --fix
5249
5350.PHONY : lint-config
5451lint-config : golangci-lint # # Verify golangci-lint linter configuration.
55- @for m in $( MODULES ) ; do echo " lint-config $$ m " ; (cd $$ m && $( GOLANGCI_LINT) config verify) || exit 1 ; done
52+ $( GOLANGCI_LINT ) config verify
5653
5754.PHONY : govulncheck
58- govulncheck : # # Run govulncheck against all modules .
55+ govulncheck : # # Run govulncheck.
5956 $(call go-install-tool,bin/govulncheck,golang.org/x/vuln/cmd/govulncheck,latest)
60- @for m in $( MODULES ) ; do echo " govulncheck $$ m " ; (cd $$ m && go mod tidy -v && ../ bin/govulncheck-latest ./...) || exit 1 ; done
57+ go mod tidy -v && bin/govulncheck-latest ./...
6158
6259# #@ Build (core module — CLI binaries)
6360
6461core/bin/kagent-local :
65- cd core && CGO_ENABLED=0 go test -race ./cli/...
66- cd core && CGO_ENABLED=0 go build -ldflags " $( LDFLAGS) " -o bin/kagent-local ./cli/cmd/kagent
62+ go test -race ./core /cli/...
63+ CGO_ENABLED=0 go build -ldflags " $( LDFLAGS) " -o core/ bin/kagent-local ./core /cli/cmd/kagent
6764
6865core/bin/kagent-linux-amd64 :
69- cd core && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags " $( LDFLAGS) " -o bin/kagent-linux-amd64 ./cli/cmd/kagent
66+ CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags " $( LDFLAGS) " -o core/ bin/kagent-linux-amd64 ./core /cli/cmd/kagent
7067
7168core/bin/kagent-linux-amd64.sha256 : core/bin/kagent-linux-amd64
7269 sha256sum core/bin/kagent-linux-amd64 > core/bin/kagent-linux-amd64.sha256
7370
7471core/bin/kagent-linux-arm64 :
75- cd core && CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags " $( LDFLAGS) " -o bin/kagent-linux-arm64 ./cli/cmd/kagent
72+ CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags " $( LDFLAGS) " -o core/ bin/kagent-linux-arm64 ./core /cli/cmd/kagent
7673
7774core/bin/kagent-linux-arm64.sha256 : core/bin/kagent-linux-arm64
7875 sha256sum core/bin/kagent-linux-arm64 > core/bin/kagent-linux-arm64.sha256
7976
8077core/bin/kagent-darwin-amd64 :
81- cd core && CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags " $( LDFLAGS) " -o bin/kagent-darwin-amd64 ./cli/cmd/kagent
78+ CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags " $( LDFLAGS) " -o core/ bin/kagent-darwin-amd64 ./core /cli/cmd/kagent
8279
8380core/bin/kagent-darwin-amd64.sha256 : core/bin/kagent-darwin-amd64
8481 sha256sum core/bin/kagent-darwin-amd64 > core/bin/kagent-darwin-amd64.sha256
8582
8683core/bin/kagent-darwin-arm64 :
87- cd core && CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags " $( LDFLAGS) " -o bin/kagent-darwin-arm64 ./cli/cmd/kagent
84+ CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags " $( LDFLAGS) " -o core/ bin/kagent-darwin-arm64 ./core /cli/cmd/kagent
8885
8986core/bin/kagent-darwin-arm64.sha256 : core/bin/kagent-darwin-arm64
9087 sha256sum core/bin/kagent-darwin-arm64 > core/bin/kagent-darwin-arm64.sha256
9188
9289core/bin/kagent-windows-amd64.exe :
93- cd core && CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags " $( LDFLAGS) " -o bin/kagent-windows-amd64.exe ./cli/cmd/kagent
90+ CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags " $( LDFLAGS) " -o core/ bin/kagent-windows-amd64.exe ./core /cli/cmd/kagent
9491
9592core/bin/kagent-windows-amd64.exe.sha256 : core/bin/kagent-windows-amd64.exe
9693 sha256sum core/bin/kagent-windows-amd64.exe > core/bin/kagent-windows-amd64.exe.sha256
@@ -104,15 +101,15 @@ build: core/bin/kagent-linux-amd64.sha256 core/bin/kagent-linux-arm64.sha256 cor
104101
105102.PHONY : run
106103run : fmt vet # # Run a controller from your host.
107- cd core && go run ./cmd/controller/main.go
104+ go run ./core /cmd/controller/main.go
108105
109106.PHONY : test
110- test : # # Run all unit tests across the workspace .
111- UPDATE_GOLDEN=$(UPDATE_GOLDEN ) go test -race -skip ' TestE2E.*' -v ./api/... ./core/... ./adk/ ...
107+ test : # # Run all unit tests.
108+ UPDATE_GOLDEN=$(UPDATE_GOLDEN ) go test -race -skip ' TestE2E.*' -v ./...
112109
113110.PHONY : e2e
114111e2e : # # Run end-to-end tests.
115- cd core && go test -v github.com/kagent-dev/kagent/go/core/test/e2e -failfast
112+ go test -v github.com/kagent-dev/kagent/go/core/test/e2e -failfast
116113
117114# #@ Dependencies
118115
@@ -130,9 +127,9 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
130127# # Tool Versions
131128CONTROLLER_TOOLS_VERSION ?= v0.19.0
132129# ENVTEST_VERSION is the version of controller-runtime release branch to fetch the envtest setup script (i.e. release-0.20)
133- ENVTEST_VERSION ?= $(shell cd core && go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-% d.% d", $$2, $$3}')
130+ ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-% d.% d", $$2, $$3}')
134131# ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries (i.e. 1.31)
135- ENVTEST_K8S_VERSION ?= $(shell cd core && go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.% d", $$3}')
132+ ENVTEST_K8S_VERSION ?= $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.% d", $$3}')
136133GOLANGCI_LINT_VERSION ?= v2.10.1
137134
138135.PHONY : controller-gen
0 commit comments