From e60e0a74c2b5827b0f076597bcf750f3155a0524 Mon Sep 17 00:00:00 2001 From: CBC <44186296+cbconne@users.noreply.github.com> Date: Wed, 29 Jun 2022 21:53:56 +0800 Subject: [PATCH 1/4] [FIX] chg makefile version (#1624) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2ae6c803..a48e9de2 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ PACKAGE := github.com/derailed/$(NAME) GIT_REV ?= $(shell git rev-parse --short HEAD) SOURCE_DATE_EPOCH ?= $(shell date +%s) DATE ?= $(shell date -u -d @${SOURCE_DATE_EPOCH} +"%Y-%m-%dT%H:%M:%SZ") -VERSION ?= v0.25.19 +VERSION ?= v0.25.20 IMG_NAME := derailed/k9s IMAGE := ${IMG_NAME}:${VERSION} From 34bbedbf69178a71b43ec3262505a03439011a33 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" <53131727+bryanasdev000@users.noreply.github.com> Date: Wed, 29 Jun 2022 10:54:29 -0300 Subject: [PATCH 2/4] Fix reference to base image in Dockerfile (#1629) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2ed1b87b..338157d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # ----------------------------------------------------------------------------- # The base image for building the k9s binary -FROM golang:1.17-alpine3.16.0 AS build +FROM golang:1.17-alpine3.16 AS build WORKDIR /k9s COPY go.mod go.sum main.go Makefile ./ From 2deec5c2b9378fb5d19909519f5a292d5cae37d1 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" <53131727+bryanasdev000@users.noreply.github.com> Date: Wed, 29 Jun 2022 16:47:33 -0300 Subject: [PATCH 3/4] Fix TestToAge (#1627) --- internal/render/helpers_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/render/helpers_test.go b/internal/render/helpers_test.go index 168d1ac7..9d2acd24 100644 --- a/internal/render/helpers_test.go +++ b/internal/render/helpers_test.go @@ -98,7 +98,7 @@ func TestToAge(t *testing.T) { }, "good": { t: testTime().Add(-10 * time.Second), - e: "3y196d", + e: "3y197d", }, } From 7c5ba99cc1fe8ab57f964e7e443eef549a1e0888 Mon Sep 17 00:00:00 2001 From: Christian Provenzano <18606244+caproven@users.noreply.github.com> Date: Thu, 30 Jun 2022 13:22:54 -0400 Subject: [PATCH 4/4] Fix delete dialog dropdown styling (#1632) * Fix delete dialog dropdown styling Update tview to allow dropdown styling * Update tview --- go.mod | 2 +- go.sum | 4 ++++ internal/ui/dialog/delete.go | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e4d5956f..84080044 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/cenkalti/backoff v2.2.1+incompatible github.com/cenkalti/backoff/v4 v4.1.3 github.com/derailed/popeye v0.10.1 - github.com/derailed/tview v0.6.6 + github.com/derailed/tview v0.7.1 github.com/fatih/color v1.13.0 github.com/fsnotify/fsnotify v1.5.1 github.com/fvbommel/sortorder v1.0.1 diff --git a/go.sum b/go.sum index 7dd87699..7dd07a61 100644 --- a/go.sum +++ b/go.sum @@ -185,6 +185,10 @@ github.com/derailed/tcell/v2 v2.3.1-rc.2 h1:9TmZB/IwL3MA1Jf4pC4rfMaPTcVYIN62IwE7 github.com/derailed/tcell/v2 v2.3.1-rc.2/go.mod h1:wegJ+SscH+jPjEQIAV/dI/grLTRm5R4IE2M479NDSL0= github.com/derailed/tview v0.6.6 h1:hNqBewhRTYRgfLp1p5KGw0DFdbGMS68iocBSmGGNg4s= github.com/derailed/tview v0.6.6/go.mod h1:A1LXWlbx/YDMXr3GVTy+IgclAkBssJpw/FiZ7aqUgzU= +github.com/derailed/tview v0.7.0 h1:xKdhWvyWWXau8gWgQmFEaflooPwxaX0wFpfsoBxEnos= +github.com/derailed/tview v0.7.0/go.mod h1:zH4i4fRLbUKOuqQwdcMefak2YyAjUj9bmKsiKTMf9gg= +github.com/derailed/tview v0.7.1 h1:kV8nPWUpftbduH1hlPXqA/09iyyP9ZH6nSfZF9m+d8U= +github.com/derailed/tview v0.7.1/go.mod h1:zH4i4fRLbUKOuqQwdcMefak2YyAjUj9bmKsiKTMf9gg= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/distribution/distribution/v3 v3.0.0-20211118083504-a29a3c99a684 h1:DBZ2sN7CK6dgvHVpQsQj4sRMCbWTmd17l+5SUCjnQSY= diff --git a/internal/ui/dialog/delete.go b/internal/ui/dialog/delete.go index a24a2393..df26b245 100644 --- a/internal/ui/dialog/delete.go +++ b/internal/ui/dialog/delete.go @@ -38,6 +38,13 @@ func ShowDelete(styles config.Dialog, pages *ui.Pages, msg string, ok okFunc, ca f.AddDropDown("Propagation:", propagationOptions, defaultPropagationIdx, func(_ string, optionIndex int) { propagation = propagationOptions[optionIndex] }) + propField := f.GetFormItemByLabel("Propagation:").(*tview.DropDown) + propField.SetListStyles( + styles.FgColor.Color(), + styles.BgColor.Color(), + styles.ButtonFocusFgColor.Color(), + styles.ButtonFocusBgColor.Color(), + ) f.AddCheckbox("Force:", force, func(_ string, checked bool) { force = checked })