Check source for nil artifact before loading chart #768
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
hiddeco
reviewed
Sep 11, 2023
Comment on lines
121
to
124
| artifact := source.GetArtifact() | ||
| if artifact == nil { | ||
| return nil, fmt.Errorf("source '%s/%s' has no artifact", source.GetNamespace(), source.GetName()) | ||
| } |
There was a problem hiding this comment.
Would do this before the creation of the temporary file, as we do not need it without the Artifact being present.
| artifactURL := source.GetArtifact().URL | ||
| artifact := source.GetArtifact() | ||
| if artifact == nil { | ||
| return nil, fmt.Errorf("source '%s/%s' has no artifact", source.GetNamespace(), source.GetName()) |
There was a problem hiding this comment.
Suggested change
| return nil, fmt.Errorf("source '%s/%s' has no artifact", source.GetNamespace(), source.GetName()) | |
| return nil, fmt.Errorf("can not load Helm chart: source '%s/%s' has no artifact", source.GetNamespace(), source.GetName()) |
would probably be more descriptive.
| @@ -231,7 +231,8 @@ func (r *HelmReleaseReconciler) reconcile(ctx context.Context, hr v2.HelmRelease | |||
| } | |||
|
|
|||
| // Check chart readiness | |||
| if hc.Generation != hc.Status.ObservedGeneration || !apimeta.IsStatusConditionTrue(hc.Status.Conditions, meta.ReadyCondition) { | |||
| if hc.Generation != hc.Status.ObservedGeneration || | |||
| !apimeta.IsStatusConditionTrue(hc.Status.Conditions, meta.ReadyCondition) || hc.GetArtifact() == nil { | |||
There was a problem hiding this comment.
Given it should really be an edge case, doing this in one place (before attempting to load) should be sufficient IMHO.
somtochiama
force-pushed
the
nil-artifac
branch
2 times, most recently
from
56f05a4 to
6efb5b6
Compare
Signed-off-by: Somtochi Onyekwere <[email protected]>
somtochiama
force-pushed
the
nil-artifac
branch
from
6efb5b6 to
c1d77ad
Compare
hiddeco
approved these changes
Sep 11, 2023
18 tasks
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.
This pull request adds a check for nil artifact when determining if the source chart is ready.
A recovered nil panic was reported on Slack.
https://cloud-native.slack.com/archives/CLAJ40HV3/p1694379977158039?thread_ts=1694280268.559579&cid=CLAJ40HV3