feat: only log default container

Author: alexec

internal/run.go

@@ -26,7 +26,7 @@ import (
 	"time"
 )
 
-func Run(ctx context.Context, group, namespace, labels string, hostPortOffset int) error {
+func Run(ctx context.Context, group, namespace, labels, container string, allContainers bool, hostPortOffset int) error {
 	// connect to the k8s cluster
 	kubeConfig := os.Getenv("KUBECONFIG")
 	if kubeConfig == "" {
@@ -161,11 +161,21 @@ func Run(ctx context.Context, group, namespace, labels string, hostPortOffset in
 			running[s.Name] = s.State.Running != nil
 		}
 
+		if container == "" {
+			container = pod.Annotations["kubectl.kubernetes.io/default-container"]
+		}
+
 		for _, ctr := range append(pod.Spec.InitContainers, pod.Spec.Containers...) {
 			// skip containers that are not running
 			if !running[ctr.Name] {
 				continue
 			}
+
+			// skip containers that are not the one we want to watch
+			if !allContainers && ctr.Name != container {
+				continue
+			}
+
 			out := colorWriter("pods", fmt.Sprintf("[pods/%s] %s:  ", pod.Name, ctr.Name))
 			go func() {
 				// start a log tail

main.go

@@ -11,14 +11,17 @@ import (
 )
 
 func main() {
-	var namespace, labels, group string
+	var namespace, labels, group, container string
+	var allContainers bool
 	var hostPortOffset int
 	var help bool
 	var version bool
 	flag.StringVar(&namespace, "n", "", "namespace to filter resources, defaults to the current namespace ")
 	flag.StringVar(&labels, "l", "", "comma separated list of labels to filter resources, e.g. app=nginx, defaults to all resources")
 	flag.StringVar(&group, "g", "", "the group to watch, defaults to core resources")
-	flag.IntVar(&hostPortOffset, "p", 0, "the offset to add to the host port, e.g. if the container listens on 8080 and the host port is 30000, the offset is 38080, defaults to 0")
+	flag.StringVar(&container, "c", "", "the container to show logs for, defaults to the annotation")
+	flag.BoolVar(&allContainers, "a", false, "show logs for all containers")
+	flag.IntVar(&hostPortOffset, "p", 0, "the offset to add to the host port, e.g. if the container listens on 8080 and the host port is 30000, the offset is 38080")
 	flag.BoolVar(&help, "h", false, "print help")
 	flag.BoolVar(&version, "v", false, "print version")
 	flag.Parse()
@@ -37,7 +40,7 @@ func main() {
 	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)
 	defer cancel()
 
-	if err := internal.Run(ctx, group, namespace, labels, hostPortOffset); err != nil {
+	if err := internal.Run(ctx, group, namespace, labels, container, allContainers, hostPortOffset); err != nil {
 		panic(err)
 	}
 }

release

@@ -1,6 +1,20 @@
 #!/bin/sh
-set -eux -o pipefail
+set -eu -o pipefail
 
 go install github.com/ffurrer2/semver/v2/cmd/semver@latest
-git tag v$(semver next patch $(git tag|sort -V|tail -n1|cut -c 2-))
+
+previous_version=$(git tag|sort -V|tail -n1|cut -c 2-)
+new_version=v$(semver next patch $previous_version)
+
+echo "$previous_version -> $new_version"
+
+# replace the previous version with the new version in README.md
+sed -i '' "s|$previous_version|$new_version|" README.md
+
+git reset
+git add README.md
+git commit -m 'docs: update version in README'
+
+git tag $new_version
+
 git push --tags