[virtual-machine] fix: specify ports even for wholeIP mode #1000

kvaps · 2025-05-28T18:13:01Z

There is an issue with wholeIP services: internal communication from pods doesn't work as expected.

Cilium intercepts pod-to-pod traffic, preventing cozy-proxy from rewriting the source IP in return packets.

This PR allows Cilium to handle specified ports, enabling hairpin traffic to work correctly at least for these cases.

Summary by CodeRabbit

Bug Fixes
- Improved service port configuration to ensure explicit port definitions are respected when using the "WholeIP" method. Now, custom external ports will not be overridden, providing more accurate and expected service exposure.

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>

coderabbitai · 2025-05-28T18:13:08Z

Walkthrough

The logic for configuring service ports in two YAML templates was updated. Now, when the externalMethod is "WholeIP", port 65535 is only set if externalPorts is not defined or empty. If externalPorts is defined, its values are used for port configuration, regardless of externalMethod.

Changes

File(s)	Change Summary
packages/apps/virtual-machine/templates/service.yaml	Refined condition for setting service port: only assigns 65535 if `externalMethod` is "WholeIP" and `externalPorts` is not set or empty. If `externalPorts` is present, enumerates those ports.
packages/apps/vm-instance/templates/service.yaml	Same logic refinement as above: port 65535 is set only if `externalPorts` is not defined or empty; otherwise, uses `externalPorts` values.

Suggested reviewers

lllamnyp
klinch0

Poem

A hop and a skip, through YAML we go,
Where ports once were rigid, now flexibly flow.
If "WholeIP" is chosen, but ports are defined,
The numbers you list are the ones we will bind.
With logic refined, the service will gleam—
A rabbit’s delight in a port-mapping dream! 🐇✨

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.

coderabbitai

Actionable comments posted: 0

♻️ Duplicate comments (1)

packages/apps/vm-instance/templates/service.yaml (1)
20-28: Duplicate port-override logic—extract into a shared helper
This ports block is identical to the one in virtual-machine/templates/service.yaml. To reduce duplication and simplify future maintenance, you might extract it into a named template, for example:
{{- define "vm.ports" -}}
{{- if and (eq .Values.externalMethod "WholeIP") (empty .Values.externalPorts) }}
- port: 65535
{{- else }}
{{- range .Values.externalPorts }}
- name: port-{{ . }}
  port: {{ . }}
  targetPort: {{ . }}
{{- end }}
{{- end }}
{{- end }}
Then invoke it in both service manifests:
ports:
  {{ include "vm.ports" . | nindent 2 }}

🧹 Nitpick comments (1)

packages/apps/virtual-machine/templates/service.yaml (1)
20-28: Respect explicit externalPorts in WholeIP mode
The updated conditional correctly prevents defaulting to port 65535 when .Values.externalPorts is defined (even if empty lists are treated as false). This aligns perfectly with the PR objective to honor explicit port definitions under WholeIP.
Consider using the Sprig empty function for improved readability and to clearly convey intent:
- {{- if and (eq .Values.externalMethod "WholeIP") (not .Values.externalPorts) }}
+ {{- if and (eq .Values.externalMethod "WholeIP") (empty .Values.externalPorts) }}

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between c941e48 and 7b8e7e4.

📒 Files selected for processing (2)

packages/apps/virtual-machine/templates/service.yaml (1 hunks)
packages/apps/vm-instance/templates/service.yaml (1 hunks)

⏰ Context from checks skipped due to timeout of 90000ms (1)

GitHub Check: Build and Test

[virtual-machine] fix: specify ports even for wholeIP mode

7b8e7e4

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>

kvaps requested review from lllamnyp and klinch0 as code owners May 28, 2025 18:13

coderabbitai bot reviewed May 28, 2025

View reviewed changes

lllamnyp approved these changes May 28, 2025

View reviewed changes

kvaps merged commit 0e22e3c into main May 28, 2025
6 checks passed

kvaps deleted the fix-hairpin-traffic branch May 28, 2025 18:53

coderabbitai bot mentioned this pull request Aug 29, 2025

[virtual-machine] Use external IP for egress traffic for PortList method too #1349

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[virtual-machine] fix: specify ports even for wholeIP mode #1000

[virtual-machine] fix: specify ports even for wholeIP mode #1000

Uh oh!

kvaps commented May 28, 2025 •

edited

Loading

Uh oh!

coderabbitai bot commented May 28, 2025 •

edited

Loading

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Uh oh!

Uh oh!

Uh oh!

[virtual-machine] fix: specify ports even for wholeIP mode #1000

[virtual-machine] fix: specify ports even for wholeIP mode #1000

Uh oh!

Conversation

kvaps commented May 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

coderabbitai bot commented May 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Suggested reviewers

Poem

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

kvaps commented May 28, 2025 •

edited

Loading

coderabbitai bot commented May 28, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)