feat(pkg/meta): meta package for selector keys

Signed-off-by: Lorenzo Fontana <[email protected]>
iovisor · Nov 22, 2018 · c196818 · c196818
1 parent 1020f95
commit c196818
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/cmd/kubectl-trace/run.go b/cmd/kubectl-trace/run.go
@@ -102,7 +102,7 @@ func run(cmd *cobra.Command, args []string) {
 	a.WithLogger(log)
 	a.WithContext(ctx)
 
-	a.AttachJob(job.Name, job.Namespace)
+	a.AttachJob(tj.ID, job.Namespace)
 
 	<-ctx.Done()
 }
diff --git a/pkg/attacher/attach.go b/pkg/attacher/attach.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"time"
 
+	"github.com/fntlnz/kubectl-trace/pkg/meta"
 	"go.uber.org/zap"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -53,14 +54,13 @@ func (a *Attacher) WithContext(c context.Context) {
 	a.ctx = c
 }
 
-func (a *Attacher) AttachJob(jobName, namespace string) {
-	a.Attach(fmt.Sprintf("job-name=%s", jobName), namespace)
+func (a *Attacher) AttachJob(traceJobID string, namespace string) {
+	a.Attach(fmt.Sprintf("%s=%s", meta.TraceIDLabelKey, traceJobID), namespace)
 }
 
 func (a *Attacher) Attach(selector, namespace string) {
 	go wait.PollImmediate(time.Second, 10*time.Second, func() (bool, error) {
 		pl, err := a.CoreV1Client.Pods(namespace).List(metav1.ListOptions{
-			//LabelSelector: "job-name=test-renzo",
 			LabelSelector: selector,
 		})
 

diff --git a/pkg/meta/constants.go b/pkg/meta/constants.go
@@ -0,0 +1,6 @@
+package meta
+
+const (
+	TraceIDLabelKey = "fntlnz.wtf/kubectl-trace-id"
+	TraceLabelKey   = "fntlnz.wtf/kubectl-trace"
+)
diff --git a/pkg/tracejob/job.go b/pkg/tracejob/job.go
@@ -3,6 +3,7 @@ package tracejob
 import (
 	"fmt"
 
+	"github.com/fntlnz/kubectl-trace/pkg/meta"
 	batchv1 "k8s.io/api/batch/v1"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -25,7 +26,7 @@ type TraceJob struct {
 
 func (t *TraceJobClient) DeleteJob(nj TraceJob) error {
 	selectorOptions := metav1.ListOptions{
-		LabelSelector: fmt.Sprintf("fntlnz.wtf/kubectl-trace-id=%s", nj.ID),
+		LabelSelector: fmt.Sprintf("%s=%s", meta.TraceIDLabelKey, nj.ID),
 	}
 	jl, err := t.JobClient.List(selectorOptions)
 
@@ -71,12 +72,12 @@ func (t *TraceJobClient) CreateJob(nj TraceJob) (*batchv1.Job, error) {
 		Name:      nj.Name,
 		Namespace: nj.Namespace,
 		Labels: map[string]string{
-			"fntlnz.wtf/kubectl-trace":    nj.Name,
-			"fntlnz.wtf/kubectl-trace-id": nj.ID,
+			meta.TraceLabelKey:   nj.Name,
+			meta.TraceIDLabelKey: nj.ID,
 		},
 		Annotations: map[string]string{
-			"fntlnz.wtf/kubectl-trace":    nj.Name,
-			"fntlnz.wtf/kubectl-trace-id": nj.ID,
+			meta.TraceLabelKey:   nj.Name,
+			meta.TraceIDLabelKey: nj.ID,
 		},
 	}