Fix errors

Signed-off-by: Patrick <patrick.weiss@iteratec.com>
secureCodeBox · J12934 · Apr 9, 2026 · Mar 4, 2026 · Mar 4, 2026 · Mar 4, 2026
commit c89fb07c47fcd7dbef6ee8a5d4f17a9e98dc9cc9
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -243,11 +243,11 @@ jobs:
 
       - name: Build Container Image
         working-directory: ./auto-discovery/kubernetes/
-        run: task docker-build
+        run: task base:docker-build
 
       - name: Export Container Image
         working-directory: ./auto-discovery/kubernetes/
-        run: task docker-export
+        run: task base:docker-export
 
       - name: Upload Image As Artifact
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
@@ -372,15 +372,15 @@ jobs:
 
       - name: Test
         working-directory: ./auto-discovery/cloud-aws/
-        run: task test
+        run: task base:test
 
       - name: Build Container Image
         working-directory: ./auto-discovery/cloud-aws/
-        run: task docker-build
+        run: task base:docker-build
 
       - name: Export Container Image
         working-directory: ./auto-discovery/cloud-aws/
-        run: task docker-export
+        run: task base:docker-export
 
       - name: Upload Image As Artifact
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0

diff --git a/auto-discovery/Taskfile.yaml b/auto-discovery/Taskfile.yaml
@@ -46,19 +46,19 @@ tasks:
       - |
         ENVTEST={{ .LOCALBIN }}/setup-envtest
         ENVTEST_VERSION={{ .ENVTEST_VERSION }}
-        if [ -f "$ENVTEST-$ENVTEST_VERSION" ] && [ "$(readlink -- "$ENVTEST" 2>/dev/null)" = "$ENVTEST-$ENVTEST_VERSION" ]; then
+        if [ -f "$ENVTEST-$ENVTEST_VERSION" ] && [ -L "$ENVTEST" ] && [ "$(readlink "$ENVTEST")" = "setup-envtest-$ENVTEST_VERSION" ]; then
           exit 0
         fi
         echo "Downloading setup-envtest@$ENVTEST_VERSION"
-        rm -f "$ENVTEST"
+        rm -f "$ENVTEST" "$ENVTEST-$ENVTEST_VERSION"
         GOBIN={{ .LOCALBIN }} go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$ENVTEST_VERSION
         mv "{{ .LOCALBIN }}/setup-envtest" "$ENVTEST-$ENVTEST_VERSION"
-        ln -sf "$(realpath "$ENVTEST-$ENVTEST_VERSION")" "$ENVTEST"
+        ln -sf "setup-envtest-$ENVTEST_VERSION" "$ENVTEST"
     status:
       - |
         ENVTEST={{ .LOCALBIN }}/setup-envtest
         ENVTEST_VERSION={{ .ENVTEST_VERSION }}
-        [ -f "$ENVTEST-$ENVTEST_VERSION" ] && [ "$(readlink -- "$ENVTEST" 2>/dev/null)" = "$ENVTEST-$ENVTEST_VERSION" ]
+        [ -f "$ENVTEST-$ENVTEST_VERSION" ] && [ -L "$ENVTEST" ] && [ "$(readlink "$ENVTEST")" = "setup-envtest-$ENVTEST_VERSION" ]
 
   test:
     desc: "Run Go tests"

diff --git a/auto-discovery/cloud-aws/Taskfile.yaml b/auto-discovery/cloud-aws/Taskfile.yaml
@@ -11,12 +11,11 @@ includes:
       COMPONENT_NAME: cloud-aws
       BINARY_NAME: service
       BUILD_CMD: cmd/service/main.go
-    flatten: true
 
 tasks:
   run:
     desc: "Run the cloud-aws service from your host"
-    deps: [fmt, vet]
+    deps: [base:fmt, base:vet]
     dir: '{{ .TASKFILE_DIR }}'
     cmds:
       - go run ./cmd/service/main.go --config auto-discovery-cloud-aws-config.yaml
@@ -30,8 +29,11 @@ tasks:
       - msg: "AWS_REGION environment variable is required"
         sh: '[ -n "$AWS_REGION" ]'
     cmds:
-      - task: base:helm-deploy
-        vars:
-          HELM_EXTRA_ARGS: |
-            --set="config.aws.queueUrl=${SQS_QUEUE_URL}" \
-            --set="config.aws.region=${AWS_REGION}"
+      - 'echo "Deploying cloud-aws with image tag ${IMG_TAG} into kind"'
+      - |
+        helm -n integration-tests upgrade --install cloud-aws ./ --wait \
+          --set="image.repository=docker.io/${IMG_NS}/cloud-aws" \
+          --set="image.tag=${IMG_TAG}" \
+          --set="image.pullPolicy=IfNotPresent" \
+          --set="config.aws.queueUrl=${SQS_QUEUE_URL}" \
+          --set="config.aws.region=${AWS_REGION}"
diff --git a/auto-discovery/kubernetes/Taskfile.yaml b/auto-discovery/kubernetes/Taskfile.yaml
@@ -11,7 +11,6 @@ includes:
       COMPONENT_NAME: kubernetes
       BINARY_NAME: manager
       BUILD_CMD: main.go
-    flatten: true
 
 env:
   IMG_NS: securecodebox
@@ -20,6 +19,11 @@ env:
 
 vars:
   CONTROLLER_TOOLS_VERSION: v0.18.0
+  ENVTEST_K8S_VERSION:
+    sh: |
+      cd {{ .TASKFILE_DIR }} && \
+      v=$(go list -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' k8s.io/api 2>/dev/null); \
+      printf '%s\n' "$v" | sed -E 's/^v?[0-9]+\.([0-9]+).*/1.\1/'
   ENVTEST_VERSION:
     sh: |
       cd {{ .TASKFILE_DIR }} && \
@@ -36,19 +40,19 @@ tasks:
       - |
         CONTROLLER_GEN={{ .LOCALBIN }}/controller-gen
         CONTROLLER_TOOLS_VERSION={{ .CONTROLLER_TOOLS_VERSION }}
-        if [ -f "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION" ] && [ "$(readlink -- "$CONTROLLER_GEN" 2>/dev/null)" = "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION" ]; then
+        if [ -f "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION" ] && [ -L "$CONTROLLER_GEN" ] && [ "$(readlink "$CONTROLLER_GEN")" = "controller-gen-$CONTROLLER_TOOLS_VERSION" ]; then
           exit 0
         fi
         echo "Downloading controller-gen@$CONTROLLER_TOOLS_VERSION"
-        rm -f "$CONTROLLER_GEN"
+        rm -f "$CONTROLLER_GEN" "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION"
         GOBIN={{ .LOCALBIN }} go install sigs.k8s.io/controller-tools/cmd/controller-gen@$CONTROLLER_TOOLS_VERSION
         mv "{{ .LOCALBIN }}/controller-gen" "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION"
-        ln -sf "$(realpath "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION")" "$CONTROLLER_GEN"
+        ln -sf "controller-gen-$CONTROLLER_TOOLS_VERSION" "$CONTROLLER_GEN"
     status:
       - |
         CONTROLLER_GEN={{ .LOCALBIN }}/controller-gen
         CONTROLLER_TOOLS_VERSION={{ .CONTROLLER_TOOLS_VERSION }}
-        [ -f "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION" ] && [ "$(readlink -- "$CONTROLLER_GEN" 2>/dev/null)" = "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION" ]
+        [ -f "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION" ] && [ -L "$CONTROLLER_GEN" ] && [ "$(readlink "$CONTROLLER_GEN")" = "controller-gen-$CONTROLLER_TOOLS_VERSION" ]
 
   manifests:
     desc: "Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects"
@@ -62,16 +66,26 @@ tasks:
           output:rbac:artifacts:config=templates/rbac
 
   test:
-    desc: "Run tests with manifests generation"
-    deps: [manifests, base:test]
+    desc: "Run Go tests with manifests generation"
+    deps: [manifests, base:fmt, base:vet, base:envtest]
+    dir: '{{ .TASKFILE_DIR }}'
+    cmds:
+      - |
+        KUBEBUILDER_ASSETS="$({{ .LOCALBIN }}/setup-envtest use {{ .ENVTEST_K8S_VERSION }} --bin-dir {{ .LOCALBIN }} -p path)" \
+        go test ./... -coverprofile cover.out
 
   ginkgo:
-    desc: "Run Ginkgo tests with manifests generation"
-    deps: [manifests, base:ginkgo]
+    desc: "Run Ginkgo tests with verbose output and manifests generation"
+    deps: [manifests, base:fmt, base:vet, base:envtest]
+    dir: '{{ .TASKFILE_DIR }}'
+    cmds:
+      - |
+        KUBEBUILDER_ASSETS="$({{ .LOCALBIN }}/setup-envtest use {{ .ENVTEST_K8S_VERSION }} --bin-dir {{ .LOCALBIN }} -p path)" \
+        ginkgo test ./... -coverprofile cover.out -v --progress
 
   run:
     desc: "Run the kubernetes auto-discovery controller from your host"
-    deps: [manifests, fmt, vet]
+    deps: [manifests, base:fmt, base:vet]
     dir: '{{ .TASKFILE_DIR }}'
     cmds:
       - go run ./main.go --config ./auto-discovery-config.yaml

diff --git a/operator/Taskfile.yaml b/operator/Taskfile.yaml
@@ -34,19 +34,19 @@ tasks:
       - |
         CONTROLLER_GEN={{ .LOCALBIN }}/controller-gen
         CONTROLLER_TOOLS_VERSION={{ .CONTROLLER_TOOLS_VERSION }}
-        if [ -f "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION" ] && [ "$(readlink -- "$CONTROLLER_GEN" 2>/dev/null)" = "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION" ]; then
+        if [ -f "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION" ] && [ -L "$CONTROLLER_GEN" ] && [ "$(readlink "$CONTROLLER_GEN")" = "controller-gen-$CONTROLLER_TOOLS_VERSION" ]; then
           exit 0
         fi
         echo "Downloading controller-gen@$CONTROLLER_TOOLS_VERSION"
-        rm -f "$CONTROLLER_GEN"
+        rm -f "$CONTROLLER_GEN" "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION"
         GOBIN={{ .LOCALBIN }} go install sigs.k8s.io/controller-tools/cmd/controller-gen@$CONTROLLER_TOOLS_VERSION
         mv "{{ .LOCALBIN }}/controller-gen" "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION"
-        ln -sf "$(realpath "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION")" "$CONTROLLER_GEN"
+        ln -sf "controller-gen-$CONTROLLER_TOOLS_VERSION" "$CONTROLLER_GEN"
     status:
       - |
         CONTROLLER_GEN={{ .LOCALBIN }}/controller-gen
         CONTROLLER_TOOLS_VERSION={{ .CONTROLLER_TOOLS_VERSION }}
-        [ -f "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION" ] && [ "$(readlink -- "$CONTROLLER_GEN" 2>/dev/null)" = "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION" ]
+        [ -f "$CONTROLLER_GEN-$CONTROLLER_TOOLS_VERSION" ] && [ -L "$CONTROLLER_GEN" ] && [ "$(readlink "$CONTROLLER_GEN")" = "controller-gen-$CONTROLLER_TOOLS_VERSION" ]
 
   envtest:
     desc: "Download setup-envtest locally if necessary"
@@ -56,19 +56,19 @@ tasks:
       - |
         ENVTEST={{ .LOCALBIN }}/setup-envtest
         ENVTEST_VERSION={{ .ENVTEST_VERSION }}
-        if [ -f "$ENVTEST-$ENVTEST_VERSION" ] && [ "$(readlink -- "$ENVTEST" 2>/dev/null)" = "$ENVTEST-$ENVTEST_VERSION" ]; then
+        if [ -f "$ENVTEST-$ENVTEST_VERSION" ] && [ -L "$ENVTEST" ] && [ "$(readlink "$ENVTEST")" = "setup-envtest-$ENVTEST_VERSION" ]; then
           exit 0
         fi
         echo "Downloading setup-envtest@$ENVTEST_VERSION"
-        rm -f "$ENVTEST"
+        rm -f "$ENVTEST" "$ENVTEST-$ENVTEST_VERSION"
         GOBIN={{ .LOCALBIN }} go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$ENVTEST_VERSION
         mv "{{ .LOCALBIN }}/setup-envtest" "$ENVTEST-$ENVTEST_VERSION"
-        ln -sf "$(realpath "$ENVTEST-$ENVTEST_VERSION")" "$ENVTEST"
+        ln -sf "setup-envtest-$ENVTEST_VERSION" "$ENVTEST"
     status:
       - |
         ENVTEST={{ .LOCALBIN }}/setup-envtest
         ENVTEST_VERSION={{ .ENVTEST_VERSION }}
-        [ -f "$ENVTEST-$ENVTEST_VERSION" ] && [ "$(readlink -- "$ENVTEST" 2>/dev/null)" = "$ENVTEST-$ENVTEST_VERSION" ]
+        [ -f "$ENVTEST-$ENVTEST_VERSION" ] && [ -L "$ENVTEST" ] && [ "$(readlink "$ENVTEST")" = "setup-envtest-$ENVTEST_VERSION" ]
 
   manifests:
     desc: "Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects"