Skip to content

Add consolidated script to update component images#2096

Open
Camila-B wants to merge 2 commits intoGoogleContainerTools:mainfrom
Camila-B:new-make-rules
Open

Add consolidated script to update component images#2096
Camila-B wants to merge 2 commits intoGoogleContainerTools:mainfrom
Camila-B:new-make-rules

Conversation

@Camila-B
Copy link
Contributor

@Camila-B Camila-B commented Mar 11, 2026

  • Consolidates existing update-<component>-image.sh into update-component-image.sh
  • Adds Helm and Kustomize update Make rules

@google-oss-prow
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from camila-b. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@google-oss-prow google-oss-prow bot requested a review from janetkuo March 11, 2026 18:08
@gemini-code-assist
Copy link

Summary of Changes

Hello, 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 introduces a new automated mechanism to keep the otelcontribcol image version up-to-date. By adding a dedicated shell script and integrating it into the Makefile, the process of fetching and applying the latest image tags is streamlined, reducing manual effort and ensuring that the project consistently uses recent and secure versions of the dependency.

Highlights

  • New Automation Script: Introduced scripts/update-otelcontribcol-image.sh to automate the process of updating the otelcontribcol image version.
  • Makefile Integration: Added a new make update-otelcontribcol-image target to the Makefile, allowing users to easily trigger the image version update.
  • Flexible Update Types: The script supports updating to either the latest-version or latest-build of the otelcontribcol image, configurable via the UPDATE_TYPE environment variable.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • Makefile
    • Added comments explaining how to use the new update-otelcontribcol-image target.
    • Introduced a new update-otelcontribcol-image target that executes the scripts/update-otelcontribcol-image.sh script.
  • scripts/update-otelcontribcol-image.sh
    • Added a new executable shell script.
    • Implemented logic to fetch the latest otelcontribcol image tag from gcr.io/config-management-release/otelcontribcol based on UPDATE_TYPE (latest-version or latest-build).
    • Updated the OTELCONTRIBCOL_VERSION variable in the Makefile with the newly fetched tag.
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 by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

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-code-assist Responds in comments when explicitly tagged, both in pull request 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 may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

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.

Copy link

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

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 introduces a script and a corresponding Makefile target to automate the update process for the otelcontribcol image version. The script correctly handles two modes of operation: updating to the latest version and updating to the latest build of the current version. The overall approach is solid. I've provided a few suggestions to enhance the script's robustness by improving how it parses and modifies the Makefile, and to make its error reporting more user-friendly.


set -euo pipefail

REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it possible to consolidate the update scripts for all four components? i.e. update-component-image.sh, and specify git-sync / kustomize / otelcontribcol / helm upon running.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done. I created update-component-image.sh which consolidates the existing update scripts and also adds support for Helm and Kustomize

@google-oss-prow google-oss-prow bot added size/L and removed size/M labels Mar 11, 2026
@Camila-B Camila-B changed the title Add script to update the otelcontribcol image Add consolidated script to update component images Mar 11, 2026
@Camila-B Camila-B removed the request for review from janetkuo March 11, 2026 23:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants