k8s: inject pull policies into crds #4304
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
nicks
approved these changes
Mar 11, 2021
internal/k8s/jsonpath/value.go
Outdated
| func (v *Value) Sibling(name string) (val Value, ok bool) { | ||
| key := reflect.ValueOf(name) | ||
| sib := v.parentMap.MapIndex(key) | ||
| if sib == (reflect.Value{}) { |
There was a problem hiding this comment.
i think sib.IsZero() would be more idiomatic
There was a problem hiding this comment.
what a great error message: panic: reflect: call of reflect.Value.IsZero on zero Value
It looks like:
Value.IsZeroreturns true if it's got the value's zero value, and panics otherwise.MapIndexreturns an untyped zero valueValue.IsValidis what we want for this case
internal/k8s/locator.go
Outdated
| @@ -121,6 +125,10 @@ func (l *JSONPathImageLocator) Inject(e K8sEntity, selector container.RefSelecto | |||
| if selector.Matches(ref) { | |||
| val.Set(reflect.ValueOf(container.FamiliarString(injectRef))) | |||
| modified = true | |||
|
|
|||
| if pullPolicyVal, ok := val.Sibling(imagePullPolicyKey); ok { | |||
There was a problem hiding this comment.
can you also check pullPolicyVal.CanSet()? always get nervous about Value.Set panicking
There was a problem hiding this comment.
ha, did you see the CI failure?
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.
Fixes #4291
Problem
For standard k8s objects, Tilt will inject an image pull policy. For CRDs, it will not.
It's relatively common for CRDs to use the normal k8s container spec, with "image" and "imagePullPolicy" fields. Tilt provides a way for users to configure how to inject the image ref, but leave users to their own devices when it comes to imagePullPolicy.
Solution
If a CRD "image" field has an "imagePullPolicy" neighbor, inject the pull policy.
Note: the image object locator (where you specify, e.g., a repo and ref field) just ignores the pull policy. An obvious answer here is to add an option to specify the pull policy field. My weak gut instinct is it's not worth the effort to worry about that until someone complains. I'm happy to do that as well if someone has a different gut instinct.