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

Backport PR #2736 to release/v1.7 for update ubuntu version for devcontainer #2750

Conversation

vdaas-ci
Copy link
Collaborator

Description

SSIA

Related Issue

Versions

  • Vald Version: v1.7.13
  • Go Version: v1.23.2
  • Rust Version: v1.81.0
  • Docker Version: v27.3.1
  • Kubernetes Version: v1.31.1
  • Helm Version: v3.16.2
  • NGT Version: v2.2.4
  • Faiss Version: v1.9.0

Checklist

Special notes for your reviewer

Summary by CodeRabbit

  • New Features

    • Updated base image for development environment to Ubuntu 24.04.
    • Enhanced installation processes for Helm and Helm Docs to support multiple architectures.
  • Bug Fixes

    • Streamlined package installation process for development tools and dependencies.
  • Chores

    • Removed unnecessary components from the installation sequence, improving efficiency.

* ♻️ update ubuntu version for devcontainer

Signed-off-by: vankichi <kyukawa315@gmail.com>

* 💚 add platform opts

Signed-off-by: vankichi <kyukawa315@gmail.com>

* ♻️ Remove unnecessary installation

Signed-off-by: vankichi <kyukawa315@gmail.com>

* ♻️ Change install helm command

Signed-off-by: vankichi <kyukawa315@gmail.com>

* ♻️ Fix

Signed-off-by: vankichi <kyukawa315@gmail.com>

* ♻️ Fix

Signed-off-by: vankichi <kyukawa315@gmail.com>

* ♻️ Fix

Signed-off-by: vankichi <kyukawa315@gmail.com>

* 💚 remove platform opts

Signed-off-by: vankichi <kyukawa315@gmail.com>

---------

Signed-off-by: vankichi <kyukawa315@gmail.com>
Co-authored-by: Yusuke Kato <kpango@vdaas.org>
Copy link

cloudflare-workers-and-pages bot commented Nov 18, 2024

Deploying vald with  Cloudflare Pages  Cloudflare Pages

Latest commit: dfdd825
Status: ✅  Deploy successful!
Preview URL: https://553bc2b5.vald.pages.dev
Branch Preview URL: https://backport-release-v1-7-refact-myw3.vald.pages.dev

View logs

Copy link
Contributor

coderabbitai bot commented Nov 18, 2024

📝 Walkthrough

Walkthrough

The pull request introduces modifications to the Makefile.d/helm.mk and the dockers/dev/Dockerfile. The Makefile changes enhance the Helm installation process by making it architecture-aware and standardizing command syntax. The Dockerfile updates the base image from Ubuntu 22.04 to 24.04 and adjusts the package installation sequence. The overall structure of both files is maintained, with no new targets or major removals.

Changes

File Path Change Summary
Makefile.d/helm.mk Updated Helm installation process to be architecture-aware; standardized tar extraction command; clarified .PHONY targets for Helm chart packaging.
dockers/dev/Dockerfile Changed base image from ubuntu22.04 to ubuntu24.04; modified package installation order; removed software-properties-common.

Possibly related PRs

Suggested labels

priority/low, type/refactoring, size/M, area/makefile, actions/backport/release/v1.7

Suggested reviewers

  • vankichi
  • kmrmt

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: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 05d4378 and dfdd825.

⛔ Files ignored due to path filters (1)
  • hack/docker/gen/main.go is excluded by !**/gen/**
📒 Files selected for processing (2)
  • Makefile.d/helm.mk (2 hunks)
  • dockers/dev/Dockerfile (2 hunks)
🔇 Additional comments (4)
dockers/dev/Dockerfile (2)

22-22: Verify tool compatibility with Ubuntu 24.04

Given this is a development container with extensive tooling, please ensure all installed components are compatible with Ubuntu 24.04:

  1. Verify all Make targets work correctly
  2. Test the complete container build process
  3. Document any known compatibility issues or required workarounds
#!/bin/bash
# Check for any Ubuntu version specific configurations or dependencies
rg -i "ubuntu.*?(22\.04|24\.04)" .

# Look for version-specific package dependencies in make targets
fd Makefile . -x grep -l "apt-get"

Also applies to: 70-71


70-71: Verify removal of software-properties-common dependency

The package installation order change for curl and gnupg is good. However, please verify that removing software-properties-common doesn't affect any subsequent operations in the Dockerfile, particularly:

  1. Node.js setup that uses the nodesource repository
  2. Any other commands that might use add-apt-repository
✅ Verification successful

Let me gather more specific information about the Node.js installation and repository setup in the Dockerfile.


Removal of software-properties-common package is safe

The Node.js repository setup is using the official nodesource script (curl -fsSL https://deb.nodesource.com/setup_current.x | bash -) which doesn't require software-properties-common. The Dockerfile doesn't use add-apt-repository anywhere, and all package installations are done directly through apt-get. The removal of software-properties-common package won't affect any operations in this Dockerfile.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for potential uses of add-apt-repository or other software-properties-common tools
rg -i "add-apt-repository|software-properties" .

# Check if any installation scripts in the repository use these commands
fd -t f ".*\.(sh|bash)$" . -x grep -l -i "add-apt-repository"

Length of output: 451


Script:

#!/bin/bash
# Check the Dockerfile for Node.js installation and repository setup
cat dockers/dev/Dockerfile

Length of output: 4795

Makefile.d/helm.mk (2)

23-28: LGTM! Improved cross-platform compatibility

The changes enhance the Helm installation process by:

  • Properly handling different architectures (aarch64/arm64, x86_64/amd64)
  • Using a more reliable tarball-based installation
  • Improving maintainability through proper variable usage

40-40: LGTM! Standardized tar syntax

The change from tar xzvf to tar -xzvf improves consistency with GNU tar standard syntax.

@@ -19,7 +19,7 @@
# DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go
ARG UPX_OPTIONS=-9
# skipcq: DOK-DL3026,DOK-DL3007
FROM mcr.microsoft.com/devcontainers/base:ubuntu22.04
FROM mcr.microsoft.com/devcontainers/base:ubuntu24.04
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Reconsider Ubuntu 24.04 upgrade in release branch

Upgrading to Ubuntu 24.04 in a release branch (v1.7) raises concerns:

  1. Ubuntu 24.04 is currently in development/beta phase
  2. This could introduce unexpected stability issues in the development environment
  3. Release branches typically should maintain stable, well-tested configurations

Consider keeping Ubuntu 22.04 LTS for the v1.7 release branch and potentially targeting this upgrade for the next major release instead.

@vdaas-ci
Copy link
Collaborator Author

[CHATOPS:HELP] ChatOps commands.

  • 🙆‍♀️ /approve - approve
  • 🍱 /format - format codes and add licenses
  • /gen-test - generate test codes
  • 🏷️ /label - add labels
  • 🔚 2️⃣ 🔚 /label actions/e2e-deploy - run E2E deploy & integration test

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants