testing/k9s: upgrade to 0.21.7

2 files changed, 33 insertions, 5 deletions

diff --git a/testing/k9s/01-fix_action.patch b/testing/k9s/01-fix_action.patch
new file mode 100644
index 0000000000..5353f2489c
--- /dev/null
+++ b/testing/k9s/01-fix_action.patch
@@ -0,0 +1,24 @@
+# Fix build failure until it is upstreamed: https://github.com/derailed/k9s/issues/865
+
+From 43351ae8a51042aaf8ee987c4722178bdf4c5f9b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Trung=20L=C3=AA?= <trung.le@ruby-journal.com>
+Date: Tue, 8 Sep 2020 00:24:19 +1000
+Subject: [PATCH 1/2] Convert int to string using rune()
+
+---
+ internal/ui/action.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/internal/ui/action.go b/internal/ui/action.go
+index a98da5ef..072f5802 100644
+--- a/internal/ui/action.go
++++ b/internal/ui/action.go
+@@ -83,7 +83,7 @@ func (a KeyActions) Hints() model.MenuHints {
+                                },
+                        )
+                } else {
+-                       log.Error().Msgf("Unable to locate KeyName for %#v", string(k))
++                       log.Error().Msgf("Unable to locate KeyName for %#v", string(rune(k)))
+                }
+        }
+        return hh
diff --git a/testing/k9s/APKBUILD b/testing/k9s/APKBUILD
index 61ee59e6f4..6196d55e99 100644
--- a/testing/k9s/APKBUILD
+++ b/testing/k9s/APKBUILD
@@ -2,17 +2,20 @@
 # Maintainer: Galen Abell <galen@galenabell.com>
 pkgname=k9s
 _pkgname=github.com/derailed/k9s
-pkgver=0.20.2
+pkgver=0.21.7
 pkgrel=0
-_commit=218388c # git rev-parse --short HEAD
-_date=2020-06-02T15:50:42UTC # date -u -d @$(date +%s) +%FT%T%Z
+_commit=cc0e8e8 # git rev-parse --short HEAD
+_date=2020-09-06T17:07:54UTC # date -u -d @$(date +%s) +%FT%T%Z
 pkgdesc="Kubernetes TUI"
 url="https://k9scli.io"
 arch="all !x86 !mips64" # tests fail on x86 for some reason, missing go on mips
 license="Apache-2.0"
 makedepends="go"
 options="net chmod-clean"
-source="$pkgname-$pkgver.tar.gz::https://github.com/derailed/k9s/archive/v$pkgver.tar.gz"
+source="
+        $pkgname-$pkgver.tar.gz::https://github.com/derailed/k9s/archive/v$pkgver.tar.gz
+        01-fix_action.patch
+        "
 
 export GOPATH="$srcdir/go"
 export GOCACHE="$srcdir/go-build"
@@ -31,4 +34,5 @@ package() {
         install -Dm755 execs/$pkgname "$pkgdir"/usr/bin/$pkgname
 }
 
-sha512sums="4ba2dd5fbc7da084e33cd4688b6689395a13a2192867597dccf1057cb052598d03d87d03cd08d02e0c25f5cdaec786add2b0c019d8fbc0fd67841b3ae0993025  k9s-0.20.2.tar.gz"
+sha512sums="ea1ce0c84013ec9d46e98b9fa53be1e889aab3630dbd34c06f0d0ff45c30e89b5657182a0490a5832f2a91e17a1401c42bf3edc7f679c53acfcc494fbe1bf141  k9s-0.21.7.tar.gz
+9c2e637336aaf88dfc9202ae89b14979d6cb99c0a4c9945e4ba75077dc99d3534b2c8cf0f6d4d818fc29c476ab3c6253e873c11ce3aa1db11777a698cd4a8a6a  01-fix_action.patch"