Merge github.com/stern/[email protected] into chore/merge-upstream

Author: hogklint

.goreleaser.yaml

@@ -1,3 +1,4 @@
+version: 2
 builds:
 - env:
   - CGO_ENABLED=0

Makefile

@@ -5,15 +5,15 @@ build:
 	go build -o dist/tailfin ./cmd/tailfin
 
 TOOLS_BIN_DIR := $(CURDIR)/hack/tools/bin
-GORELEASER_VERSION ?= v1.25.1
+GORELEASER_VERSION ?= v2.3.2
 GORELEASER := $(TOOLS_BIN_DIR)/goreleaser
 GOLANGCI_LINT_VERSION ?= v1.63.1
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
 GORELEASER_FILTER_VERSION ?= v0.3.0
 GORELEASER_FILTER := $(TOOLS_BIN_DIR)/goreleaser-filter
 
 $(GORELEASER):
-	GOBIN=$(TOOLS_BIN_DIR) go install github.com/goreleaser/goreleaser@$(GORELEASER_VERSION)
+	GOBIN=$(TOOLS_BIN_DIR) go install github.com/goreleaser/goreleaser/v2@$(GORELEASER_VERSION)
 
 $(GOLANGCI_LINT):
 	GOBIN=$(TOOLS_BIN_DIR) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)

cmd/cmd.go

@@ -168,9 +168,6 @@ func (o *options) Validate() error {
 }
 
 func (o *options) Run(cmd *cobra.Command) error {
-	if err := o.setVerbosity(); err != nil {
-		return err
-	}
 	if err := o.setColorList(); err != nil {
 		return err
 	}
@@ -673,6 +670,11 @@ func NewSternCmd(stream genericclioptions.IOStreams) (*cobra.Command, error) {
 		Use:   "stern pod-query",
 		Short: "Tail multiple pods and containers from Kubernetes",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			// klog's v flag should be initialized before creating a k8s client
+			if err := o.setVerbosity(); err != nil {
+				return err
+			}
+
 			// Output version information and exit
 			if o.version {
 				outputVersionInfo(o.Out)

cmd/tailfincmd/cmd.go

@@ -129,9 +129,6 @@ func (o *options) Validate() error {
 }
 
 func (o *options) Run(cmd *cobra.Command) error {
-	if err := o.setVerbosity(); err != nil {
-		return err
-	}
 	if err := o.setColorList(); err != nil {
 		return err
 	}
@@ -579,6 +576,10 @@ func NewTailfinCmd(streams IOStreams) (*cobra.Command, error) {
 		Use:   "tailfin container-query",
 		Short: "Tail multiple docker containers",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			if err := o.setVerbosity(); err != nil {
+				return err
+			}
+
 			// Output version information and exit
 			if o.version {
 				outputVersionInfo(o.Out)