fix: Avoid nil context error

justinsb · justinsb · commit 0988fa36b2bf · 2022-11-04T10:55:56.000-04:00
If this code path is followed, we end up with a nil context.
diff --git a/pkg/skaffold/deploy/kubectl/kubectl.go b/pkg/skaffold/deploy/kubectl/kubectl.go
@@ -229,7 +229,7 @@ func (k *Deployer) Deploy(ctx context.Context, out io.Writer, builds []graph.Art
 		return err
 	}
 
-	_, endTrace = instrumentation.StartTrace(ctx, "Deploy_LoadImages")
+	childCtx, endTrace = instrumentation.StartTrace(ctx, "Deploy_LoadImages")
 	if err := k.imageLoader.LoadImages(childCtx, out, k.localImages, k.originalImages, builds); err != nil {
 		endTrace(instrumentation.TraceEndError(err))
 		return err

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ func (k *Deployer) Deploy(ctx context.Context, out io.Writer, builds []graph.Art`
`229`	`229`	`return err`
`230`	`230`	`}`
`231`	`231`
`232`		`- _, endTrace = instrumentation.StartTrace(ctx, "Deploy_LoadImages")`
	`232`	`+ childCtx, endTrace = instrumentation.StartTrace(ctx, "Deploy_LoadImages")`
`233`	`233`	`if err := k.imageLoader.LoadImages(childCtx, out, k.localImages, k.originalImages, builds); err != nil {`
`234`	`234`	`endTrace(instrumentation.TraceEndError(err))`
`235`	`235`	`return err`