Skip to content

NATs: fix hardcode, add merge and resolve config #514

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

Merged
merged 2 commits into from
Dec 6, 2024

Conversation

klinch0
Copy link
Contributor

@klinch0 klinch0 commented Dec 5, 2024

Summary by CodeRabbit

Release Notes

  • New Features

    • Introduced new configuration parameters for Jetstream, including jetstream.size and jetstream.enabled, enhancing storage and functionality options.
    • Added support for merging additional configurations with config.merge and config.resolver.
  • Bug Fixes

    • Improved password generation and configuration merging logic for better flexibility in deployments.
  • Version Updates

    • NATS application version updated from 0.3.1 to 0.4.0.

@klinch0 klinch0 requested a review from kvaps as a code owner December 5, 2024 18:21
@dosubot dosubot bot added the size:M This PR changes 30-99 lines, ignoring generated files. label Dec 5, 2024
Copy link
Contributor

coderabbitai bot commented Dec 5, 2024

Walkthrough

The changes in this pull request primarily involve updates to the NATS application configuration files. The Chart.yaml file's version has been incremented from 0.3.1 to 0.4.0. The README.md has been updated to include new configuration parameters for Jetstream and additional configuration merging options. The nats.yaml template has been modified to enhance password handling and configuration logic. New properties related to Jetstream and configuration options have also been added to the JSON schema and values files. Lastly, the versioning information in the versions_map has been updated accordingly.

Changes

File Change Summary
packages/apps/nats/Chart.yaml Updated version from 0.3.1 to 0.4.0; appVersion remains "1.4.1".
packages/apps/nats/README.md Added new parameters: jetstream.size, jetstream.enabled, config.merge, config.resolver.
packages/apps/nats/templates/nats.yaml Enhanced password generation logic; updated configuration merging logic for user accounts and Jetstream.
packages/apps/nats/values.schema.json Added new properties: jetstream (with size and enabled), config (with merge and resolver).
packages/apps/nats/values.yaml Introduced new jetstream section (with size and enabled) and config section (with merge and resolver).
packages/apps/versions_map Updated version for nats from 0.3.1 HEAD to 0.3.1 b7375f73 and added new version 0.4.0 HEAD.

Possibly related PRs

  • add password for nats #477: Involves an update to the Chart.yaml file for the NATS application, incrementing the version from 0.3.0 to 0.3.1, related to the version update in this PR.
  • add services to dashboard #482: Changes to the Redis application's Chart.yaml, similar in nature to the version update in the NATS application.

Suggested labels

enhancement, size:M, lgtm

Suggested reviewers

  • kvaps

🐰 In the meadow, changes bloom,
NATS grows stronger, making room.
With Jetstream's size and merge in tow,
Configs dance, and features grow!
A hop, a skip, to version four,
Let's celebrate, and hop some more! 🌼


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 2629a6b and 561182f.

📒 Files selected for processing (1)
  • packages/apps/nats/values.yaml (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/apps/nats/values.yaml

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ 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.
    • Generate unit testing code for this file.
    • 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 generate unit testing code for this file.
    • @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 generate unit testing code.
    • @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.

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

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (6)
packages/apps/nats/README.md (1)

15-16: Update description for config.resolver parameter

The description for config.resolver is identical to config.merge. Consider updating it to better describe its specific purpose for resolver configuration.

-| `config.resolver`   | Additional configuration to merge into NATS config | `{}`    |
+| `config.resolver`   | Additional resolver configuration to merge         | `{}`    |
packages/apps/nats/values.yaml (1)

36-39: Update description for config.resolver parameter

The description should be more specific about the resolver configuration's purpose, similar to the README update.

-  ## Allows you to customize NATS server settings by merging resolver configurations.
+  ## Allows you to customize NATS resolver settings for service discovery.
packages/apps/nats/values.schema.json (2)

44-46: Update description for resolver configuration

The description should be more specific about the resolver's purpose, matching the updates in README and values.yaml.

-                    "description": "Additional configuration to merge into NATS config",
+                    "description": "Additional resolver configuration for service discovery",

20-34: Consider enhancing schema validation

The schema could be improved with:

  1. Required fields specification for critical parameters
  2. additionalProperties: false to prevent unexpected configuration
         "jetstream": {
             "type": "object",
+            "required": ["size", "enabled"],
+            "additionalProperties": false,
             "properties": {
                 // ... existing properties ...
             }
         },
         "config": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
                 // ... existing properties ...
             }
         }

Also applies to: 35-48

packages/apps/nats/templates/nats.yaml (2)

43-57: Consider simplifying the merge condition.

The condition logic is correct, but could be more concise using and with hasKey.

Consider this alternative:

-        {{- if or (gt (len $passwords) 0) (gt (len .Values.config.merge) 0) }}
+        {{- if or (gt (len $passwords) 0) (and .Values.config.merge (gt (len .Values.config.merge) 0)) }}

This maintains the same functionality while being more idiomatic in Helm templates.


69-74: Consider storage requirements documentation.

Since Jetstream requires persistent storage, it would be beneficial to document the storage requirements and implications, especially regarding:

  • Minimum recommended storage size
  • Storage class compatibility
  • Backup considerations
  • Scaling implications

Consider adding these details to the README.md file to help users make informed decisions about storage configuration.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between b7a51ba and 2629a6b.

📒 Files selected for processing (6)
  • packages/apps/nats/Chart.yaml (1 hunks)
  • packages/apps/nats/README.md (1 hunks)
  • packages/apps/nats/templates/nats.yaml (2 hunks)
  • packages/apps/nats/values.schema.json (1 hunks)
  • packages/apps/nats/values.yaml (1 hunks)
  • packages/apps/versions_map (1 hunks)
✅ Files skipped from review due to trivial changes (1)
  • packages/apps/nats/Chart.yaml
🔇 Additional comments (5)
packages/apps/versions_map (1)

55-56: LGTM! Version mapping correctly updated.

The version mapping changes appropriately reflect:

  • Assignment of commit hash b7375f73 to version 0.3.1
  • Addition of new version 0.4.0 as HEAD

This aligns with the version bump in Chart.yaml and follows the established version mapping pattern.

packages/apps/nats/values.yaml (1)

19-35: LGTM! Well-structured configuration with clear documentation.

The Jetstream configuration is well-organized with appropriate defaults and helpful comments explaining each parameter.

packages/apps/nats/values.schema.json (1)

19-48: LGTM! Schema properly validates new configuration parameters.

The schema correctly defines types and defaults for all new parameters, maintaining consistency with values.yaml.

packages/apps/nats/templates/nats.yaml (2)

58-60: LGTM! Proper configuration handling.

The resolver configuration is well-implemented with appropriate existence checks and YAML handling.


70-73: Verify Jetstream configuration values.

The Jetstream configuration looks correct, but let's verify that the required values are properly defined in the values file.

✅ Verification successful

Jetstream configuration values are properly defined and documented

The verification confirms that:

  • Values are properly defined in values.yaml with default size of 10Gi
  • Both jetstream.enabled and jetstream.size are documented in README.md
  • Schema validation is in place with proper types and descriptions for both properties
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify Jetstream configuration values are properly defined

# Check for jetstream configuration in values.yaml
echo "Checking for Jetstream configuration in values.yaml:"
rg -A 5 'jetstream:' packages/apps/nats/values.yaml

# Check for documentation of these values
echo -e "\nChecking for documentation in README:"
rg -A 5 'jetstream' packages/apps/nats/README.md

# Check schema validation
echo -e "\nChecking schema validation for Jetstream properties:"
rg -A 10 'jetstream' packages/apps/nats/values.schema.json

Length of output: 1428

@dosubot dosubot bot added size:L This PR changes 100-499 lines, ignoring generated files. and removed size:M This PR changes 30-99 lines, ignoring generated files. labels Dec 6, 2024
@kvaps kvaps changed the title fix hardcode, add merge and resolve config NATs: fix hardcode, add merge and resolve config Dec 6, 2024
Copy link
Member

@kvaps kvaps left a comment

Choose a reason for hiding this comment

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

LGTM

@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Dec 6, 2024
@kvaps kvaps merged commit da1e705 into cozystack:main Dec 6, 2024
1 check passed
This was referenced Dec 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm This PR has been approved by a maintainer size:L This PR changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants