diff --git a/Dockerfile.bpftrace b/Dockerfile.bpftrace index 1b5307d1..92adc644 100644 --- a/Dockerfile.bpftrace +++ b/Dockerfile.bpftrace @@ -38,8 +38,8 @@ FROM golang:1.11.4-alpine3.8 as gobuilder RUN apk update RUN apk add make bash -ADD . /go/src/github.com/fntlnz/kubectl-trace -WORKDIR /go/src/github.com/fntlnz/kubectl-trace +ADD . /go/src/github.com/iovisor/kubectl-trace +WORKDIR /go/src/github.com/iovisor/kubectl-trace RUN make _output/bin/trace-runner @@ -47,6 +47,6 @@ FROM alpine:3.8 RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2 COPY --from=builder /bpftrace/build-release/src/bpftrace /bin/bpftrace -COPY --from=gobuilder /go/src/github.com/fntlnz/kubectl-trace/_output/bin/trace-runner /bin/trace-runner +COPY --from=gobuilder /go/src/github.com/iovisor/kubectl-trace/_output/bin/trace-runner /bin/trace-runner ENTRYPOINT ["/bin/trace-runner"] diff --git a/Makefile b/Makefile index e68c8c8b..69ec425a 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ IMAGE_BPFTRACE_LATEST := quay.io/fntlnz/kubectl-trace-bpftrace:latest IMAGE_BUILD_FLAGS ?= "--no-cache" -LDFLAGS := -ldflags '-X github.com/fntlnz/kubectl-trace/pkg/version.buildTime=$(shell date +%s) -X github.com/fntlnz/kubectl-trace/pkg/version.gitCommit=${GIT_COMMIT}' +LDFLAGS := -ldflags '-X github.com/iovisor/kubectl-trace/pkg/version.buildTime=$(shell date +%s) -X github.com/iovisor/kubectl-trace/pkg/version.gitCommit=${GIT_COMMIT}' kubectl_trace ?= _output/bin/kubectl-trace trace_runner ?= _output/bin/trace-runner diff --git a/README.md b/README.md index 31ab8f8b..90d3b3a0 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ of [bpftrace](https://github.com/iovisor/bpftrace) programs in your Kubernetes c ## Installation ``` -go get -u github.com/fntlnz/kubectl-trace/cmd/kubectl-trace +go get -u github.com/iovisor/kubectl-trace/cmd/kubectl-trace ``` This will download and compile `kubectl-trace` so that you can use it as a kubectl plugin with `kubectl trace` diff --git a/cmd/kubectl-trace/root.go b/cmd/kubectl-trace/root.go index b42f5103..bf0aa658 100644 --- a/cmd/kubectl-trace/root.go +++ b/cmd/kubectl-trace/root.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/fntlnz/kubectl-trace/pkg/cmd" + "github.com/iovisor/kubectl-trace/pkg/cmd" "github.com/spf13/pflag" "k8s.io/cli-runtime/pkg/genericclioptions" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" diff --git a/cmd/trace-runner/root.go b/cmd/trace-runner/root.go index 139ec758..0117972b 100644 --- a/cmd/trace-runner/root.go +++ b/cmd/trace-runner/root.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/fntlnz/kubectl-trace/pkg/cmd" + "github.com/iovisor/kubectl-trace/pkg/cmd" "github.com/spf13/pflag" ) diff --git a/go.mod b/go.mod index 4f7c12a4..3b6e7631 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/fntlnz/kubectl-trace +module github.com/iovisor/kubectl-trace require ( cloud.google.com/go v0.34.0 // indirect diff --git a/go.sum b/go.sum index b5779568..24a12782 100644 --- a/go.sum +++ b/go.sum @@ -151,7 +151,7 @@ k8s.io/klog v0.1.0 h1:I5HMfc/DtuVaGR1KPwUrTc476K8NCqNBldC7H4dYEzk= k8s.io/klog v0.1.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be h1:aWEq4nbj7HRJ0mtKYjNSk/7X28Tl6TI6FeG8gKF+r7Q= k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= -k8s.io/kubernetes v1.12.3 h1:1FH8TXY6pIuOHoNlsq9bB6rmCP0vfvQZH5YN7OXCHXU= +k8s.io/kubernetes v1.12.3 h1:5GPfYyyBylqcZUqL+ApYpYTm2IYjH56JUewYC0GbetU= k8s.io/kubernetes v1.12.3/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20181115163542-0d26856f57b3 h1:S3/Kq185JnolOEemhmDXXd23l2t4bX5hPQPQPADlF1E= k8s.io/utils v0.0.0-20181115163542-0d26856f57b3/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= diff --git a/pkg/attacher/attach.go b/pkg/attacher/attach.go index 43d48988..d44facc8 100644 --- a/pkg/attacher/attach.go +++ b/pkg/attacher/attach.go @@ -7,7 +7,7 @@ import ( "net/url" "time" - "github.com/fntlnz/kubectl-trace/pkg/meta" + "github.com/iovisor/kubectl-trace/pkg/meta" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes/scheme" diff --git a/pkg/cmd/attach.go b/pkg/cmd/attach.go index 5376a889..a83653c7 100644 --- a/pkg/cmd/attach.go +++ b/pkg/cmd/attach.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/fntlnz/kubectl-trace/pkg/attacher" - "github.com/fntlnz/kubectl-trace/pkg/factory" - "github.com/fntlnz/kubectl-trace/pkg/meta" - "github.com/fntlnz/kubectl-trace/pkg/signals" - "github.com/fntlnz/kubectl-trace/pkg/tracejob" + "github.com/iovisor/kubectl-trace/pkg/attacher" + "github.com/iovisor/kubectl-trace/pkg/factory" + "github.com/iovisor/kubectl-trace/pkg/meta" + "github.com/iovisor/kubectl-trace/pkg/signals" + "github.com/iovisor/kubectl-trace/pkg/tracejob" "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/types" "k8s.io/cli-runtime/pkg/genericclioptions" diff --git a/pkg/cmd/delete.go b/pkg/cmd/delete.go index 5c1da89d..d48d9395 100644 --- a/pkg/cmd/delete.go +++ b/pkg/cmd/delete.go @@ -3,9 +3,9 @@ package cmd import ( "fmt" - "github.com/fntlnz/kubectl-trace/pkg/factory" - "github.com/fntlnz/kubectl-trace/pkg/meta" - "github.com/fntlnz/kubectl-trace/pkg/tracejob" + "github.com/iovisor/kubectl-trace/pkg/factory" + "github.com/iovisor/kubectl-trace/pkg/meta" + "github.com/iovisor/kubectl-trace/pkg/tracejob" "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/types" "k8s.io/cli-runtime/pkg/genericclioptions" diff --git a/pkg/cmd/get.go b/pkg/cmd/get.go index 7327325c..4b870b90 100644 --- a/pkg/cmd/get.go +++ b/pkg/cmd/get.go @@ -5,9 +5,9 @@ import ( "io" "text/tabwriter" - "github.com/fntlnz/kubectl-trace/pkg/factory" - "github.com/fntlnz/kubectl-trace/pkg/meta" - "github.com/fntlnz/kubectl-trace/pkg/tracejob" + "github.com/iovisor/kubectl-trace/pkg/factory" + "github.com/iovisor/kubectl-trace/pkg/meta" + "github.com/iovisor/kubectl-trace/pkg/tracejob" "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/types" "k8s.io/cli-runtime/pkg/genericclioptions" diff --git a/pkg/cmd/log.go b/pkg/cmd/log.go index e4b121f9..d0cf072e 100644 --- a/pkg/cmd/log.go +++ b/pkg/cmd/log.go @@ -3,10 +3,10 @@ package cmd import ( "fmt" - "github.com/fntlnz/kubectl-trace/pkg/factory" - "github.com/fntlnz/kubectl-trace/pkg/logs" - "github.com/fntlnz/kubectl-trace/pkg/meta" - "github.com/fntlnz/kubectl-trace/pkg/tracejob" + "github.com/iovisor/kubectl-trace/pkg/factory" + "github.com/iovisor/kubectl-trace/pkg/logs" + "github.com/iovisor/kubectl-trace/pkg/meta" + "github.com/iovisor/kubectl-trace/pkg/tracejob" "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/types" "k8s.io/cli-runtime/pkg/genericclioptions" diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go index 7c4fa342..b028f26a 100644 --- a/pkg/cmd/run.go +++ b/pkg/cmd/run.go @@ -5,11 +5,11 @@ import ( "fmt" "io/ioutil" - "github.com/fntlnz/kubectl-trace/pkg/attacher" - "github.com/fntlnz/kubectl-trace/pkg/factory" - "github.com/fntlnz/kubectl-trace/pkg/meta" - "github.com/fntlnz/kubectl-trace/pkg/signals" - "github.com/fntlnz/kubectl-trace/pkg/tracejob" + "github.com/iovisor/kubectl-trace/pkg/attacher" + "github.com/iovisor/kubectl-trace/pkg/factory" + "github.com/iovisor/kubectl-trace/pkg/meta" + "github.com/iovisor/kubectl-trace/pkg/signals" + "github.com/iovisor/kubectl-trace/pkg/tracejob" "github.com/spf13/cobra" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/uuid" diff --git a/pkg/cmd/trace.go b/pkg/cmd/trace.go index 79e43ec6..255d4afa 100644 --- a/pkg/cmd/trace.go +++ b/pkg/cmd/trace.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/fntlnz/kubectl-trace/pkg/factory" + "github.com/iovisor/kubectl-trace/pkg/factory" "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" diff --git a/pkg/cmd/version.go b/pkg/cmd/version.go index b60dc075..ce1a2dc4 100644 --- a/pkg/cmd/version.go +++ b/pkg/cmd/version.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/fntlnz/kubectl-trace/pkg/version" + "github.com/iovisor/kubectl-trace/pkg/version" "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" ) diff --git a/pkg/logs/logs.go b/pkg/logs/logs.go index c1dcdf61..f2996e04 100644 --- a/pkg/logs/logs.go +++ b/pkg/logs/logs.go @@ -1,7 +1,7 @@ package logs import ( - "github.com/fntlnz/kubectl-trace/pkg/meta" + "github.com/iovisor/kubectl-trace/pkg/meta" tcorev1 "k8s.io/client-go/kubernetes/typed/core/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/meta/constants.go b/pkg/meta/constants.go index 3f494bb5..87c97159 100644 --- a/pkg/meta/constants.go +++ b/pkg/meta/constants.go @@ -4,9 +4,9 @@ const ( // TracePrefix is the prefix to identify objects created by this tool TracePrefix = "kubectl-trace-" // TraceIDLabelKey is a meta to annotate objects created by this tool - TraceIDLabelKey = "fntlnz.wtf/kubectl-trace-id" + TraceIDLabelKey = "iovisor.org/kubectl-trace-id" // TraceLabelKey is a meta to annotate objects created by this tool - TraceLabelKey = "fntlnz.wtf/kubectl-trace" + TraceLabelKey = "iovisor.org/kubectl-trace" // ObjectNamePrefix is the prefix used for objects created by kubectl-trace ObjectNamePrefix = "kubectl-trace-" diff --git a/pkg/tracejob/job.go b/pkg/tracejob/job.go index f57548df..7d5fc989 100644 --- a/pkg/tracejob/job.go +++ b/pkg/tracejob/job.go @@ -3,12 +3,12 @@ package tracejob import ( "fmt" - "github.com/fntlnz/kubectl-trace/pkg/version" + "github.com/iovisor/kubectl-trace/pkg/version" "io" "io/ioutil" - "github.com/fntlnz/kubectl-trace/pkg/meta" + "github.com/iovisor/kubectl-trace/pkg/meta" batchv1 "k8s.io/api/batch/v1" apiv1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"