[chore] refactor k8s client

Author: robinovitch61

cmd/cmd.go

@@ -289,8 +289,14 @@ func getKubeConfigPath(cmd *cobra.Command) string {
 	return filepath.Join(homeDir(), ".kube", "config")
 }
 
-func getKubeContexts(cmd *cobra.Command) string {
-	return cmd.Flags().Lookup("context").Value.String()
+func getKubeContexts(cmd *cobra.Command) []string {
+	contextsString := cmd.Flags().Lookup("context").Value.String()
+	trimmed := strings.Trim(strings.TrimSpace(contextsString), ",")
+	var contexts []string
+	if len(trimmed) > 0 {
+		contexts = strings.Split(trimmed, ",")
+	}
+	return contexts
 }
 
 func getDescending(cmd *cobra.Command) bool {
@@ -353,8 +359,14 @@ func getLogFilter(cmd *cobra.Command) model.LogFilter {
 	return model.LogFilter{}
 }
 
-func getNamespaces(cmd *cobra.Command) string {
-	return cmd.Flags().Lookup("namespace").Value.String()
+func getNamespaces(cmd *cobra.Command) []string {
+	namespacesString := cmd.Flags().Lookup("namespace").Value.String()
+	trimmed := strings.Trim(strings.TrimSpace(namespacesString), ",")
+	var namespaces []string
+	if len(trimmed) > 0 {
+		namespaces = strings.Split(trimmed, ",")
+	}
+	return namespaces
 }
 
 func getSelector(cmd *cobra.Command) labels.Selector {

internal/app.go

@@ -12,7 +12,7 @@ import (
 	"github.com/robinovitch61/kl/internal/constants"
 	"github.com/robinovitch61/kl/internal/dev"
 	"github.com/robinovitch61/kl/internal/fileio"
-	"github.com/robinovitch61/kl/internal/k8s"
+	"github.com/robinovitch61/kl/internal/k8s/client"
 	"github.com/robinovitch61/kl/internal/keymap"
 	"github.com/robinovitch61/kl/internal/message"
 	"github.com/robinovitch61/kl/internal/model"
@@ -30,7 +30,6 @@ import (
 type Model struct {
 	config               Config
 	keyMap               keymap.KeyMap
-	allClusterNamespaces []model.ClusterNamespaces
 	width, height        int
 	initialized          bool
 	stylesLoaded         bool
@@ -44,10 +43,10 @@ type Model struct {
 	containerToShortName func(model.Container) (model.PageLogContainerName, error)
 	containerIdToColors  map[string]model.ContainerColors
 	pageLogBuffer        []model.PageLog
-	client               k8s.Client
+	client               client.Client
 	cancel               context.CancelFunc
 	pages                map[page.Type]page.GenericPage
-	containerListeners   []model.ContainerListener
+	containerListeners   []client.ContainerListener
 	focusedPageType      page.Type
 	rightPageType        page.Type
 	fullScreen           bool
@@ -381,8 +380,8 @@ func (m Model) changeFocusedPage(newPage page.Type) (Model, tea.Cmd) {
 func (m Model) cleanupCmd() tea.Cmd {
 	return func() tea.Msg {
 		for _, cl := range m.containerListeners {
-			if cl.CleanupFunc != nil {
-				cl.CleanupFunc()
+			if cl.Stop != nil {
+				cl.Stop()
 			}
 		}
 
@@ -619,7 +618,7 @@ func (m Model) doSelectionActions(selectionActions map[model.Entity]bool) (Model
 	return m, tea.Batch(cmds...)
 }
 
-func (m Model) getStartLogScannerCmd(client k8s.Client, entity model.Entity, sinceTime time.Time) (Model, tea.Cmd) {
+func (m Model) getStartLogScannerCmd(client client.Client, entity model.Entity, sinceTime time.Time) (Model, tea.Cmd) {
 	// ensure the entity is a container
 	err := entity.AssertIsContainer()
 	if err != nil {

internal/command/container.go

@@ -3,19 +3,19 @@ package command
 import (
 	"fmt"
 	tea "github.com/charmbracelet/bubbletea/v2"
-	"github.com/robinovitch61/kl/internal/k8s"
+	"github.com/robinovitch61/kl/internal/k8s/client"
 	"github.com/robinovitch61/kl/internal/model"
 	"k8s.io/apimachinery/pkg/labels"
 	"time"
 )
 
 type GetContainerListenerMsg struct {
-	Listener model.ContainerListener
+	Listener client.ContainerListener
 	Err      error
 }
 
 func GetContainerListenerCmd(
-	client k8s.Client,
+	client client.Client,
 	cluster, namespace string,
 	matchers model.Matchers,
 	selector labels.Selector,
@@ -35,14 +35,14 @@ func GetContainerListenerCmd(
 }
 
 type GetContainerDeltasMsg struct {
-	Listener model.ContainerListener
+	Listener client.ContainerListener
 	DeltaSet model.ContainerDeltaSet
 	Err      error
 }
 
 func GetNextContainerDeltasCmd(
-	client k8s.Client,
-	listener model.ContainerListener,
+	client client.Client,
+	listener client.ContainerListener,
 	duration time.Duration,
 ) tea.Cmd {
 	return func() tea.Msg {

internal/command/log.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/robinovitch61/kl/internal/dev"
-	"github.com/robinovitch61/kl/internal/k8s"
+	"github.com/robinovitch61/kl/internal/k8s/client"
 	"github.com/robinovitch61/kl/internal/model"
 	"time"
 )
@@ -15,7 +15,7 @@ type StartedLogScannerMsg struct {
 }
 
 func StartLogScannerCmd(
-	client k8s.Client,
+	client client.Client,
 	container model.Container,
 	sinceTime time.Time,
 ) tea.Cmd {

internal/config.go

@@ -8,14 +8,14 @@ import (
 type Config struct {
 	AllNamespaces    bool
 	ContainerLimit   int
-	Contexts         string
+	Contexts         []string
 	Descending       bool
 	IgnoreOwnerTypes []string
 	KubeConfigPath   string
 	LogsView         bool
 	LogFilter        model.LogFilter
 	Matchers         model.Matchers
-	Namespaces       string
+	Namespaces       []string
 	Selector         labels.Selector
 	SinceTime        model.SinceTime
 	Version          string