From f04c49aa9c4b4f56d8cf95ecce1042563f6bbcc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= <jerome.petazzoni@gmail.com>
Date: Tue, 12 Apr 2022 20:44:38 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20Update=20kubeseal=20ver?=
 =?UTF-8?q?sion;=20don't=20install=20krew=20on=20ia32?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile  | 13 ++++++++-----
 helper-curl |  5 -----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 597f0c2..e38e313 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,9 +64,9 @@ RUN cp $(find bin -name kube-linter) /usr/local/bin
 
 # https://github.com/bitnami-labs/sealed-secrets/releases
 FROM builder AS kubeseal
-ARG KUBESEAL_VERSION=0.16.0
-RUN helper-curl bin kubeseal \
-    https://github.com/bitnami-labs/sealed-secrets/releases/download/v$KUBESEAL_VERSION/kubeseal-@KSARCH
+ARG KUBESEAL_VERSION=0.17.4
+RUN helper-curl tar kubeseal \
+    https://github.com/bitnami-labs/sealed-secrets/releases/download/v$KUBESEAL_VERSION/kubeseal-$KUBESEAL_VERSION-linux-@GOARCH.tar.gz
 
 # https://github.com/kubernetes-sigs/kustomize/releases
 FROM builder AS kustomize
@@ -173,12 +173,15 @@ RUN echo k8s:x:1000: >> /etc/group \
  && chown -R k8s:k8s /home/k8s/ \
  && sed -i 's/#MaxAuthTries 6/MaxAuthTries 42/' /etc/ssh/sshd_config
 ARG TARGETARCH
-RUN mkdir /tmp/krew \
+RUN \
+ if [ "$TARGETARCH" != "386" ]; then \
+ mkdir /tmp/krew \
  && cd /tmp/krew \
  && curl -fsSL https://github.com/kubernetes-sigs/krew/releases/latest/download/krew-linux_$TARGETARCH.tar.gz | tar -zxf- \
  && sudo -u k8s -H ./krew-linux_$TARGETARCH install krew \
  && cd \
- && rm -rf /tmp/krew
+ && rm -rf /tmp/krew \
+ ; fi
 COPY --chown=1000:1000 bash_profile /home/k8s/.bash_profile
 COPY --chown=1000:1000 vimrc /home/k8s/.vimrc
 COPY motd /etc/motd
diff --git a/helper-curl b/helper-curl
index 1e9d070..120c83e 100755
--- a/helper-curl
+++ b/helper-curl
@@ -9,26 +9,22 @@ URL=$3
 case $TARGETARCH in
 amd64)
   GOARCH=amd64
-  KSARCH=linux-amd64
   UARCH=x86_64
   WTFARCH=x86_64
   ;;
 arm64)
   GOARCH=arm64
-  KSARCH=arm64
   UARCH=aarch64
   WTFARCH=arm64
   ;;
 arm)
   GOARCH=arm
-  KSARCH=arm
   UARCH=armv7
   WTFARCH=arm
   ;;
 *)
   echo "Unsupported architecture: $TARGETARCH."
   GOARCH=$TARGETARCH
-  KSARCH=$TARGETARCH
   UARCH=$TARGETARCH
   WTFARCH=$TARGETARCH
   ;;
@@ -37,7 +33,6 @@ esac
 mangle() {
   echo $1 | sed \
   -e s/@GOARCH/$GOARCH/g \
-  -e s/@KSARCH/$KSARCH/g \
   -e s/@UARCH/$UARCH/g \
   -e s/@WTFARCH/$WTFARCH/g \
   #