Skip to content

Commit 7029bba

Browse files
committed
Merge remote-tracking branch 'origin/master' into job-deadlines
2 parents 80cd6b8 + ccbe98a commit 7029bba

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ mv kubectl-trace /usr/local/bin/kubectl-trace
4545
**OSX**
4646

4747
```bash
48-
curl -Lo https://github.com/iovisor/kubectl-trace/releases/download/v0.1.0-rc.0/kubectl-trace_0.1.0-rc.0_linux_amd64.tar.gz
48+
curl -L -o kubectl-trace.tar.gz https://github.com/iovisor/kubectl-trace/releases/download/v0.1.0-rc.0/kubectl-trace_0.1.0-rc.0_darwin_amd64.tar.gz
4949
tar -xvf kubectl-trace.tar.gz
5050
mv kubectl-trace /usr/local/bin/kubectl-trace
5151
```

pkg/cmd/get.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ func jobsTablePrint(o io.Writer, jobs []tracejob.TraceJob) {
200200

201201
// translateTimestampSince returns the elapsed time since timestamp in
202202
// human-readable approximation.
203-
func translateTimestampSince(timestamp metav1.Time) string {
203+
func translateTimestampSince(timestamp *metav1.Time) string {
204204
if timestamp.IsZero() {
205205
return "<unknown>"
206206
}

pkg/tracejob/job.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ type TraceJob struct {
3737
FetchHeaders bool
3838
Deadline int64
3939
DeadlineGracePeriod int64
40-
StartTime metav1.Time
40+
StartTime *metav1.Time
4141
Status TraceJobStatus
4242
}
4343

@@ -133,7 +133,7 @@ func (t *TraceJobClient) GetJob(nf TraceJobFilter) ([]TraceJob, error) {
133133
ID: types.UID(id),
134134
Namespace: j.Namespace,
135135
Hostname: hostname,
136-
StartTime: *j.Status.StartTime,
136+
StartTime: j.Status.StartTime,
137137
Status: jobStatus(j),
138138
}
139139
tjobs = append(tjobs, tj)

0 commit comments

Comments
 (0)