Skip to content

fix(t8s-cluster/workload-cluster): correctly set extraArgs value#2003

Merged
cwrau merged 1 commit intomainfrom
fix/t8s-cluster/csi-values
Feb 24, 2026
Merged

fix(t8s-cluster/workload-cluster): correctly set extraArgs value#2003
cwrau merged 1 commit intomainfrom
fix/t8s-cluster/csi-values

Conversation

@cwrau
Copy link
Member

@cwrau cwrau commented Feb 24, 2026

While controllerPlugin.extraArgs works, it doesn't set it for the nodePlugin

Summary by CodeRabbit

  • Refactor
    • Reorganized CSI plugin configuration to improve compatibility across Kubernetes versions.
    • Added version-specific conditional handling to ensure proper deployment behavior for different releases.

While controllerPlugin.extraArgs works, it doesn't set it for the nodePlugin
Copilot AI review requested due to automatic review settings February 24, 2026 15:36
@cwrau cwrau enabled auto-merge February 24, 2026 15:36
@gemini-code-assist
Copy link

Summary of Changes

Hello @cwrau, 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 addresses an issue where extraArgs were not being correctly propagated to the node plugin of the Cinder CSI driver. By adjusting the placement of the extraArgs definition within the Helm chart template and introducing a version-based conditional, the configuration now applies universally to the Cinder CSI plugin, improving its functionality and compatibility across different Kubernetes versions.

Highlights

  • Cinder CSI extraArgs Configuration: The extraArgs for the Cinder CSI plugin have been refactored to apply at the top-level plugin scope, ensuring they are correctly passed to both controller and node plugins. This change is conditionally applied for Kubernetes minor versions 32 and above.
Changelog
  • charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin/cinder-csi-plugin.yaml
    • Moved the extraArgs definition from controllerPlugin to the parent plugin level.
    • Introduced a conditional check (if ge (int .Values.version.minor) 32) to apply extraArgs only for Kubernetes minor versions 32 and higher.
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.

@coderabbitai
Copy link

coderabbitai bot commented Feb 24, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

Configuration used: defaults

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between aa7d054 and 62bfbb0.

📒 Files selected for processing (1)
  • charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin/cinder-csi-plugin.yaml

📝 Walkthrough

Walkthrough

The PR relocates the Cinder CSI plugin's topology argument from controllerPlugin to the plugin configuration under csi.plugin, with a conditional guard ensuring the change only applies when the minor version is 32 or later, maintaining backward compatibility with older versions.

Changes

Cohort / File(s) Summary
Cinder CSI Plugin Configuration
charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin/cinder-csi-plugin.yaml
Relocated --with-topology=false argument from the top-level controllerPlugin extraArgs block to the plugin configuration under csi.plugin, guarded by a conditional check for minor version >= 32 to ensure compatibility with older versions.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Possibly related PRs

Suggested labels

t8s-cluster

Suggested reviewers

  • tasches
  • teutonet-bot
  • marvinWolff

Poem

🐰 A topology arg takes flight,
From controller to plugin, version-gated right,
Thirty-two and above shall see,
The CSI dance, backward-compatible and free!

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title 'fix(t8s-cluster/workload-cluster): correctly set extraArgs value' directly describes the main change - fixing the extraArgs configuration for the workload cluster CSI plugin.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch fix/t8s-cluster/csi-values

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

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 correctly moves the extraArgs to apply to both the controller and node CSI plugins. However, the newly introduced condition if ge (int .Values.version.minor) 32 removes these arguments for Kubernetes versions older than 1.32. This is a change from the previous behavior where the argument was set for the controller plugin, and could potentially cause issues on clusters running older Kubernetes versions. I've added a comment with a suggestion to address this.

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR fixes the configuration of the cinder-csi-plugin to ensure the --with-topology=false argument is applied to both the controller plugin and the node plugin, not just the controller plugin. The issue was that controllerPlugin.extraArgs only affected the controller, leaving the node plugin without this critical configuration.

Changes:

  • Moved extraArgs from csi.plugin.controllerPlugin.extraArgs to csi.plugin.extraArgs to apply to both controller and node plugins

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@cwrau cwrau added this pull request to the merge queue Feb 24, 2026
Merged via the queue into main with commit 6e558f0 Feb 24, 2026
37 checks passed
@cwrau cwrau deleted the fix/t8s-cluster/csi-values branch February 24, 2026 15:45
github-merge-queue bot pushed a commit that referenced this pull request Feb 25, 2026
🤖 I have created a release *beep* *boop*
---


##
[9.6.0](t8s-cluster-v9.5.2...t8s-cluster-v9.6.0)
(2026-02-25)


### Features

* **t8s-cluster/management-cluster:** add `compute-plane` role label to
nodes
([#1953](#1953))
([f5897e3](f5897e3))
* **t8s-cluster/management-cluster:** add quotas fied to cluster
([#1998](#1998))
([3123514](3123514))
* **t8s-cluster/management-cluster:** ignore local storage for
autoscaler
([#1973](#1973))
([d4abff8](d4abff8))


### Bug Fixes

* **t8s-cluster/management-cluster:** add missing securityGroupRule for
cilium hubble
([#1971](#1971))
([f36f231](f36f231))
* **t8s-cluster/management-cluster:** adjust test helmRepositories
([#1964](#1964))
([66be444](66be444))
* **t8s-cluster/management-cluster:** remove hardcoded field
([#1984](#1984))
([227af97](227af97))
* **t8s-cluster/workload-cluster:** add missing tolerations
([#1933](#1933))
([8718c0d](8718c0d))
* **t8s-cluster/workload-cluster:** correctly set extraArgs value
([#2003](#2003))
([6e558f0](6e558f0))
* **t8s-cluster/workload-cluster:** migrate extraArgs type to string
([#1985](#1985))
([79d6df5](79d6df5))


### Miscellaneous Chores

* **t8s-cluster/dependencies:** update common docker tag to v1.8.0
([#1940](#1940))
([cdf387f](cdf387f))
* **t8s-cluster/dependencies:** update helm release cilium to v1.19.0
([#1969](#1969))
([e95a9a5](e95a9a5))
* **t8s-cluster/dependencies:** update helm release cluster-autoscaler
to v9.55.0
([#1963](#1963))
([659a529](659a529))
* **t8s-cluster/dependencies:** update helm release openstack-cinder-csi
to v2.35.0
([#1970](#1970))
([741d5b2](741d5b2))
* **t8s-cluster/dependencies:** update helm release
openstack-cloud-controller-manager to v2.35.0
([#1941](#1941))
([a580142](a580142))
* **t8s-cluster/dependencies:** update registry.k8s.io/etcd docker tag
to v3.6.8
([#1996](#1996))
([aa7d054](aa7d054))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
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