From f3223bc2d8384b27821300a072ccc92318ebfb27 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Wed, 7 May 2025 16:09:27 +0200 Subject: [PATCH 1/5] Add envtest required variables --- tasks_tools.yaml | 1 + tasks_val.yaml | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tasks_tools.yaml b/tasks_tools.yaml index 2b78362..7ed4de3 100644 --- a/tasks_tools.yaml +++ b/tasks_tools.yaml @@ -186,4 +186,5 @@ tasks: cmds: - 'GOBIN="{{.LOCALBIN}}" go install sigs.k8s.io/controller-runtime/tools/setup-envtest@{{.ENVTEST_VERSION}}' - echo -n "{{.ENVTEST_VERSION}}" > {{.LOCALBIN}}/envtest_version + - '{{.ROOT_DIR}}/bin/setup-envtest use {{.ENVTEST_K8S_VERSION}} -p path > {{.LOCALBIN}}/assets_path' internal: true diff --git a/tasks_val.yaml b/tasks_val.yaml index 36312c3..8291841 100644 --- a/tasks_val.yaml +++ b/tasks_val.yaml @@ -23,13 +23,17 @@ tasks: test: desc: " Run all tests." run: once + vars: + ENVTEST_K8S_VERSION: '{{ env "ENVTEST_K8S_VERSION" | default ( .ENVTEST_K8S_VERSION | default "1.30.0" ) }}' + KUBEBUILDER_ASSETS: + sh: '(test -f {{.LOCALBIN}}/assets_path && cat {{.LOCALBIN}}/assets_path) || echo ""' requires: vars: - CODE_DIRS deps: - test-envtest-dep cmds: - - 'PROJECT_ROOT="{{.ROOT_DIR2}}" NESTED_MODULES="{{.NESTED_MODULES}}" {{.TASKFILE_DIR2}}/run-tests.sh {{.CODE_DIRS}}' + - 'PROJECT_ROOT="{{.ROOT_DIR2}}" NESTED_MODULES="{{.NESTED_MODULES}}" KUBEBUILDER_ASSETS="{{.KUBEBUILDER_ASSETS}}" ENVTEST_K8S_VERSION="{{.ENVTEST_K8S_VERSION}}" {{.TASKFILE_DIR2}}/run-tests.sh {{.CODE_DIRS}}' test-envtest-dep: desc: " Install the envtest dependency, if marked as required." From 369833637c5dcadaf57e4471b83da197a72f6899 Mon Sep 17 00:00:00 2001 From: Mohamed Elsayed Date: Thu, 8 May 2025 08:49:46 +0200 Subject: [PATCH 2/5] Update tasks_val.yaml Co-authored-by: Johannes Aubart --- tasks_val.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tasks_val.yaml b/tasks_val.yaml index 8291841..dd34d76 100644 --- a/tasks_val.yaml +++ b/tasks_val.yaml @@ -25,8 +25,6 @@ tasks: run: once vars: ENVTEST_K8S_VERSION: '{{ env "ENVTEST_K8S_VERSION" | default ( .ENVTEST_K8S_VERSION | default "1.30.0" ) }}' - KUBEBUILDER_ASSETS: - sh: '(test -f {{.LOCALBIN}}/assets_path && cat {{.LOCALBIN}}/assets_path) || echo ""' requires: vars: - CODE_DIRS From 088bc3e23da5bf7c59500f708e0a81580bb6e4d4 Mon Sep 17 00:00:00 2001 From: Mohamed Elsayed Date: Thu, 8 May 2025 08:49:55 +0200 Subject: [PATCH 3/5] Update tasks_val.yaml Co-authored-by: Johannes Aubart --- tasks_val.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks_val.yaml b/tasks_val.yaml index dd34d76..558690b 100644 --- a/tasks_val.yaml +++ b/tasks_val.yaml @@ -31,7 +31,7 @@ tasks: deps: - test-envtest-dep cmds: - - 'PROJECT_ROOT="{{.ROOT_DIR2}}" NESTED_MODULES="{{.NESTED_MODULES}}" KUBEBUILDER_ASSETS="{{.KUBEBUILDER_ASSETS}}" ENVTEST_K8S_VERSION="{{.ENVTEST_K8S_VERSION}}" {{.TASKFILE_DIR2}}/run-tests.sh {{.CODE_DIRS}}' + - '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}}' test-envtest-dep: desc: " Install the envtest dependency, if marked as required." From bf9e74cb2597bbe3f48d67bf886a40310eb9778a Mon Sep 17 00:00:00 2001 From: moelsayed Date: Thu, 8 May 2025 08:58:23 +0200 Subject: [PATCH 4/5] typo --- tasks_val.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks_val.yaml b/tasks_val.yaml index 558690b..6e5264d 100644 --- a/tasks_val.yaml +++ b/tasks_val.yaml @@ -31,7 +31,7 @@ tasks: deps: - test-envtest-dep cmds: - - '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}}' + - '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}}' test-envtest-dep: desc: " Install the envtest dependency, if marked as required." From 76c9f95cf5176256f73a944e11ddc251aa65fb97 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Thu, 8 May 2025 09:13:26 +0200 Subject: [PATCH 5/5] add missing env variable --- tasks_tools.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks_tools.yaml b/tasks_tools.yaml index 7ed4de3..b69a0e0 100644 --- a/tasks_tools.yaml +++ b/tasks_tools.yaml @@ -179,6 +179,7 @@ tasks: - localbin vars: ENVTEST_VERSION: '{{ env "ENVTEST_VERSION" | default ( .ENVTEST_VERSION | default "release-0.16" ) }}' + ENVTEST_K8S_VERSION: '{{ env "ENVTEST_K8S_VERSION" | default ( .ENVTEST_K8S_VERSION | default "1.30.0"" ) }}' status: - 'test -x "{{.ENVTEST}}"' - test -f {{.LOCALBIN}}/envtest_version