diff --git a/.github/workflows/kubeconform.yaml b/.github/workflows/kubeconform.yaml index ad5e6613..54cba2c5 100644 --- a/.github/workflows/kubeconform.yaml +++ b/.github/workflows/kubeconform.yaml @@ -25,4 +25,4 @@ jobs: - name: Run kubeconform shell: bash - run: ./.github/scripts/kubeconform.sh ${{ env.KUBERNETES_DIR }} + run: bash ./scripts/kubeconform.sh ${{ env.KUBERNETES_DIR }} diff --git a/.taskfiles/Kubernetes/Taskfile.yaml b/.taskfiles/Kubernetes/Taskfile.yaml index 8050f2a0..7b104a86 100644 --- a/.taskfiles/Kubernetes/Taskfile.yaml +++ b/.taskfiles/Kubernetes/Taskfile.yaml @@ -3,7 +3,7 @@ version: "3" vars: - KUBECONFORM_SCRIPT: "{{.TASKFILE_DIR}}/.taskfiles/Kubernetes/kubeconform.sh" + KUBECONFORM_SCRIPT: "{{.SCRIPTS_DIR}}/kubeconform.sh" tasks: @@ -26,10 +26,12 @@ tasks: kubeconform: desc: Validate Kubernetes manifests with kubeconform - cmd: bash {{.KUBECONFORM_SCRIPT}} {{.KUBERNETES_DIR}} + cmd: | + if [ -d "{{.KUBERNETES_DIR}}" ]; then + bash {{.KUBECONFORM_SCRIPT}} {{.KUBERNETES_DIR}} + fi preconditions: - { msg: "Missing kubeconform script", sh: "test -f {{.KUBECONFORM_SCRIPT}}" } - - { msg: "Missing kubernetes directory", sh: "test -d {{.KUBERNETES_DIR}}" } .reset: internal: true diff --git a/Taskfile.yaml b/Taskfile.yaml index 16f4b4ac..9885eb28 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -8,6 +8,7 @@ vars: BOOTSTRAP_DIR: "{{.ROOT_DIR}}/bootstrap" KUBERNETES_DIR: "{{.ROOT_DIR}}/kubernetes" PRIVATE_DIR: "{{.ROOT_DIR}}/.private" + SCRIPTS_DIR: "{{.ROOT_DIR}}/scripts" # Files AGE_FILE: "{{.ROOT_DIR}}/age.key" BOOTSTRAP_CONFIG_FILE: "{{.BOOTSTRAP_DIR}}/vars/config.yaml" diff --git a/.taskfiles/Kubernetes/kubeconform.sh b/scripts/kubeconform.sh similarity index 100% rename from .taskfiles/Kubernetes/kubeconform.sh rename to scripts/kubeconform.sh