Split different controllers into separate Kustomize components #651
+1,820
−209
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,10 @@ | ||
| --- | ||
| resources: | ||
| - ../manager | ||
| - ../rbac-base | ||
| - ../prometheus | ||
| - ../configmaps | ||
|
|
||
| configMapGenerator: | ||
| - env: params.env | ||
| name: config | ||
|
|
||
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 |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| # YAML generated by controller-gen. DO NOT EDIT. | ||
| --- | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
|
|
||
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,17 @@ | ||
| --- | ||
| apiVersion: kustomize.config.k8s.io/v1alpha1 | ||
| kind: Component | ||
|
|
||
| resources: | ||
| - crd/trustyai.opendatahub.io_evalhubs.yaml | ||
| - rbac/evalhub_auth_reviewer_role.yaml | ||
| - rbac/evalhub_job_config_binding.yaml | ||
| - rbac/evalhub_job_config_role.yaml | ||
| - rbac/evalhub_jobs_writer_binding.yaml | ||
| - rbac/evalhub_jobs_writer_role.yaml | ||
| - rbac/evalhub_mlflow_access_binding.yaml | ||
| - rbac/evalhub_mlflow_access_role.yaml | ||
| - rbac/evalhub_mlflow_jobs_binding.yaml | ||
| - rbac/evalhub_mlflow_jobs_role.yaml | ||
| - rbac/manager-rbac.yaml | ||
| - rbac/manager-rolebinding.yaml |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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,149 @@ | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRole | ||
| metadata: | ||
| name: evalhub-manager-role | ||
| rules: | ||
| - apiGroups: | ||
| - trustyai.opendatahub.io | ||
| resources: | ||
| - evalhubs | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - create | ||
| - update | ||
| - patch | ||
| - delete | ||
| - apiGroups: | ||
| - trustyai.opendatahub.io | ||
| resources: | ||
| - evalhubs/proxy | ||
| verbs: | ||
| - get | ||
| - create | ||
| - apiGroups: | ||
| - trustyai.opendatahub.io | ||
| resources: | ||
| - evalhubs/status | ||
| verbs: | ||
| - get | ||
| - update | ||
| - patch | ||
| - apiGroups: | ||
| - trustyai.opendatahub.io | ||
| resources: | ||
| - evalhubs/finalizers | ||
| verbs: | ||
| - update | ||
| - apiGroups: | ||
| - apps | ||
| resources: | ||
| - deployments | ||
| verbs: | ||
| - list | ||
| - watch | ||
| - get | ||
| - create | ||
| - update | ||
| - patch | ||
| - delete | ||
| - apiGroups: | ||
| - apps | ||
| resources: | ||
| - deployments/status | ||
| verbs: | ||
| - get | ||
| - update | ||
| - patch | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - services | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - create | ||
| - update | ||
| - patch | ||
| - delete | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - configmaps | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - create | ||
| - update | ||
| - patch | ||
| - delete | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - serviceaccounts | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - create | ||
| - update | ||
| - delete | ||
| - apiGroups: | ||
| - rbac.authorization.k8s.io | ||
| resources: | ||
| - clusterrolebindings | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - create | ||
| - update | ||
| - delete | ||
| - apiGroups: | ||
| - route.openshift.io | ||
| resources: | ||
| - routes | ||
| verbs: | ||
| - list | ||
| - watch | ||
| - get | ||
| - create | ||
| - update | ||
| - patch | ||
| - delete | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - events | ||
| verbs: | ||
| - create | ||
| - patch | ||
| - update | ||
| - apiGroups: | ||
| - rbac.authorization.k8s.io | ||
| resources: | ||
| - roles | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - create | ||
| - update | ||
| - patch | ||
| - delete | ||
| - apiGroups: | ||
| - rbac.authorization.k8s.io | ||
| resources: | ||
| - rolebindings | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - create | ||
| - update | ||
| - patch | ||
| - delete | ||
|
Comment on lines
+96
to
+149
Contributor
There was a problem hiding this comment. Re-evaluate RBAC write access to Role/RoleBinding/ClusterRoleBinding. Granting create/update/delete on RBAC objects is a high-privilege capability. If EvalHub only needs namespaced access for jobs, prefer Role/RoleBinding in the target namespace and drop cluster-scoped bindings. 🤖 Prompt for AI Agents |
||
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 | ||||
|---|---|---|---|---|---|---|
| @@ -1,18 +1,18 @@ | ||||||
| --- | ||||||
| apiVersion: rbac.authorization.k8s.io/v1 | ||||||
| kind: ClusterRoleBinding | ||||||
| metadata: | ||||||
| labels: | ||||||
| app.kubernetes.io/name: clusterrolebinding | ||||||
| app.kubernetes.io/instance: evalhub-manager-rolebinding | ||||||
| app.kubernetes.io/component: rbac | ||||||
| app.kubernetes.io/created-by: trustyai-service-operator | ||||||
| app.kubernetes.io/managed-by: kustomize | ||||||
| name: evalhub-manager-rolebinding | ||||||
| roleRef: | ||||||
| apiGroup: rbac.authorization.k8s.io | ||||||
| kind: ClusterRole | ||||||
| name: trustyai-service-operator-evalhub-manager-role | ||||||
|
Contributor
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
# Check namePrefix and other settings in the evalhub component kustomization
echo "=== config/components/evalhub/kustomization.yaml ==="
if [ -f "config/components/evalhub/kustomization.yaml" ]; then
cat -n config/components/evalhub/kustomization.yaml
else
echo "File not found"
fi
echo -e "\n=== ClusterRole name in manager-rbac.yaml ==="
if [ -f "config/components/evalhub/rbac/manager-rbac.yaml" ]; then
cat -n config/components/evalhub/rbac/manager-rbac.yaml
else
echo "File not found"
fi
echo -e "\n=== RoleBinding file for reference ==="
if [ -f "config/components/evalhub/rbac/manager-rolebinding.yaml" ]; then
cat -n config/components/evalhub/rbac/manager-rolebinding.yaml
else
echo "File not found"
fiRepository: trustyai-explainability/trustyai-service-operator Length of output: 4497
The ClusterRole in Proposed fix- name: trustyai-service-operator-evalhub-manager-role
+ name: evalhub-manager-role📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents
Contributor
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: Length of output: 130 🏁 Script executed: Length of output: 30146
That same pattern applies here in the evalhub component (and across all the other components: lmes, tas, nemo-guardrails, job-mgr). The hardcoded I should note there's a learning in my context that suggests short names should be used with kustomize's namePrefix, but your actual experience shows that doesn't work without additional NameReference transformer configuration (which isn't currently in the repo). Would you like me to update that learning to reflect that in this repository, the roleRef names in component rolebindings intentionally use the full prefixed form because the short-name approach didn't work in practice? 🧠 Learnings used |
||||||
| subjects: | ||||||
| - kind: ServiceAccount | ||||||
| name: controller-manager | ||||||
|
|
||||||
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 |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| # YAML generated by controller-gen. DO NOT EDIT. | ||
| --- | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
|
|
||
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,8 @@ | ||
| --- | ||
| apiVersion: kustomize.config.k8s.io/v1alpha1 | ||
| kind: Component | ||
|
|
||
| resources: | ||
| - crd/trustyai.opendatahub.io_guardrailsorchestrators.yaml | ||
| - rbac/manager-rbac.yaml | ||
| - rbac/manager-rolebinding.yaml |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.