Skip to content

Commit de853ed

Browse files
committed
Merge branch 'pf/envs' of github.com:jetstack/jetstack-secure into pf/envs
2 parents a443ec8 + 37aad2f commit de853ed

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

.github/workflows/tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
- run: make -j verify
3434

35-
test-unit:
35+
test:
3636
runs-on: ubuntu-latest
3737
timeout-minutes: 15
3838

@@ -62,4 +62,4 @@ jobs:
6262
path: _bin/downloaded
6363
key: downloaded-${{ runner.os }}-${{ hashFiles('klone.yaml') }}-test-unit
6464

65-
- run: make -j test-unit
65+
- run: make -j test-unit test-helm

make/00_mod.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,5 @@ endef
5353

5454
golangci_lint_config := .golangci.yaml
5555
go_header_file := /dev/null
56+
57+
include make/extra_tools.mk

make/02_mod.mk

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,15 @@ shared_generate_targets += generate-crds-venconn
5252
## @category Testing
5353
test-e2e-gke:
5454
./hack/e2e/test.sh
55+
56+
.PHONY: test-helm
57+
## Run `helm unittest`.
58+
## @category Testing
59+
test-helm: | $(NEEDS_HELM-UNITTEST)
60+
$(HELM-UNITTEST) ./deploy/charts/venafi-kubernetes-agent/
61+
62+
.PHONY: test-helm-snapshot
63+
## Update the `helm unittest` snapshots.
64+
## @category Testing
65+
test-helm-snapshot: | $(NEEDS_HELM-UNITTEST)
66+
$(HELM-UNITTEST) ./deploy/charts/venafi-kubernetes-agent/ -u

make/extra_tools.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ADDITIONAL_TOOLS :=
2+
ADDITIONAL_GO_DEPENDENCIES :=
3+
4+
# https://pkg.go.dev/github.com/helm-unittest/helm-unittest?tab=versions
5+
ADDITIONAL_TOOLS += helm-unittest=v0.8.2
6+
ADDITIONAL_GO_DEPENDENCIES += helm-unittest=github.com/helm-unittest/helm-unittest/cmd/helm-unittest

0 commit comments

Comments
 (0)