Skip to content

Commit 375ee62

Browse files
committed
feat(kubectl-trace): package migration
- CI will break until the repo is actually moved under iovisor and travis re-enabled - Docker images are not being moved for now, will do in another PR Signed-off-by: Lorenzo Fontana <[email protected]>
1 parent f6a9284 commit 375ee62

File tree

18 files changed

+37
-37
lines changed

18 files changed

+37
-37
lines changed

Dockerfile.bpftrace

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ FROM golang:1.11.4-alpine3.8 as gobuilder
3838
RUN apk update
3939
RUN apk add make bash
4040

41-
ADD . /go/src/github.com/fntlnz/kubectl-trace
42-
WORKDIR /go/src/github.com/fntlnz/kubectl-trace
41+
ADD . /go/src/github.com/iovisor/kubectl-trace
42+
WORKDIR /go/src/github.com/iovisor/kubectl-trace
4343

4444
RUN make _output/bin/trace-runner
4545

4646
FROM alpine:3.8
4747

4848
RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
4949
COPY --from=builder /bpftrace/build-release/src/bpftrace /bin/bpftrace
50-
COPY --from=gobuilder /go/src/github.com/fntlnz/kubectl-trace/_output/bin/trace-runner /bin/trace-runner
50+
COPY --from=gobuilder /go/src/github.com/iovisor/kubectl-trace/_output/bin/trace-runner /bin/trace-runner
5151

5252
ENTRYPOINT ["/bin/trace-runner"]

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ IMAGE_BPFTRACE_LATEST := quay.io/fntlnz/kubectl-trace-bpftrace:latest
1515

1616
IMAGE_BUILD_FLAGS ?= "--no-cache"
1717

18-
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}'
18+
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}'
1919

2020
kubectl_trace ?= _output/bin/kubectl-trace
2121
trace_runner ?= _output/bin/trace-runner

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ of [bpftrace](https://github.com/iovisor/bpftrace) programs in your Kubernetes c
88
## Installation
99

1010
```
11-
go get -u github.com/fntlnz/kubectl-trace/cmd/kubectl-trace
11+
go get -u github.com/iovisor/kubectl-trace/cmd/kubectl-trace
1212
```
1313

1414
This will download and compile `kubectl-trace` so that you can use it as a kubectl plugin with `kubectl trace`

cmd/kubectl-trace/root.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"os"
55

6-
"github.com/fntlnz/kubectl-trace/pkg/cmd"
6+
"github.com/iovisor/kubectl-trace/pkg/cmd"
77
"github.com/spf13/pflag"
88
"k8s.io/cli-runtime/pkg/genericclioptions"
99
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

cmd/trace-runner/root.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"os"
55

6-
"github.com/fntlnz/kubectl-trace/pkg/cmd"
6+
"github.com/iovisor/kubectl-trace/pkg/cmd"
77
"github.com/spf13/pflag"
88
)
99

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/fntlnz/kubectl-trace
1+
module github.com/iovisor/kubectl-trace
22

33
require (
44
cloud.google.com/go v0.34.0 // indirect

go.sum

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ k8s.io/klog v0.1.0 h1:I5HMfc/DtuVaGR1KPwUrTc476K8NCqNBldC7H4dYEzk=
151151
k8s.io/klog v0.1.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
152152
k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be h1:aWEq4nbj7HRJ0mtKYjNSk/7X28Tl6TI6FeG8gKF+r7Q=
153153
k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
154-
k8s.io/kubernetes v1.12.3 h1:1FH8TXY6pIuOHoNlsq9bB6rmCP0vfvQZH5YN7OXCHXU=
154+
k8s.io/kubernetes v1.12.3 h1:5GPfYyyBylqcZUqL+ApYpYTm2IYjH56JUewYC0GbetU=
155155
k8s.io/kubernetes v1.12.3/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
156156
k8s.io/utils v0.0.0-20181115163542-0d26856f57b3 h1:S3/Kq185JnolOEemhmDXXd23l2t4bX5hPQPQPADlF1E=
157157
k8s.io/utils v0.0.0-20181115163542-0d26856f57b3/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=

pkg/attacher/attach.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"net/url"
88
"time"
99

10-
"github.com/fntlnz/kubectl-trace/pkg/meta"
10+
"github.com/iovisor/kubectl-trace/pkg/meta"
1111
"k8s.io/apimachinery/pkg/types"
1212
"k8s.io/apimachinery/pkg/util/wait"
1313
"k8s.io/client-go/kubernetes/scheme"

pkg/cmd/attach.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/fntlnz/kubectl-trace/pkg/attacher"
8-
"github.com/fntlnz/kubectl-trace/pkg/factory"
9-
"github.com/fntlnz/kubectl-trace/pkg/meta"
10-
"github.com/fntlnz/kubectl-trace/pkg/signals"
11-
"github.com/fntlnz/kubectl-trace/pkg/tracejob"
7+
"github.com/iovisor/kubectl-trace/pkg/attacher"
8+
"github.com/iovisor/kubectl-trace/pkg/factory"
9+
"github.com/iovisor/kubectl-trace/pkg/meta"
10+
"github.com/iovisor/kubectl-trace/pkg/signals"
11+
"github.com/iovisor/kubectl-trace/pkg/tracejob"
1212
"github.com/spf13/cobra"
1313
"k8s.io/apimachinery/pkg/types"
1414
"k8s.io/cli-runtime/pkg/genericclioptions"

pkg/cmd/delete.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package cmd
33
import (
44
"fmt"
55

6-
"github.com/fntlnz/kubectl-trace/pkg/factory"
7-
"github.com/fntlnz/kubectl-trace/pkg/meta"
8-
"github.com/fntlnz/kubectl-trace/pkg/tracejob"
6+
"github.com/iovisor/kubectl-trace/pkg/factory"
7+
"github.com/iovisor/kubectl-trace/pkg/meta"
8+
"github.com/iovisor/kubectl-trace/pkg/tracejob"
99
"github.com/spf13/cobra"
1010
"k8s.io/apimachinery/pkg/types"
1111
"k8s.io/cli-runtime/pkg/genericclioptions"

pkg/cmd/get.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"io"
66
"text/tabwriter"
77

8-
"github.com/fntlnz/kubectl-trace/pkg/factory"
9-
"github.com/fntlnz/kubectl-trace/pkg/meta"
10-
"github.com/fntlnz/kubectl-trace/pkg/tracejob"
8+
"github.com/iovisor/kubectl-trace/pkg/factory"
9+
"github.com/iovisor/kubectl-trace/pkg/meta"
10+
"github.com/iovisor/kubectl-trace/pkg/tracejob"
1111
"github.com/spf13/cobra"
1212
"k8s.io/apimachinery/pkg/types"
1313
"k8s.io/cli-runtime/pkg/genericclioptions"

pkg/cmd/log.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package cmd
33
import (
44
"fmt"
55

6-
"github.com/fntlnz/kubectl-trace/pkg/factory"
7-
"github.com/fntlnz/kubectl-trace/pkg/logs"
8-
"github.com/fntlnz/kubectl-trace/pkg/meta"
9-
"github.com/fntlnz/kubectl-trace/pkg/tracejob"
6+
"github.com/iovisor/kubectl-trace/pkg/factory"
7+
"github.com/iovisor/kubectl-trace/pkg/logs"
8+
"github.com/iovisor/kubectl-trace/pkg/meta"
9+
"github.com/iovisor/kubectl-trace/pkg/tracejob"
1010
"github.com/spf13/cobra"
1111
"k8s.io/apimachinery/pkg/types"
1212
"k8s.io/cli-runtime/pkg/genericclioptions"

pkg/cmd/run.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"fmt"
66
"io/ioutil"
77

8-
"github.com/fntlnz/kubectl-trace/pkg/attacher"
9-
"github.com/fntlnz/kubectl-trace/pkg/factory"
10-
"github.com/fntlnz/kubectl-trace/pkg/meta"
11-
"github.com/fntlnz/kubectl-trace/pkg/signals"
12-
"github.com/fntlnz/kubectl-trace/pkg/tracejob"
8+
"github.com/iovisor/kubectl-trace/pkg/attacher"
9+
"github.com/iovisor/kubectl-trace/pkg/factory"
10+
"github.com/iovisor/kubectl-trace/pkg/meta"
11+
"github.com/iovisor/kubectl-trace/pkg/signals"
12+
"github.com/iovisor/kubectl-trace/pkg/tracejob"
1313
"github.com/spf13/cobra"
1414
"k8s.io/api/core/v1"
1515
"k8s.io/apimachinery/pkg/util/uuid"

pkg/cmd/trace.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cmd
33
import (
44
"fmt"
55

6-
"github.com/fntlnz/kubectl-trace/pkg/factory"
6+
"github.com/iovisor/kubectl-trace/pkg/factory"
77

88
"github.com/spf13/cobra"
99
"k8s.io/cli-runtime/pkg/genericclioptions"

pkg/cmd/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cmd
33
import (
44
"fmt"
55

6-
"github.com/fntlnz/kubectl-trace/pkg/version"
6+
"github.com/iovisor/kubectl-trace/pkg/version"
77
"github.com/spf13/cobra"
88
"k8s.io/cli-runtime/pkg/genericclioptions"
99
)

pkg/logs/logs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package logs
22

33
import (
4-
"github.com/fntlnz/kubectl-trace/pkg/meta"
4+
"github.com/iovisor/kubectl-trace/pkg/meta"
55
tcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
66

77
corev1 "k8s.io/api/core/v1"

pkg/meta/constants.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ const (
44
// TracePrefix is the prefix to identify objects created by this tool
55
TracePrefix = "kubectl-trace-"
66
// TraceIDLabelKey is a meta to annotate objects created by this tool
7-
TraceIDLabelKey = "fntlnz.wtf/kubectl-trace-id"
7+
TraceIDLabelKey = "iovisor.org/kubectl-trace-id"
88
// TraceLabelKey is a meta to annotate objects created by this tool
9-
TraceLabelKey = "fntlnz.wtf/kubectl-trace"
9+
TraceLabelKey = "iovisor.org/kubectl-trace"
1010

1111
// ObjectNamePrefix is the prefix used for objects created by kubectl-trace
1212
ObjectNamePrefix = "kubectl-trace-"

pkg/tracejob/job.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package tracejob
33
import (
44
"fmt"
55

6-
"github.com/fntlnz/kubectl-trace/pkg/version"
6+
"github.com/iovisor/kubectl-trace/pkg/version"
77

88
"io"
99
"io/ioutil"
1010

11-
"github.com/fntlnz/kubectl-trace/pkg/meta"
11+
"github.com/iovisor/kubectl-trace/pkg/meta"
1212
batchv1 "k8s.io/api/batch/v1"
1313
apiv1 "k8s.io/api/core/v1"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

0 commit comments

Comments
 (0)