From 369952f38ef77b71e8cb704ab17143c364cd5fa6 Mon Sep 17 00:00:00 2001
From: Leonard Jonathan Oh <leonardjonathanoh@live.com>
Date: Sat, 20 Jul 2024 03:21:14 +0000
Subject: [PATCH] Fix: Fix `yq` variants

---
 generate/templates/Dockerfile.ps1                               | 2 +-
 .../1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile    | 2 +-
 .../1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile     | 2 +-
 .../1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile     | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
index d457a6d..9f26f7f 100755
--- a/generate/templates/Dockerfile.ps1
+++ b/generate/templates/Dockerfile.ps1
@@ -99,7 +99,7 @@ RUN apk add --no-cache openssh-client
 
         'yq' {
             @'
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 
 '@
diff --git a/variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index 0f669cf..d5959a6 100644
--- a/variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index fb66c5e..3ac0ed0 100644
--- a/variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index f6c0cc2..ec87992 100644
--- a/variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index 923e4ce..5012230 100644
--- a/variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index 304bc23..a7b7518 100644
--- a/variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index 5a2e99f..8f4453d 100644
--- a/variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index de77f21..621762b 100644
--- a/variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index bc190d7..98f447d 100644
--- a/variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index 597a601..1ba4163 100644
--- a/variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index 5175488..5623df9 100644
--- a/variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index b573117..9bb6f3e 100644
--- a/variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index 8dcb465..07d35c2 100644
--- a/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index 6d36ad0..9b9839e 100644
--- a/variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index f6bc5bc..1a7736f 100644
--- a/variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index 52b7a35..b18e2e7 100644
--- a/variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index c119c8f..62ae22f 100644
--- a/variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
index cf4acac..d071e5c 100644
--- a/variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
+++ b/variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile
@@ -51,7 +51,7 @@ RUN apk add --no-cache gnupg
 
 RUN apk add --no-cache openssh-client
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache yq
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh