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] Allow to define resource requests/limits for the containers in the upgrade/cleanup job #305

Merged
merged 2 commits into from
Sep 25, 2021

Conversation

weseven
Copy link
Contributor

@weseven weseven commented Sep 18, 2021

This PR allows to define resource requests and limits for the containers in the upgrade and cleanup jobs.
This is necessary in kubernetes clusters where an admission controller prevents the creation of pods without proper resource requests and limits.

Checklist

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

…rs in the upgrade/cleanup job.

Signed-off-by: Daniel Simionato <[email protected]>
Signed-off-by: Daniel Simionato <[email protected]>
@@ -53,6 +53,10 @@ spec:
kubectl delete volumesnapshotlocation --all;
kubectl delete podvolumerestore --all;
kubectl delete crd -l app.kubernetes.io/name=velero;
{{- with .Values.kubectl.resources }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Should these additions be put behind a conditional so that empty "resources" fields aren't added? I'm not 100% sure that it matters, but that way there's no change in yaml for cases where the optional resources aren't specified:

    {{- if .Values.kubectl.resources }}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi,
thanks for the review.

I had the same concern but testing with helm template if resources is empty (either resources: {} like in values.yaml or simply resources:) nothing gets included in the final manifest. Basically, if there's something defined it gets converted in yaml and indented with 12 spaces; if there's nothing, nothing gets added as expected.

The same style of inclusion is used freely in the chart ( e.g. for the resources of the main deployment here

{{- with .Values.resources }}
, the same goes for nodeSelector,affinity, tolerations, etc.).

Copy link
Collaborator

@jenting jenting Sep 25, 2021

Choose a reason for hiding this comment

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

I prefer the with syntax personally.

@jenting jenting self-requested a review September 25, 2021 10:55
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 for the contribution @weseven

@jenting jenting merged commit 71b60d1 into vmware-tanzu:main Sep 25, 2021
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.

3 participants