Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[velero] fix: render schedule annotations only if present in values #616

Merged
merged 2 commits into from
Sep 5, 2024

Conversation

maxsxu
Copy link
Contributor

@maxsxu maxsxu commented Aug 28, 2024

Special notes for your reviewer:

The charts/velero/templates/schedule.yaml will always render the annotations section even if there is no values defined, which will bring following meaningless result:

kind: Schedule
metadata:	
+  annotations: null

And many tools like argo-cd will treat it as diff, so we should only render annotations only if present in values.

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • DCO signed
  • Chart Version bumped, please refer to the chart version instruction
  • Variables are documented in the values.yaml or README.md
  • Title of the PR starts with chart name (e.g. [velero])

@anshulahuja98
Copy link
Collaborator

LGTM

jenting
jenting previously approved these changes Sep 3, 2024
Copy link
Collaborator

@jenting jenting left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks.

@maxsxu
Copy link
Contributor Author

maxsxu commented Sep 4, 2024

LGTM, thanks.

@jenting I just resolved the conflicts of Chart.yaml, could you help review again? Thanks!

@maxsxu maxsxu requested a review from jenting September 4, 2024 07:04
@maxsxu
Copy link
Contributor Author

maxsxu commented Sep 4, 2024

@ywk253100 @qiuming-best do you know if you'll have time to review this PR? very appreciate.

@ywk253100 ywk253100 merged commit 47b2f72 into vmware-tanzu:main Sep 5, 2024
15 checks passed
@maxsxu maxsxu deleted the fix-schedule-annotations branch September 6, 2024 02:44
wyattfry pushed a commit to wyattfry/helm-charts that referenced this pull request Oct 24, 2024
ywk253100 pushed a commit that referenced this pull request Oct 30, 2024
* fix: render schedule annotations only if present in values (#616)

Signed-off-by: Max Xu <[email protected]>
Signed-off-by: Wyatt Fry <[email protected]>

* Add Kubernetes-recommended Version Label

Signed-off-by: Wyatt Fry <[email protected]>

* Bump chart version

Signed-off-by: Wyatt Fry <[email protected]>

---------

Signed-off-by: Max Xu <[email protected]>
Signed-off-by: Wyatt Fry <[email protected]>
Co-authored-by: Max Xu <[email protected]>
Co-authored-by: Wyatt Fry <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants