Merge branch 'include-yq-and-jsonnet-tools' into 'main'

feat: add yq and jsonnet-tool to the renovate build

See merge request gitlab-com/gl-infra/common-ci-tasks!135

.gitlab-ci-asdf-versions.yml

 # DO NOT MANUALLY EDIT; Run ./scripts/update-asdf-version-variables to update this
 variables:
     GL_ASDF_GOLANG_VERSION: 1.17.11
+    GL_ASDF_JSONNET_TOOL_VERSION: 1.7.0
     GL_ASDF_PRE_COMMIT_VERSION: 2.19.0
     GL_ASDF_SHELLCHECK_VERSION: 0.8.0
     GL_ASDF_SHFMT_VERSION: 3.5.0
+    GL_ASDF_YQ_VERSION: 4.25.2

.gitlab-ci-default-asdf-versions.yml

 # DO NOT MANUALLY EDIT; Run ./scripts/update-asdf-version-variables to update this
 variables:
     GL_COMMON_CI_TASKS_DEFAULT_ASDF_GOLANG_VERSION: 1.17.11
+    GL_COMMON_CI_TASKS_DEFAULT_ASDF_JSONNET_TOOL_VERSION: 1.7.0
     GL_COMMON_CI_TASKS_DEFAULT_ASDF_PRE_COMMIT_VERSION: 2.19.0
     GL_COMMON_CI_TASKS_DEFAULT_ASDF_SHELLCHECK_VERSION: 0.8.0
     GL_COMMON_CI_TASKS_DEFAULT_ASDF_SHFMT_VERSION: 3.5.0
+    GL_COMMON_CI_TASKS_DEFAULT_ASDF_YQ_VERSION: 4.25.2

.gitlab-ci.yml

@@ -17,6 +17,8 @@ include:
     KANIKO_BUILD_FILE: Dockerfile.renovate
     KANIKO_EXTRA_ARGS: |
       --build-arg GL_COMMON_CI_TASKS_DEFAULT_ASDF_GOLANG_VERSION
+      --build-arg GL_COMMON_CI_TASKS_DEFAULT_ASDF_JSONNET_TOOL_VERSION
+      --build-arg GL_COMMON_CI_TASKS_DEFAULT_ASDF_YQ_VERSION
   extends:
     - .kaniko_base

.tool-versions

@@ -3,7 +3,9 @@
 # NOTE: please add new plugins to ./scripts/install-asdf-plugins.sh when adding items here
 golang 1.17.11 # datasource=golang-version depName=golang/go
-shellcheck 0.8.0 # datasource=github-releases depName=koalaman/shellcheck
-shfmt 3.5.0 # datasource=github-releases depName=mvdan/sh
+jsonnet-tool 1.7.0 # datasource=gitlab-releases depName=gitlab-com/gl-infra/jsonnet-tool
 pre-commit 2.19.0 # datasource=github-releases depName=pre-commit/pre-commit
 python system
+shellcheck 0.8.0 # datasource=github-releases depName=koalaman/shellcheck
+shfmt 3.5.0 # datasource=github-releases depName=mvdan/sh
+yq 4.25.2 # datasource=github-releases depName=mikefarah/yq

Dockerfile.renovate

+ARG GL_COMMON_CI_TASKS_DEFAULT_ASDF_JSONNET_TOOL_VERSION
+ARG GL_COMMON_CI_TASKS_DEFAULT_ASDF_YQ_VERSION
+
+FROM registry.gitlab.com/gitlab-com/gl-infra/jsonnet-tool:v${GL_COMMON_CI_TASKS_DEFAULT_ASDF_JSONNET_TOOL_VERSION} AS jsonnet-tool
+FROM docker.io/mikefarah/yq:${GL_COMMON_CI_TASKS_DEFAULT_ASDF_YQ_VERSION} as yq
+
 # This image is used by asdf and renovate
 FROM ubuntu:21.04
 ARG GL_COMMON_CI_TASKS_DEFAULT_ASDF_GOLANG_VERSION
@@ -50,4 +56,7 @@ RUN curl -OL --fail https://storage.googleapis.com/golang/go${GL_COMMON_CI_TASKS
   && (tar -C /usr/local -xvf go${GL_COMMON_CI_TASKS_DEFAULT_ASDF_GOLANG_VERSION}.linux-amd64.tar.gz >/dev/null) \
   && ln -s /usr/local/go/bin/go /usr/local/bin/go
+COPY --from=jsonnet-tool /usr/local/bin/jsonnet-tool /bin/jsonnet-tool
+COPY --from=yq /usr/bin/yq /usr/bin/yq
+
 ENTRYPOINT [ "/bin/bash" ]

scripts/install-asdf-plugins.sh

@@ -32,3 +32,5 @@ install_plugin golang
 install_plugin shellcheck
 install_plugin shfmt
 install_plugin pre-commit
+install_plugin jsonnet-tool https://gitlab.com/gitlab-com/gl-infra/asdf-jsonnet-tool.git
+install_plugin yq