build: support cancellation of custom image builds #5971
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
milas
approved these changes
Nov 14, 2022
| @@ -107,20 +106,21 @@ func (b *CustomBuilder) Build(ctx context.Context, refs container.RefSet, | |||
| l.Infof(" %s", v) | |||
| } | |||
| } | |||
| cmd.Env = append(os.Environ(), extraEnvVars...) | |||
| err = imagemap.InjectIntoLocalEnv(cmd, spec.ImageMaps, imageMaps) | |||
| cmd.Spec.Env = append(cmd.Spec.Env, extraEnvVars...) | |||
There was a problem hiding this comment.
Will the spec already have the os.Environ()?
AFAICT we don't add it before execing in ForceRun -> https://github.com/nicks/tilt/blob/cfca55cae493dce8616a0ebf986d10e9922eec0a/internal/controllers/core/cmd/controller.go#L389-L399
There was a problem hiding this comment.
i think we handle this at the localexec level, see:
https://github.com/nicks/tilt/blob/cfca55cae493dce8616a0ebf986d10e9922eec0a/internal/localexec/localexec.go#L72
Comment on lines
169
to
170
| var cmd v1alpha1.Cmd | ||
| if iTarget.CmdImageName != "" { |
There was a problem hiding this comment.
cmd is going to always be non-nil, which might be unexpected within Build() - might be better to pass a nil pointer if there is no custom build command
nicks
force-pushed
the
nicks/issue5926
branch
from
cfca55c to
546a938
Compare
Custom image builds now create an explicit Cmd object in the API server. But for now these Cmds are kept up to date as part of the buildcontroller, rather than by the runtime controller. Fixes tilt-dev#5926 Signed-off-by: Nick Santos <[email protected]>
nicks
force-pushed
the
nicks/issue5926
branch
from
546a938 to
ab5373c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Custom image builds now create an explicit Cmd object in the API server. But for now these Cmds are kept up to date as part of the buildcontroller, rather than by the runtime controller.
Fixes #5926
Signed-off-by: Nick Santos [email protected]