Skip to content

fix add vm job resources - #1217

Merged
Andrei Kvapil (kvaps) merged 1 commit into
mainfrom
vm-fix-vm-upgrade
Jul 17, 2025
Merged

Andrei Kvapil (kvaps) merged 1 commit into
mainfrom
vm-fix-vm-upgrade

Conversation

@klinch0

@klinch0 klinch0 commented Jul 17, 2025 •

Copy link
Copy Markdown
Contributor

What this PR does

Release note

- add resources for vm and vmi jobs

Summary by CodeRabbit

  • New Features

    • Added explicit CPU and memory resource requests and limits for update jobs in both virtual-machine and vm-instance applications to improve resource management.
  • Chores

    • Updated version mappings and chart versions for virtual-machine (to 0.12.2) and vm-instance (to 0.10.1).

@coderabbitai

coderabbitai Bot commented Jul 17, 2025 •

Copy link
Copy Markdown
Contributor

Walkthrough

This update revises version mappings for the virtual-machine and vm-instance components, increments their Helm chart versions, and adds explicit CPU and memory resource requests and limits to the update-resources container in both components' Kubernetes update hook templates.

Changes

Files/Paths Change Summary
packages/apps/versions_map Updated version mappings: set previous versions to a specific commit, added new versions at HEAD.
packages/apps/virtual-machine/Chart.yaml, .../vm-instance/Chart.yaml Incremented chart versions for both components.
.../virtual-machine/templates/vm-update-hook.yaml, .../vm-instance/... Added CPU/memory requests and limits to the update-resources container in update hook Job spec.

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
Loading

Possibly related PRs

Suggested labels

enhancement, size:S, lgtm

Suggested reviewers

  • lllamnyp

Poem

A hop, a skip, a resource tweak,
Chart versions rise, no longer meek.
Memory and CPU now set just right,
For update hooks that run at night.
Versions mapped, the future clear—
The codebase grows, so have no fear!
🐇✨


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.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need 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)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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-resources containers within the vm-update-hook.yaml templates for both virtual-machine and vm-instance applications. 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-machine from 0.12.1 to 0.12.2 and for vm-instance from 0.10.0 to 0.10.1 to reflect the changes introduced in their respective vm-update-hook.yaml templates. The versions_map file 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

  1. 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. ↩

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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.

Comment on lines +55 to +61
resources:
requests:
memory: "16Mi"
cpu: "10m"
limits:
memory: "128Mi"
cpu: "100m"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

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 }}

Comment on lines +45 to +51
resources:
requests:
memory: "16Mi"
cpu: "10m"
limits:
memory: "128Mi"
cpu: "100m"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

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 }}

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (2)
packages/apps/virtual-machine/templates/vm-update-hook.yaml (1)

55-61: Parameterise hard-coded resource requests / limits

Embedding 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: 100m
packages/apps/vm-instance/templates/vm-update-hook.yaml (1)

45-51: Same resource block – consider re-using Helm values

Mirror the recommendation given for virtual-machine so both charts stay configurable from values.yaml.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 909208b and a0b1914.

📒 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 good

Version 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.1 matches the template update. Looks good.

packages/apps/versions_map (1)

173-175: Version map entries consistent

Pinning previous versions and adding HEAD for new ones maintains reproducibility while allowing continued development. 👍

Also applies to: 192-193

@kvaps Andrei Kvapil (kvaps) left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@kvaps
Andrei Kvapil (kvaps) merged commit 725f94f into main Jul 17, 2025
@kvaps
Andrei Kvapil (kvaps) deleted the vm-fix-vm-upgrade branch July 17, 2025 21:19
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.

2 participants