From e49cf3256422a22bc0ad5006c07947fce0ff98fc Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 10 Sep 2019 12:30:05 -0700 Subject: [PATCH 1/3] add kill resource key binding --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 14e1da00..5edacb06 100644 --- a/README.md +++ b/README.md @@ -195,6 +195,8 @@ K9s uses aliases to navigate most K8s resources. | `` | Bails out of command mode | | | `d`,`v`, `e`, `l`,... | Key mapping to describe, view, edit, view logs,... | `d` (describes a resource) | | `:`ctx`` | To view and switch to another Kubernetes context | `:`+`ctx`+`` | +| `Ctrl-d` | To delete a resource (TAB and ENTER to confirm) | | +| `Ctrl-k` | To delete a resource (no confirmation dialog) | | | `:q`, `Ctrl-c` | To bail out of K9s | | --- From 680aa309337401e6f2bfe1641af59a9770d74a0d Mon Sep 17 00:00:00 2001 From: fridokus Date: Wed, 18 Sep 2019 09:06:09 +0200 Subject: [PATCH 2/3] Fix typo Peristent -> Persistent --- internal/k8s/pv.go | 22 +++++++++++----------- internal/resource/pv.go | 2 +- internal/resource/pv_test.go | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/k8s/pv.go b/internal/k8s/pv.go index 2939e17e..91951a93 100644 --- a/internal/k8s/pv.go +++ b/internal/k8s/pv.go @@ -4,24 +4,24 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// PeristentVolume represents a Kubernetes PersistentVolume. -type PeristentVolume struct { +// PersistentVolume represents a Kubernetes PersistentVolume. +type PersistentVolume struct { *base Connection } -// NewPersistentVolume returns a new PeristentVolume. -func NewPersistentVolume(c Connection) *PeristentVolume { - return &PeristentVolume{&base{}, c} +// NewPersistentVolume returns a new PersistentVolume. +func NewPersistentVolume(c Connection) *PersistentVolume { + return &PersistentVolume{&base{}, c} } -// Get a PeristentVolume. -func (p *PeristentVolume) Get(_, n string) (interface{}, error) { +// Get a PersistentVolume. +func (p *PersistentVolume) Get(_, n string) (interface{}, error) { return p.DialOrDie().CoreV1().PersistentVolumes().Get(n, metav1.GetOptions{}) } -// List all PeristentVolumes in a given namespace. -func (p *PeristentVolume) List(_ string) (Collection, error) { +// List all PersistentVolumes in a given namespace. +func (p *PersistentVolume) List(_ string) (Collection, error) { opts := metav1.ListOptions{ LabelSelector: p.labelSelector, FieldSelector: p.fieldSelector, @@ -39,7 +39,7 @@ func (p *PeristentVolume) List(_ string) (Collection, error) { return cc, nil } -// Delete a PeristentVolume. -func (p *PeristentVolume) Delete(_, n string, cascade, force bool) error { +// Delete a PersistentVolume. +func (p *PersistentVolume) Delete(_, n string, cascade, force bool) error { return p.DialOrDie().CoreV1().PersistentVolumes().Delete(n, nil) } diff --git a/internal/resource/pv.go b/internal/resource/pv.go index 8a9cd58c..2701bb1c 100644 --- a/internal/resource/pv.go +++ b/internal/resource/pv.go @@ -59,7 +59,7 @@ func (r *PersistentVolume) Marshal(path string) (string, error) { pv := i.(*v1.PersistentVolume) pv.TypeMeta.APIVersion = "v1" - pv.TypeMeta.Kind = "PeristentVolume" + pv.TypeMeta.Kind = "PersistentVolume" return r.marshalObject(pv) } diff --git a/internal/resource/pv_test.go b/internal/resource/pv_test.go index e794c8d4..85dbaac1 100644 --- a/internal/resource/pv_test.go +++ b/internal/resource/pv_test.go @@ -97,7 +97,7 @@ func newPV() resource.Columnar { func pvYaml() string { return `apiVersion: v1 -kind: PeristentVolume +kind: PersistentVolume metadata: creationTimestamp: "2018-12-14T17:36:43Z" name: fred From dea1709222273c13bc905fee0a55cff5f26f4788 Mon Sep 17 00:00:00 2001 From: fridokus Date: Wed, 18 Sep 2019 09:08:31 +0200 Subject: [PATCH 3/3] Add vim undo files to .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 61c9bfdd..228be317 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ popeye1.go gen.sh cluster_info_test.go *.test -*.log \ No newline at end of file +*.log +*~