fix add vm job resources - #1217
Conversation
Signed-off-by: kklinch0 <[email protected]>
WalkthroughThis update revises version mappings for the Changes
Sequence Diagram(s)sequenceDiagram
participant User
participant Helm
participant Kubernetes
participant update-resources (Container)
User->>Helm: Deploy/upgrade chart (new version)
Helm->>Kubernetes: Apply manifests (with updated vm-update-hook)
Kubernetes->>update-resources (Container): Start Job with resource requests/limits
update-resources (Container)-->>Kubernetes: Runs with specified CPU/memory constraints
Possibly related PRs
Suggested labels
Suggested reviewers
Poem
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
There was a problem hiding this comment.
Summary of Changes
Hello klinch0, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!
This pull request addresses the need for robust resource management for the virtual-machine and vm-instance applications. I've introduced specific CPU and memory resource requests and limits for their respective update hook jobs, aiming to enhance the stability and reliability of these operations. Concurrently, I've updated the Helm chart versions to align with these functional changes.
Highlights
- Resource Allocation for Update Jobs: I've added explicit resource requests (16Mi memory, 10m CPU) and limits (128Mi memory, 100m CPU) to the
update-resourcescontainers within thevm-update-hook.yamltemplates for bothvirtual-machineandvm-instanceapplications. This ensures these critical jobs have guaranteed resources to prevent failures due to resource starvation. - Helm Chart Version Bumps: I've incremented the Helm chart versions for
virtual-machinefrom0.12.1to0.12.2and forvm-instancefrom0.10.0to0.10.1to reflect the changes introduced in their respectivevm-update-hook.yamltemplates. Theversions_mapfile has also been updated to reflect these new versions and their associated commit hashes.
Using Gemini Code Assist
The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.
Invoking Gemini
You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.
| Feature | Command | Description |
|---|---|---|
| Code Review | /gemini review |
Performs a code review for the current pull request in its current state. |
| Pull Request Summary | /gemini summary |
Provides a summary of the current pull request in its current state. |
| Comment | Gemini (@gemini-code-assist) | Responds in comments when explicitly tagged, both in issue comments and review comments. |
| Help | /gemini help |
Displays a list of available commands. |
Customization
To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.
Limitations & Feedback
Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on Gemini (@gemini-code-assist) comments to provide feedback.
You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.
Footnotes
-
Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩
There was a problem hiding this comment.
Code Review
This pull request adds resource requests and limits to the vm-update-hook jobs in both virtual-machine and vm-instance charts, and updates the chart versions. The feedback focuses on improving the maintainability of these new resource definitions by making them configurable through values.yaml instead of being hardcoded in the templates.
| resources: | ||
| requests: | ||
| memory: "16Mi" | ||
| cpu: "10m" | ||
| limits: | ||
| memory: "128Mi" | ||
| cpu: "100m" |
There was a problem hiding this comment.
The resource requests and limits are hardcoded in the template. To improve maintainability and customization, consider making these configurable via values.yaml. This allows users to override the default values easily.
resources:
requests:
memory: {{ .Values.hook.resources.requests.memory | default "16Mi" | quote }}
cpu: {{ .Values.hook.resources.requests.cpu | default "10m" | quote }}
limits:
memory: {{ .Values.hook.resources.limits.memory | default "128Mi" | quote }}
cpu: {{ .Values.hook.resources.limits.cpu | default "100m" | quote }}
| resources: | ||
| requests: | ||
| memory: "16Mi" | ||
| cpu: "10m" | ||
| limits: | ||
| memory: "128Mi" | ||
| cpu: "100m" |
There was a problem hiding this comment.
The resource requests and limits are hardcoded in the template. To improve maintainability and customization, consider making these configurable via values.yaml. This allows users to override the default values easily.
resources:
requests:
memory: {{ .Values.hook.resources.requests.memory | default "16Mi" | quote }}
cpu: {{ .Values.hook.resources.requests.cpu | default "10m" | quote }}
limits:
memory: {{ .Values.hook.resources.limits.memory | default "128Mi" | quote }}
cpu: {{ .Values.hook.resources.limits.cpu | default "100m" | quote }}
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (2)
packages/apps/virtual-machine/templates/vm-update-hook.yaml (1)
55-61: Parameterise hard-coded resource requests / limitsEmbedding fixed resources inside the template reduces flexibility for operators who might need to tune them cluster-wide via
values.yaml.- resources: - requests: - memory: "16Mi" - cpu: "10m" - limits: - memory: "128Mi" - cpu: "100m" + resources: {{- toYaml ( .Values.updateHook.resources | default dict ) | nindent 12 }}Then expose sensible defaults under
values.yaml:updateHook: resources: requests: memory: 16Mi cpu: 10m limits: memory: 128Mi cpu: 100mpackages/apps/vm-instance/templates/vm-update-hook.yaml (1)
45-51: Same resource block – consider re-using Helm valuesMirror the recommendation given for
virtual-machineso both charts stay configurable fromvalues.yaml.
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (5)
packages/apps/versions_map(2 hunks)packages/apps/virtual-machine/Chart.yaml(1 hunks)packages/apps/virtual-machine/templates/vm-update-hook.yaml(1 hunks)packages/apps/vm-instance/Chart.yaml(1 hunks)packages/apps/vm-instance/templates/vm-update-hook.yaml(1 hunks)
🧰 Additional context used
🧠 Learnings (1)
packages/apps/versions_map (1)
Learnt from: kvaps
PR: cozystack/cozystack#1206
File: packages/apps/versions_map:30-31
Timestamp: 2025-07-16T13:17:07.532Z
Learning: In packages/apps/versions_map, using HEAD for certain versions (like ferretdb 1.0.0) is intentional and part of the core logic, not an oversight that needs to be fixed for reproducibility.
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (2)
- GitHub Check: Build
- GitHub Check: pre-commit
🔇 Additional comments (3)
packages/apps/virtual-machine/Chart.yaml (1)
20-20: Chart version bump looks goodVersion increment correctly reflects template changes and preserves semantic-versioning. No further action required.
packages/apps/vm-instance/Chart.yaml (1)
20-20: Chart version bump acknowledged
version: 0.10.1matches the template update. Looks good.packages/apps/versions_map (1)
173-175: Version map entries consistentPinning previous versions and adding
HEADfor new ones maintains reproducibility while allowing continued development. 👍Also applies to: 192-193
What this PR does
Release note
Summary by CodeRabbit
New Features
Chores