From 272d487bdc5ac6ba5cbcf131b47542335f66082e Mon Sep 17 00:00:00 2001 From: GeorgeRaven Date: Tue, 8 Apr 2025 22:57:58 +0100 Subject: [PATCH] Flipped order and fixed final and --- .gitlab/.gitlab-ci.yaml | 2 +- .gitlab/helm/lint.yaml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab/.gitlab-ci.yaml b/.gitlab/.gitlab-ci.yaml index 9b3b7f89..8f1ccc9a 100644 --- a/.gitlab/.gitlab-ci.yaml +++ b/.gitlab/.gitlab-ci.yaml @@ -1,6 +1,6 @@ stages: - - scan - lint + - scan - build - test - deploy diff --git a/.gitlab/helm/lint.yaml b/.gitlab/helm/lint.yaml index 7f9eb382..053cc182 100644 --- a/.gitlab/helm/lint.yaml +++ b/.gitlab/helm/lint.yaml @@ -17,8 +17,7 @@ helm-chart-lint: [ "${dir}" != "${CHARTS_DIR}/gitea" ] && \ [ "${dir}" != "${CHARTS_DIR}/jupyterhub" ] && \ [ "${dir}" != "${CHARTS_DIR}/rook" ] && \ - [ "${dir}" != "${CHARTS_DIR}/teleport" ] && \ - ; then + [ "${dir}" != "${CHARTS_DIR}/teleport" ]; then helm template "${dir}"/ | yq 'del(.metadata.creationTimestamp) | del(.spec.template.metadata.creationTimestamp)' | kubeconform -strict -kubernetes-version ${K8S_VERSION} \ -schema-location './schemas/{{.Group}}/{{.ResourceKind}}_{{.ResourceAPIVersion}}.json' \ -schema-location default \