opensource/flux2
1
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2025-11-03 03:12:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #185 from fluxcd/helmrelease-json-pointer

Browse Source
This commit is contained in:
Hidde Beydals
2020-09-01 11:32:00 +02:00
committed by GitHub
parent 22ff25269d e751bdc8a9
commit cb23d3ff3c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/tk/create_helmrelease.go
View File

@ -154,7 +154,7 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
return fmt.Errorf("converting values to JSON from %s failed: %w", hrValuesFile, err) return fmt.Errorf("converting values to JSON from %s failed: %w", hrValuesFile, err)
} }
helmRelease.Spec.Values = apiextensionsv1.JSON{Raw: json} helmRelease.Spec.Values = &apiextensionsv1.JSON{Raw: json}
} }
if export { if export {

2
cmd/tk/reconcile_helmrelease.go
View File

@ -138,7 +138,7 @@ func isHelmReleaseReady(ctx context.Context, kubeClient client.Client, name, nam
if condition.Type == helmv2.ReadyCondition { if condition.Type == helmv2.ReadyCondition {
if condition.Status == corev1.ConditionTrue { if condition.Status == corev1.ConditionTrue {
return true, nil return true, nil
} else if condition.Status == corev1.ConditionFalse { } else if condition.Status == corev1.ConditionFalse && helmRelease.Status.LastAttemptedRevision != "" {
return false, fmt.Errorf(condition.Message) return false, fmt.Errorf(condition.Message)
} }
} }