Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 41 additions & 8 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,32 @@ builds:
flags:
- -trimpath
mod_timestamp: '{{ .CommitTimestamp }}'
ldflags:
ldflags: &ldflags
- >-
-X github.com/projectcapsule/capsule/internal/version.Version={{ .Tag }}
-X github.com/projectcapsule/capsule/internal/version.GitCommit={{ .Commit }}
-X github.com/projectcapsule/capsule/internal/version.GitTag={{ .Tag }}
-X github.com/projectcapsule/capsule/internal/version.GitDirty={{ .Date }}
-X github.com/projectcapsule/capsule/internal/version.BuildTime={{ .Date }}
-X github.com/projectcapsule/capsule/internal/version.GitRepo={{ .ProjectName }}
- id: "{{ .ProjectName }}-cli"
main: ./cmd/cli
binary: "{{ .ProjectName }}-cli-{{ .Os }}-{{ .Arch }}"
env:
- CGO_ENABLED=0
goarch:
- amd64
- arm64
goos:
- linux
- windows
- darwin
flags:
- -trimpath
mod_timestamp: '{{ .CommitTimestamp }}'
ldflags: *ldflags
# - id: "{{ .ProjectName }}-wasm"
# main: ./cmd/
# main: ./cmd/controller/
# binary: "{{ .ProjectName }}.wasm"
# env:
# - CGO_ENABLED=0
Expand All @@ -43,12 +59,29 @@ builds:
# mod_timestamp: '{{ .CommitTimestamp }}'
# ldflags:
# - >-
# -X main.Version={{ .Tag }}
# -X main.GitCommit={{ .Commit }}
# -X main.GitTag={{ .Tag }}
# -X main.GitDirty={{ .Date }}
# -X main.BuildTime={{ .Date }}
# -X main.GitRepo={{ .ProjectName }}
# -X github.com/projectcapsule/capsule/internal/version.Version={{ .Tag }}
# -X github.com/projectcapsule/capsule/internal/version.GitCommit={{ .Commit }}
# -X github.com/projectcapsule/capsule/internal/version.GitTag={{ .Tag }}
# -X github.com/projectcapsule/capsule/internal/version.GitDirty={{ .Date }}
# -X github.com/projectcapsule/capsule/internal/version.BuildTime={{ .Date }}
# -X github.com/projectcapsule/capsule/internal/version.GitRepo={{ .ProjectName }}
archives:
- id: controller
ids:
- "{{ .ProjectName }}"
name_template: >-
{{ .ProjectName }}_
{{- .Version }}_
{{- .Os }}_
{{- .Arch }}
- id: cli
name_template: >-
{{ .ProjectName }}-cli_
{{- .Version }}_
{{- .Os }}_
{{- .Arch }}
ids:
- "{{ .ProjectName }}-cli"
release:
prerelease: auto
footer: |
Expand Down
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ So the TL;DR answer is:

```bash
# Create a KinD cluster if not already created
$ make dev-cluster
$ make dev-build helm-test-exec

# To retrieve your laptop's IP and execute `make dev-setup` to setup dev env
# For example: LAPTOP_HOST_IP=192.168.10.101 make dev-setup
Expand Down
15 changes: 14 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ all: manager

# Run tests
.PHONY: test
test: gotestsum test-clean generate manifests test-clean
test: gotestsum test-clean generate manifests mocks test-clean
@GO111MODULE=on $(GOTEST) \
--format pkgname-and-test-fails \
--packages="$(shell go list ./... | grep -v "e2e")" \
Expand Down Expand Up @@ -438,6 +438,11 @@ golint: golangci-lint
golint-fix: golangci-lint
$(GOLANGCI_LINT) run -c .golangci.yaml --verbose --fix

# generate mocks
.PHONY: mocks
mocks: mockgen
$(MOCKGEN) -destination internal/mocks/client/mock.go sigs.k8s.io/controller-runtime/pkg/client Client,SubResourceWriter,Reader

.PHONY: e2e-openshift
e2e-openshift: ginkgo
$(MAKE) e2e-build-openshift && $(MAKE) e2e-exec FILTER='&& !skip && !skip-on-openshift' && $(MAKE) e2e-destroy-openshift
Expand Down Expand Up @@ -476,6 +481,7 @@ e2e-install: helm-controller-version ko-build-all dev-install-gw-api-crds
--create-namespace \
--set 'replicaCount=2'\
--set 'certManager.generateCertificates=false' \
--set 'proxy.enabled=false' \
--set 'tls.enableController=true' \
--set 'tls.create=true' \
--set 'manager.image.pullPolicy=Never' \
Expand Down Expand Up @@ -671,6 +677,13 @@ apidocs-gen: ## Download crdoc locally if necessary.
@test -s $(APIDOCS_GEN) && $(APIDOCS_GEN) --version | grep -q $(APIDOCS_GEN_VERSION) || \
$(call go-install-tool,$(APIDOCS_GEN),fybrik.io/crdoc@$(APIDOCS_GEN_VERSION))

MOCKGEN := $(LOCALBIN)/mockgen
MOCKGEN_VERSION := v0.6.0
MOCKGEN_LOOKUP := go.uber.org/mock/mockgen
mockgen:
@test -s $(MOCKGEN) && $(MOCKGEN) -version | grep -q $(MOCKGEN_VERSION) || \
$(call go-install-tool,$(MOCKGEN),$(MOCKGEN_LOOKUP)@$(MOCKGEN_VERSION))

GORELEASER := $(LOCALBIN)/goreleaser
GORELEASER_VERSION := 2.16.0
GORELEASER_LOOKUP := goreleaser/goreleaser
Expand Down
Loading
Loading