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

update versions/BUF_VERSION #2703

Merged
merged 1 commit into from
Oct 16, 2024
Merged

Conversation

vankichi
Copy link
Contributor

@vankichi vankichi commented Oct 16, 2024

Description

Due to the current buf version, we cannot execute the make license format completely, so I have updated the buf version.
( buf@v2 can be used over 1.32.0 )

Note:
After updating the buf version, I executed make license format and observed that 2 docker files had changed the ENV order.

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

    • Added environment variable RUSTUP_HOME to enhance Rust tool configurations in Docker containers.
  • Version Update

    • Updated application version from v1.28.1 to v1.45.0.

@vankichi vankichi requested review from kpango and kmrmt October 16, 2024 03:09
Copy link
Contributor

coderabbitai bot commented Oct 16, 2024

📝 Walkthrough

Walkthrough

The pull request includes modifications to two Dockerfiles, specifically dockers/agent/core/agent/Dockerfile and dockers/ci/base/Dockerfile. Key updates involve the addition of the RUSTUP_HOME environment variable, adjustments to the formatting of environment variable declarations, and a structured approach to installation commands. Additionally, the version number in versions/BUF_VERSION has been updated from v1.28.1 to v1.45.0. These changes enhance the clarity and functionality of the Dockerfiles while maintaining existing configurations.

Changes

File Paths Change Summary
dockers/agent/core/agent/Dockerfile Added ENV RUSTUP_HOME=/usr/local/lib/rust/rustup, adjusted formatting, maintained installation commands.
dockers/ci/base/Dockerfile Added ENV RUSTUP_HOME=${RUST_HOME}/rustup, adjusted formatting, maintained installation commands.
versions/BUF_VERSION Updated version from v1.28.1 to v1.45.0.

Possibly related PRs

Suggested labels

type/refactoring, size/L, actions/backport/release/v1.7

Suggested reviewers

  • kpango
  • hlts2

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.

@vdaas-ci
Copy link
Collaborator

[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

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 (1)
dockers/ci/base/Dockerfile (1)

Line range hint 1-124: Consider optimizing Dockerfile for better caching and smaller image size

While the current Dockerfile structure is good, consider the following optimizations:

  1. Group related RUN commands: Combine related installation commands into a single RUN instruction to reduce the number of layers.
  2. Use --no-install-recommends consistently: Ensure this flag is used for all apt-get install commands to minimize unnecessary package installations.
  3. Clean up package manager cache: Add rm -rf /var/lib/apt/lists/* at the end of apt-get operations to reduce image size.
  4. Use specific versions: For tools installed via make, consider specifying versions to ensure reproducibility.

Here's an example of how you could optimize the RUN instruction:

RUN --mount=type=bind,target=.,rw \
    --mount=type=tmpfs,target=/tmp \
    --mount=type=cache,target=/var/lib/apt,sharing=locked,id=${APP_NAME} \
    --mount=type=cache,target=/var/cache/apt,sharing=locked,id=${APP_NAME} \
    --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \
    --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \
    --mount=type=tmpfs,target="${GOPATH}/src" \
    set -ex \
    && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \
    && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \
    && apt-get update -y \
    && apt-get upgrade -y \
    && apt-get install -y --no-install-recommends --fix-missing \
       build-essential ca-certificates curl tzdata locales git npm cmake g++ gcc \
       libssl-dev unzip liblapack-dev libomp-dev libopenblas-dev gfortran pkg-config \
       file gawk gnupg2 graphviz jq libaec-dev libhdf5-dev sed zip \
    && ldconfig \
    && echo "${LANG} UTF-8" > /etc/locale.gen \
    && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \
    && locale-gen ${LANGUAGE} \
    && update-locale LANG=${LANGUAGE} \
    && dpkg-reconfigure -f noninteractive tzdata \
    && apt-get clean \
    && apt-get autoclean -y \
    && apt-get autoremove -y \
    && rm -rf /var/lib/apt/lists/* \
    && make GOPATH="${GOPATH}" GOROOT="${GOROOT}" GO_VERSION="${GO_VERSION}" go/install \
    && make GOPATH="${GOPATH}" GOROOT="${GOROOT}" GO_VERSION="${GO_VERSION}" go/download \
    && make RUST_VERSION="${RUST_VERSION}" rust/install \
    && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} deps GO_CLEAN_DEPS=false \
    && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} golangci-lint/install \
    && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} gotestfmt/install \
    && make cmake/install buf/install hdf5/install helm-docs/install helm/install \
       k3d/install k9s/install kind/install kubectl/install kubelinter/install \
       minikube/install reviewdog/install stern/install telepresence/install \
       tparse/install yq/install ngt/install faiss/install usearch/install \
    && rm -rf ${GOPATH}/src/github.com/${ORG}/${REPO}/*

This optimization reduces the number of layers and ensures consistent cleanup across all package installations.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between b21a4f7 and 98aaa52.

📒 Files selected for processing (3)
  • dockers/agent/core/agent/Dockerfile (1 hunks)
  • dockers/ci/base/Dockerfile (1 hunks)
  • versions/BUF_VERSION (1 hunks)
✅ Files skipped from review due to trivial changes (1)
  • versions/BUF_VERSION
🧰 Additional context used
🔇 Additional comments (2)
dockers/agent/core/agent/Dockerfile (1)

43-43: LGTM: Addition of RUSTUP_HOME environment variable

The addition of the RUSTUP_HOME environment variable is a good practice when working with Rust in Docker environments. It explicitly sets the location for Rust toolchain files, which can improve consistency and ease of management. This change aligns well with the existing CARGO_HOME variable and follows Rust's recommended setup.

dockers/ci/base/Dockerfile (1)

48-48: LGTM! Consider verifying Rust tool installations.

The addition of the RUSTUP_HOME environment variable is a good practice for Rust development environments. It properly separates Rustup-specific files from other Rust-related files and is consistent with the existing CARGO_HOME variable.

To ensure this change doesn't affect existing Rust tool installations, consider running the following verification script:

@kpango kpango merged commit 0a8b332 into main Oct 16, 2024
67 checks passed
@kpango kpango deleted the deps/versions/update-buf-version-for-v2 branch October 16, 2024 05:15
vdaas-ci pushed a commit that referenced this pull request Oct 16, 2024
vankichi added a commit that referenced this pull request Oct 16, 2024
Signed-off-by: vankichi <[email protected]>
Co-authored-by: Kiichiro YUKAWA <[email protected]>
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.

4 participants