Skip to content

Add the ability to override KUBE_RBAC_PROXY_IMAGE when doing make deploy#204

Draft
nocturnalastro wants to merge 1 commit intok8snetworkplumbingwg:mainfrom
nocturnalastro:add_rbac_proxy_image
Draft

Add the ability to override KUBE_RBAC_PROXY_IMAGE when doing make deploy#204
nocturnalastro wants to merge 1 commit intok8snetworkplumbingwg:mainfrom
nocturnalastro:add_rbac_proxy_image

Conversation

@nocturnalastro
Copy link
Copy Markdown
Collaborator

No description provided.

@gemini-code-assist
Copy link
Copy Markdown

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 enhances the deployment process by introducing greater flexibility for image management. It allows operators to specify a custom Kube RBAC Proxy image, ensuring that deployments can align with specific environment requirements or custom builds. This change streamlines the configuration workflow for critical components during the deployment phase.

Highlights

  • KUBE_RBAC_PROXY_IMAGE Override: Added the ability to override the KUBE_RBAC_PROXY_IMAGE environment variable when running make deploy. This allows users to specify a custom image for the Kube RBAC Proxy during deployment.
  • Makefile Update: Modified the update-env-yaml target in the Makefile to include logic for updating config/manager/env.yaml with the KUBE_RBAC_PROXY_IMAGE if it is set, supporting both Darwin and other operating systems.
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.

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
Copy Markdown

@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 updates the Makefile to include logic for setting the KUBE_RBAC_PROXY_IMAGE in config/manager/env.yaml. The review points out that the new logic for KUBE_RBAC_PROXY_IMAGE is incorrectly nested within the SIDECAR_IMAGE conditional block, which might prevent it from being updated independently. It also suggests refactoring the update-env-yaml target to reduce code duplication and improve maintainability.

Comment on lines +235 to +241
if [ -n "$(KUBE_RBAC_PROXY_IMAGE)" ]; then \
if [ "$(OS)" = "Darwin" ]; then \
sed -i '' '/- name: KUBE_RBAC_PROXY_IMAGE$$/,/value:/s|value: ".*"|value: "$(KUBE_RBAC_PROXY_IMAGE)"|' config/manager/env.yaml; \
else \
sed -i '/- name: KUBE_RBAC_PROXY_IMAGE$$/,/value:/s|value: ".*"|value: "$(KUBE_RBAC_PROXY_IMAGE)"|' config/manager/env.yaml; \
fi; \
fi; \
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

high

This block for handling KUBE_RBAC_PROXY_IMAGE is placed inside the if [ -n "$(SIDECAR_IMAGE)" ] block. This means it will only execute if SIDECAR_IMAGE is set, which is likely not the intended behavior as KUBE_RBAC_PROXY_IMAGE should be independently configurable. This block should be moved to after the fi that closes the SIDECAR_IMAGE block (currently on line 242).

Additionally, there is significant code duplication in this update-env-yaml target for handling different image variables. This new block adds to it. Consider refactoring this to use a loop or a make function to reduce duplication and improve maintainability. This would also prevent placement errors like this one.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant