From 03a3c29f60fb0b1e693ff4b0553beec21754abe1 Mon Sep 17 00:00:00 2001
From: Brett Logan <lindluni@github.com>
Date: Sun, 8 Jan 2023 23:45:34 -0500
Subject: [PATCH] Use Docker to pull kubeconform

Signed-off-by: Brett Logan <lindluni@github.com>
---
 Dockerfile                                       | 16 +++++++++++-----
 .../{install-kubeval.sh => install-ktlint.sh}    | 11 -----------
 2 files changed, 11 insertions(+), 16 deletions(-)
 rename scripts/{install-kubeval.sh => install-ktlint.sh} (80%)

diff --git a/Dockerfile b/Dockerfile
index 318d2ca9..8b6bb792 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,7 @@ FROM cljkondo/clj-kondo:2023.01.12-alpine as clj-kondo
 FROM dotenvlinter/dotenv-linter:3.3.0 as dotenv-linter
 FROM ghcr.io/awkbar-devops/clang-format:v1.0.2 as clang-format
 FROM ghcr.io/terraform-linters/tflint-bundle:v0.44.1.0 as tflint
+FROM ghcr.io/yannh/kubeconform:v0.5.0 as kubeconfrm
 FROM golangci/golangci-lint:v1.50.1 as golangci-lint
 FROM hadolint/hadolint:latest-alpine as dockerfile-lint
 FROM hashicorp/terraform:1.3.7 as terraform
@@ -182,6 +183,11 @@ COPY --from=scalafmt /bin/scalafmt /usr/bin/
 ######################
 COPY --from=actionlint /usr/local/bin/actionlint /usr/bin/
 
+######################
+# Install kubeconform #
+######################
+COPY --from=kubeconfrm /kubeconform /usr/bin/
+
 #################
 # Install Lintr #
 #################
@@ -192,11 +198,11 @@ RUN /install-lintr.sh && rm -rf /install-lintr.sh
 # Store the key here because the above host is sometimes down, and breaks our builds
 COPY dependencies/sgerrand.rsa.pub /etc/apk/keys/sgerrand.rsa.pub
 
-###################
-# Install Kubeconform #
-###################
-COPY scripts/install-kubeval.sh /
-RUN --mount=type=secret,id=GITHUB_TOKEN /install-kubeval.sh && rm -rf /install-kubeval.sh
+##################
+# Install ktlint #
+##################
+COPY scripts/install-ktlint.sh /
+RUN --mount=type=secret,id=GITHUB_TOKEN /install-ktlint.sh && rm -rf /install-ktlint.sh
 
 #################################################
 # Install Raku and additional Edge dependencies #
diff --git a/scripts/install-kubeval.sh b/scripts/install-ktlint.sh
similarity index 80%
rename from scripts/install-kubeval.sh
rename to scripts/install-ktlint.sh
index be57f6e1..69f44fe9 100755
--- a/scripts/install-kubeval.sh
+++ b/scripts/install-ktlint.sh
@@ -2,17 +2,6 @@
 
 set -euo pipefail
 
-url=$(curl -s \
-  -H "Accept: application/vnd.github+json" \
-  -H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \
-  "https://api.github.com/repos/instrumenta/kubeval/releases/tags/${KUBEVAL_VERSION}" |
-  jq -r '.assets | .[] | select(.name | contains("linux-amd")) | .url')
-curl --retry 5 --retry-delay 5 -sL \
-  -H "Accept: application/octet-stream" \
-  -H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \
-  "${url}" | tar -xz
-mv kubeval /usr/local/bin
-
 ##################
 # Install ktlint #
 ##################