Skip to content

fix(env): fix missing env#214

Merged
Syspretor merged 1 commit intosgl-project:mainfrom
JasonHe-WQ:env
Mar 17, 2026
Merged

fix(env): fix missing env#214
Syspretor merged 1 commit intosgl-project:mainfrom
JasonHe-WQ:env

Conversation

@JasonHe-WQ
Copy link
Copy Markdown
Contributor

@JasonHe-WQ JasonHe-WQ commented Mar 17, 2026

Ⅰ. Motivation

Fix env injectors

Ⅱ. Modifications

Refine merge env functions and add a new label parser

Ⅲ. Does this pull request fix one issue?

fixes #213

Ⅳ. List the added test cases (unit test/integration test) if any, please explain if no tests are needed.

Ⅴ. Describe how to verify it

VI. Special notes for reviews

Checklist

  • Format your code make fmt.
  • Add unit tests or integration tests.
  • Update the documentation related to the change.

@gemini-code-assist
Copy link
Copy Markdown

gemini-code-assist Bot commented Mar 17, 2026

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 resolves an issue with missing environment variables by enhancing the environment injection process. It introduces a flexible way to determine the source of the RBG_ROLE_INDEX based on the workload type and improves the merging of environment variables to ensure consistency and avoid unnecessary resource updates. The changes ensure that all relevant environment variables are correctly propagated to containers.

Highlights

  • Environment Variable Injection Fix: Addressed an issue where environment variables were not correctly injected for specific workload types, particularly RoleInstanceSet.
  • Dynamic Role Index Field Path: Introduced a new mechanism to dynamically determine the FieldPath for the EnvRBGRoleIndex environment variable based on the workload type, supporting both StatefulSet/LeaderWorkerSet and RoleInstanceSet.
  • Refactored Environment Variable Merging: Refactored the environment variable merging logic into dedicated helper functions (mergeEnvVars and dedupeEnvVarsPreserveLast) to ensure correct injection, handle duplicates, and prevent unintended StatefulSet updates caused by environment variable order changes.
  • New Test Cases: Added comprehensive test cases to validate the correct environment variable injection for RoleInstanceSet workloads and the overall InjectLeaderWorkerSetEnv functionality.

🧠 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
  • api/workloads/constants/env.go
    • Updated comments to reflect the new source for EnvRBGRoleIndex for RoleInstanceSet.
  • pkg/discovery/env_builder.go
    • Implemented a new function roleIndexFieldPath to dynamically determine the label path for EnvRBGRoleIndex based on the workload type.
  • pkg/discovery/env_builder_test.go
    • Added new test cases to verify the correct environment variable injection for RoleInstanceSet workloads.
    • Imported constants package for label keys.
  • pkg/discovery/injector.go
    • Refactored environment variable merging logic into a new mergeEnvVars helper function, which also includes dedupeEnvVarsPreserveLast to handle duplicates and maintain order.
    • Removed the sort import as it's no longer needed in the main injection functions.
  • pkg/discovery/injector_test.go
    • Added a new test case TestDefaultInjector_InjectLeaderWorkerSetEnv to validate the InjectLeaderWorkerSetEnv function, specifically testing the merging and injection of environment variables for RoleInstanceSet workloads.
    • Imported fmt package for string formatting in test assertions.
Activity
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. ↩

gemini-code-assist[bot]
gemini-code-assist Bot reviewed Mar 17, 2026
View reviewed changes
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 aims to fix missing environment variables by adding support for RoleInstanceSet and refining the environment variable merging logic. The changes correctly add the necessary logic and tests for RoleInstanceSet. However, the refactoring of the mergeEnvVars function has introduced a regression by removing the sorting of environment variables, which can lead to unnecessary pod churn. I've also included a couple of suggestions to improve code consistency and maintainability.

Comment thread pkg/discovery/injector.go
Comment thread pkg/discovery/env_builder.go
Comment thread pkg/discovery/env_builder_test.go
Syspretor
Syspretor approved these changes Mar 17, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@Syspretor Syspretor left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@Syspretor Syspretor merged commit 07616da into sgl-project:main Mar 17, 2026
8 checks passed
@JasonHe-WQ JasonHe-WQ deleted the env branch March 17, 2026 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Syspretor Syspretor Syspretor approved these changes

+1 more reviewer

@gemini-code-assist gemini-code-assist[bot] gemini-code-assist[bot] left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Bug] incorrect RBG_ROLE_INDEX series env var for roleinstance workload type

2 participants

@JasonHe-WQ @Syspretor