diff --git a/.tool-versions b/.tool-versions index 71cd3e32..88723b82 100644 --- a/.tool-versions +++ b/.tool-versions @@ -7,5 +7,4 @@ helm-ct 3.11.0 kubeconform 0.6.7 kustomize 5.5.0 mockery 2.46.3 -staticcheck 2024.1.1 tilt 0.33.2 diff --git a/Earthfile b/Earthfile index 2193fcdf..71230623 100644 --- a/Earthfile +++ b/Earthfile @@ -8,7 +8,6 @@ test: ci-golang: BUILD +fmt-golang - BUILD +staticcheck-golang BUILD +golang-ci-lint BUILD +validate-golang BUILD +test-golang @@ -173,28 +172,6 @@ golang-ci-lint: RUN golangci-lint --timeout 15m run --verbose -staticcheck-golang: - ARG --required STATICCHECK_VERSION - - FROM +go-deps - - # install staticcheck - RUN FILE=staticcheck.tgz \ - && URL=https://github.com/dominikh/go-tools/releases/download/$STATICCHECK_VERSION/staticcheck_linux_$USERARCH.tar.gz \ - && wget ${URL} \ - --output-document ${FILE} \ - && tar \ - --extract \ - --verbose \ - --directory /bin \ - --strip-components=1 \ - --file ${FILE} \ - && staticcheck -version - - WORKDIR /src - COPY . /src - RUN staticcheck ./... - test-helm: ARG CHART_TESTING_VERSION="3.7.1" FROM quay.io/helmpack/chart-testing:v${CHART_TESTING_VERSION} diff --git a/Tiltfile b/Tiltfile index fa209f09..d5663969 100644 --- a/Tiltfile +++ b/Tiltfile @@ -188,7 +188,6 @@ earthly_build( '--HELM_VERSION='+tool_versions.get('helm'), '--KUBECONFORM_VERSION='+tool_versions.get('kubeconform'), '--KUSTOMIZE_VERSION='+tool_versions.get('kustomize'), - '--STATICCHECK_VERSION='+tool_versions.get('staticcheck'), '--GIT_COMMIT='+git_commit, ], ) @@ -208,7 +207,7 @@ cmd_button('restart-pod', ) -helm_resource(name='kubechecks', +helm_resource(name='kubechecks', chart='./charts/kubechecks', image_deps=['kubechecks'], image_keys=[('deployment.image.name', 'deployment.image.tag')], diff --git a/earthly.sh b/earthly.sh index 1632fd09..84a56b1a 100755 --- a/earthly.sh +++ b/earthly.sh @@ -38,6 +38,5 @@ earthly $* \ --HELM_VERSION=${helm_tool_version} \ --KUBECONFORM_VERSION=${kubeconform_tool_version} \ --KUSTOMIZE_VERSION=${kustomize_tool_version} \ - --STATICCHECK_VERSION=${staticcheck_tool_version} \ --GIT_COMMIT=$(git rev-parse --short HEAD) \ --KUBECHECKS_LOG_LEVEL=debug