From 36543816105aae1cfa73775e02c701c4d0e2e275 Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:35:37 +0100
Subject: [PATCH 1/4] feat(tools): install yq

---
 tools/Dockerfile  | 9 +++++++--
 tools/versions.py | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tools/Dockerfile b/tools/Dockerfile
index c13ce644a..11d66b92d 100644
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -7,6 +7,7 @@ ARG PRODUCT
 ARG KUBECTL_VERSION
 ARG RELEASE
 ARG JQ_VERSION
+ARG YQ_VERSION
 ARG TARGETARCH
 ARG STACKABLE_USER_UID
 
@@ -36,14 +37,18 @@ ENV PATH=/stackable/bin:$PATH
 
 # Get latest stable version from curl -L -s https://dl.k8s.io/release/stable.txt
 RUN <<EOF
-curl "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl" \
+curl --fail -L "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl" \
     -o /stackable/bin/kubectl
 chmod +x /stackable/bin/kubectl
 
-curl "https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64" \
+curl --fail -L "https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64" \
     -o /stackable/bin/jq
 chmod +x /stackable/bin/jq
 
+curl --fail -L "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_${TARGETARCH}" \
+    -o /stackable/bin/yq
+chmod +x /stackable/bin/yq
+
 # All files and folders owned by root group to support running as arbitrary users.
 # This is best practice as all container users will belong to the root group (0).
 chown -R ${STACKABLE_USER_UID}:0 /stackable
diff --git a/tools/versions.py b/tools/versions.py
index a70048650..6fd96cda0 100644
--- a/tools/versions.py
+++ b/tools/versions.py
@@ -4,5 +4,6 @@
         "kubectl_version": "1.31.1",
         "jq_version": "1.7.1",
         "stackable-base": "1.0.0",
+        "yq_version": "4.44.3",
     },
 ]

From 5f8637da1ecb54400b2efd655638614275b473eb Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:37:36 +0100
Subject: [PATCH 2/4] changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bec3f7b19..b8a18d78d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file.
 - kafka: Add cyrus-sasl-gssapi package for kerberos ([#874]).
 - spark: Add HBase connector ([#878], [#882]).
 - hbase: hbase-entrypoint.sh script to start and gracefully stop services ([#898]).
+- tools: install yq command line tool for YAML manipulation ([#912]).
 
 ### Changed
 
@@ -95,6 +96,7 @@ All notable changes to this project will be documented in this file.
 [#903]: https://github.com/stackabletech/docker-images/pull/903
 [#907]: https://github.com/stackabletech/docker-images/pull/907
 [#910]: https://github.com/stackabletech/docker-images/pull/910
+[#912]: https://github.com/stackabletech/docker-images/pull/912
 
 ## [24.7.0] - 2024-07-24
 

From 00125d2e1d0adc97c177dcf7ec567f1b0bdd7b26 Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Tue, 29 Oct 2024 16:17:35 +0100
Subject: [PATCH 3/4] review feedback

---
 tools/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/Dockerfile b/tools/Dockerfile
index 11d66b92d..670315305 100644
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -37,15 +37,15 @@ ENV PATH=/stackable/bin:$PATH
 
 # Get latest stable version from curl -L -s https://dl.k8s.io/release/stable.txt
 RUN <<EOF
-curl --fail -L "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl" \
+curl "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl" \
     -o /stackable/bin/kubectl
 chmod +x /stackable/bin/kubectl
 
-curl --fail -L "https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64" \
+curl "https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64" \
     -o /stackable/bin/jq
 chmod +x /stackable/bin/jq
 
-curl --fail -L "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_${TARGETARCH}" \
+curl "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_${TARGETARCH}" \
     -o /stackable/bin/yq
 chmod +x /stackable/bin/yq
 

From a3a17b51683bb98bbe71999986b39905af9bf59d Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Tue, 29 Oct 2024 21:14:07 +0100
Subject: [PATCH 4/4] explain why yq is needed

---
 tools/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/Dockerfile b/tools/Dockerfile
index 670315305..22ef5aa5c 100644
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -45,6 +45,8 @@ curl "https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux
     -o /stackable/bin/jq
 chmod +x /stackable/bin/jq
 
+# Needed to to patch manifests in OLM environments with tolerations
+# and environment variables.
 curl "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_${TARGETARCH}" \
     -o /stackable/bin/yq
 chmod +x /stackable/bin/yq