Feat(helm): Modify the existing serviceAccount for use by router and lora-controller #1005
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| suite: test Role and RoleBinding creation with serviceAccountName | ||
| templates: | ||
| - role.yaml | ||
| - rolebinding.yaml | ||
| tests: | ||
| - it: should create Role and RoleBinding when serviceAccountName is not set | ||
| release: | ||
| name: vllm | ||
| set: | ||
| routerSpec: | ||
| enableRouter: true | ||
| serviceAccountName: "" | ||
| asserts: | ||
| - containsDocument: | ||
| kind: Role | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| name: vllm-reader | ||
| template: role.yaml | ||
| - containsDocument: | ||
| kind: RoleBinding | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| name: vllm-deployment-access-binding | ||
| template: rolebinding.yaml | ||
|
|
||
| - it: should NOT create Role and RoleBinding when custom serviceAccountName is set | ||
| release: | ||
| name: vllm | ||
| set: | ||
| routerSpec: | ||
| enableRouter: true | ||
| serviceAccountName: my-existing-sa | ||
| asserts: | ||
| - hasDocuments: | ||
| count: 0 | ||
|
Comment on lines
+25
to
+34
Contributor
There was a problem hiding this comment. Since we want to keep the - it: should create Role and RoleBinding with custom serviceAccountName when specified
release:
name: vllm
set:
routerSpec:
enableRouter: true
serviceAccountName: my-existing-sa
asserts:
- containsDocument:
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
name: vllm-reader
template: role.yaml
- containsDocument:
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
name: vllm-deployment-access-binding
template: rolebinding.yaml
- equal:
path: subjects[0].name
value: my-existing-sa
documentIndex: 0
template: rolebinding.yaml |
||
|
|
||
| - it: should NOT create Role and RoleBinding when router is disabled | ||
| set: | ||
| routerSpec: | ||
| enableRouter: false | ||
| asserts: | ||
| - hasDocuments: | ||
| count: 0 | ||
|
|
||
| - it: should create ClusterRole and ClusterRoleBinding when lora serviceAccountName is not set | ||
| release: | ||
| name: vllm | ||
| set: | ||
| routerSpec: | ||
| enableRouter: false | ||
| loraController: | ||
| enableLoraController: true | ||
| serviceAccountName: "" | ||
| asserts: | ||
| - equal: | ||
| path: metadata.name | ||
| value: vllm-lora-controller | ||
| documentIndex: 0 | ||
| template: role.yaml | ||
| - equal: | ||
| path: metadata.name | ||
| value: vllm-lora-controller | ||
| documentIndex: 0 | ||
| template: rolebinding.yaml | ||
|
|
||
| - it: should NOT create ClusterRole and ClusterRoleBinding when lora serviceAccountName is set | ||
| release: | ||
| name: vllm | ||
| set: | ||
| routerSpec: | ||
| enableRouter: false | ||
| loraController: | ||
| enableLoraController: true | ||
| serviceAccountName: my-existing-lora-sa | ||
| asserts: | ||
| - hasDocuments: | ||
| count: 0 | ||
|
Comment on lines
+65
to
+76
Contributor
There was a problem hiding this comment. Update this test to assert that the - it: should create ClusterRole and ClusterRoleBinding with custom serviceAccountName when specified
release:
name: vllm
set:
routerSpec:
enableRouter: false
loraController:
enableLoraController: true
serviceAccountName: my-existing-lora-sa
asserts:
- equal:
path: metadata.name
value: vllm-lora-controller
documentIndex: 0
template: role.yaml
- equal:
path: metadata.name
value: vllm-lora-controller
documentIndex: 0
template: rolebinding.yaml
- equal:
path: subjects[0].name
value: my-existing-lora-sa
documentIndex: 0
template: rolebinding.yaml |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| suite: test ServiceAccount creation | ||
| templates: | ||
| - serviceaccount.yaml | ||
| tests: | ||
| # Router ServiceAccount tests | ||
| - it: should create router ServiceAccount when serviceAccountName is not set | ||
| release: | ||
| name: vllm | ||
| set: | ||
| routerSpec: | ||
| enableRouter: true | ||
| serviceAccountName: "" | ||
| loraController: | ||
| enableLoraController: false | ||
| asserts: | ||
| - containsDocument: | ||
| kind: ServiceAccount | ||
| apiVersion: v1 | ||
| name: vllm-router-service-account | ||
|
|
||
| - it: should NOT create router ServiceAccount when serviceAccountName is specified | ||
| release: | ||
| name: vllm | ||
| set: | ||
| routerSpec: | ||
| enableRouter: true | ||
| serviceAccountName: my-existing-sa | ||
| loraController: | ||
| enableLoraController: false | ||
| asserts: | ||
| - hasDocuments: | ||
| count: 0 | ||
|
|
||
| - it: should NOT create router ServiceAccount when router is disabled | ||
| set: | ||
| routerSpec: | ||
| enableRouter: false | ||
| loraController: | ||
| enableLoraController: false | ||
| asserts: | ||
| - hasDocuments: | ||
| count: 0 | ||
|
|
||
| # Lora Controller ServiceAccount tests | ||
| - it: should create lora-controller ServiceAccount when serviceAccountName is not set | ||
| release: | ||
| name: vllm | ||
| set: | ||
| routerSpec: | ||
| enableRouter: false | ||
| loraController: | ||
| enableLoraController: true | ||
| serviceAccountName: "" | ||
| asserts: | ||
| - containsDocument: | ||
| kind: ServiceAccount | ||
| apiVersion: v1 | ||
| name: vllm-lora-controller | ||
|
|
||
| - it: should NOT create lora-controller ServiceAccount when serviceAccountName is specified | ||
| release: | ||
| name: vllm | ||
| set: | ||
| routerSpec: | ||
| enableRouter: false | ||
| loraController: | ||
| enableLoraController: true | ||
| serviceAccountName: my-existing-lora-sa | ||
| asserts: | ||
| - hasDocuments: | ||
| count: 0 | ||
|
|
||
| - it: should create both ServiceAccounts when both are enabled and no custom names set | ||
| release: | ||
| name: vllm | ||
| set: | ||
| routerSpec: | ||
| enableRouter: true | ||
| serviceAccountName: "" | ||
| loraController: | ||
| enableLoraController: true | ||
| serviceAccountName: "" | ||
| asserts: | ||
| - hasDocuments: | ||
| count: 2 | ||
|
|
||
| - it: should create only lora-controller ServiceAccount when router uses custom name | ||
| release: | ||
| name: vllm | ||
| set: | ||
| routerSpec: | ||
| enableRouter: true | ||
| serviceAccountName: my-existing-router-sa | ||
| loraController: | ||
| enableLoraController: true | ||
| serviceAccountName: "" | ||
| asserts: | ||
| - hasDocuments: | ||
| count: 1 | ||
| - containsDocument: | ||
| kind: ServiceAccount | ||
| apiVersion: v1 | ||
| name: vllm-lora-controller | ||
|
|
||
| - it: should create only router ServiceAccount when lora-controller uses custom name | ||
| release: | ||
| name: vllm | ||
| set: | ||
| routerSpec: | ||
| enableRouter: true | ||
| serviceAccountName: "" | ||
| loraController: | ||
| enableLoraController: true | ||
| serviceAccountName: my-existing-lora-sa | ||
| asserts: | ||
| - hasDocuments: | ||
| count: 1 | ||
| - containsDocument: | ||
| kind: ServiceAccount | ||
| apiVersion: v1 | ||
| name: vllm-router-service-account |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Decoupling
ServiceAccountcreation fromRole/ClusterRolecreation is a standard Helm best practice. In many enterprise environments, theServiceAccountis pre-created externally (e.g., to associate it with AWS IRSA or GCP Workload Identity), but the Helm chart is still expected to manage and create the application-specific RBAC roles and bindings.By skipping
Rolecreation whenserviceAccountNameis set, users are forced to manually define and maintain these complex RBAC rules externally, which is error-prone and hard to maintain during chart upgrades.Instead, we should always create the
RoleandRoleBindingresources when the component is enabled, but bind them to the customserviceAccountNameif provided.{{- if .Values.routerSpec.enableRouter -}}