Skip to content

refactor: Further simplify Makefiles#2073

Open
Camila-B wants to merge 3 commits intoGoogleContainerTools:mainfrom
Camila-B:cleanup-makefiles
Open

refactor: Further simplify Makefiles#2073
Camila-B wants to merge 3 commits intoGoogleContainerTools:mainfrom
Camila-B:cleanup-makefiles

Conversation

@Camila-B
Copy link
Contributor

@Camila-B Camila-B commented Feb 25, 2026

  • Removes deprecated aliases
  • Removes unused variables
  • Creates pattern rule for %-in-docker

@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

@gemini-code-assist
Copy link

Summary of Changes

Hello @Camila-B, 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 refactors the project's Makefiles to enhance their simplicity and maintainability. It achieves this by eliminating obsolete variables and deprecated aliases, and by introducing a flexible pattern rule for executing make targets within a Docker build environment. These changes streamline the build process and reduce redundant code.

Highlights

  • Makefile Simplification: Removed several unused variables and deprecated aliases across multiple Makefiles to reduce clutter and improve maintainability.
  • Docker Pattern Rule: Introduced a generic '%-in-docker' pattern rule in the main Makefile, allowing any make target to be run within the build environment Docker container more concisely.
  • Consolidated Controller Generation Paths: Centralized the 'CONTROLLER_GEN_PATHS' variable in 'Makefile.reconcilermanager' to avoid repetition and simplify future updates for API path definitions.

🧠 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
    • Removed the 'NOMOS_LOCAL' variable.
    • Added a new '%-in-docker' pattern rule to generalize running targets in Docker.
    • Updated the 'test-presubmit' target to utilize the new '__test-presubmit-in-docker' pattern.
  • Makefile.build
    • Removed the deprecated 'build-images-multirepo' alias.
    • Removed the deprecated 'push-images-multirepo' alias.
    • Removed the deprecated 'pull-images-multirepo' alias.
    • Removed the deprecated 'retag-images-multirepo' alias.
  • Makefile.e2e
    • Removed the 'GOTOPT2_BINARY' variable.
  • Makefile.gen
    • Removed the 'clientgen-in-docker' target, now covered by the generic '%-in-docker' rule.
  • Makefile.reconcilermanager
    • Defined 'CONTROLLER_GEN_PATHS' as a new variable to consolidate API paths.
    • Removed the 'generate-in-docker' target, now covered by the generic '%-in-docker' rule.
    • Removed the 'configsync-crds-in-docker' target, now covered by the generic '%-in-docker' rule.
Activity
  • No human activity has been recorded on this pull request yet.
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 refactors the Makefiles to simplify the build logic by removing unused variables and deprecated targets, and introduces a generic %-in-docker pattern rule to reduce code duplication. While these changes improve maintainability and readability, a potential command injection vulnerability was identified in the new %-in-docker pattern rule where the target stem is used unquoted in a shell command.

# Run any make target in the docker buildenv container
# e.g. make clientgen-in-docker -> docker run ... make clientgen
%-in-docker: buildenv-dirs
@docker run $(DOCKER_RUN_ARGS) make $*

Choose a reason for hiding this comment

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

security-medium medium

The pattern rule %-in-docker uses the stem $* directly in a shell command without quoting. If the target name contains shell metacharacters (e.g., ;, &, |), it can lead to arbitrary command execution on the host running make. For example, running make 'foo; touch /tmp/pwned-in-docker' would execute touch /tmp/pwned on the host. To remediate this, quote the $* variable.

	@docker run $(DOCKER_RUN_ARGS) make "$*"

@Camila-B
Copy link
Contributor Author

/retest

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.

1 participant