Skip to content

Commit d3d48ac

Browse files
feat: Add envtest required variables (#16)
* Add envtest required variables * Update tasks_val.yaml Co-authored-by: Johannes Aubart <[email protected]> * Update tasks_val.yaml Co-authored-by: Johannes Aubart <[email protected]> * typo * add missing env variable --------- Co-authored-by: Johannes Aubart <[email protected]>
1 parent 638f989 commit d3d48ac

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

tasks_tools.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,13 @@ tasks:
179179
- localbin
180180
vars:
181181
ENVTEST_VERSION: '{{ env "ENVTEST_VERSION" | default ( .ENVTEST_VERSION | default "release-0.16" ) }}'
182+
ENVTEST_K8S_VERSION: '{{ env "ENVTEST_K8S_VERSION" | default ( .ENVTEST_K8S_VERSION | default "1.30.0"" ) }}'
182183
status:
183184
- 'test -x "{{.ENVTEST}}"'
184185
- test -f {{.LOCALBIN}}/envtest_version
185186
- 'cat {{.LOCALBIN}}/envtest_version | grep -q "{{.ENVTEST_VERSION}}"'
186187
cmds:
187188
- 'GOBIN="{{.LOCALBIN}}" go install sigs.k8s.io/controller-runtime/tools/setup-envtest@{{.ENVTEST_VERSION}}'
188189
- echo -n "{{.ENVTEST_VERSION}}" > {{.LOCALBIN}}/envtest_version
190+
- '{{.ROOT_DIR}}/bin/setup-envtest use {{.ENVTEST_K8S_VERSION}} -p path > {{.LOCALBIN}}/assets_path'
189191
internal: true

tasks_val.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ tasks:
2323
test:
2424
desc: " Run all tests."
2525
run: once
26+
vars:
27+
ENVTEST_K8S_VERSION: '{{ env "ENVTEST_K8S_VERSION" | default ( .ENVTEST_K8S_VERSION | default "1.30.0" ) }}'
2628
requires:
2729
vars:
2830
- CODE_DIRS
2931
deps:
3032
- test-envtest-dep
3133
cmds:
32-
- 'PROJECT_ROOT="{{.ROOT_DIR2}}" NESTED_MODULES="{{.NESTED_MODULES}}" {{.TASKFILE_DIR2}}/run-tests.sh {{.CODE_DIRS}}'
34+
- 'PROJECT_ROOT="{{.ROOT_DIR2}}" NESTED_MODULES="{{.NESTED_MODULES}}" KUBEBUILDER_ASSETS="$( (test -f {{.LOCALBIN}}/assets_path && cat {{.LOCALBIN}}/assets_path) || echo "")" ENVTEST_K8S_VERSION="{{.ENVTEST_K8S_VERSION}}" {{.TASKFILE_DIR2}}/run-tests.sh {{.CODE_DIRS}}'
3335

3436
test-envtest-dep:
3537
desc: " Install the envtest dependency, if marked as required."

0 commit comments

Comments
 (0)