Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into job-deadlines
Browse files Browse the repository at this point in the history
  • Loading branch information
dalehamel committed Sep 18, 2019
2 parents 80cd6b8 + ccbe98a commit 7029bba
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ mv kubectl-trace /usr/local/bin/kubectl-trace
**OSX**

```bash
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
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
tar -xvf kubectl-trace.tar.gz
mv kubectl-trace /usr/local/bin/kubectl-trace
```
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func jobsTablePrint(o io.Writer, jobs []tracejob.TraceJob) {

// translateTimestampSince returns the elapsed time since timestamp in
// human-readable approximation.
func translateTimestampSince(timestamp metav1.Time) string {
func translateTimestampSince(timestamp *metav1.Time) string {
if timestamp.IsZero() {
return "<unknown>"
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/tracejob/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ type TraceJob struct {
FetchHeaders bool
Deadline int64
DeadlineGracePeriod int64
StartTime metav1.Time
StartTime *metav1.Time
Status TraceJobStatus
}

Expand Down Expand Up @@ -133,7 +133,7 @@ func (t *TraceJobClient) GetJob(nf TraceJobFilter) ([]TraceJob, error) {
ID: types.UID(id),
Namespace: j.Namespace,
Hostname: hostname,
StartTime: *j.Status.StartTime,
StartTime: j.Status.StartTime,
Status: jobStatus(j),
}
tjobs = append(tjobs, tj)
Expand Down

0 comments on commit 7029bba

Please sign in to comment.