Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: option for rbac creation #428

Merged
merged 2 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/merlin/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ maintainers:
- email: [email protected]
name: caraml-dev
name: merlin
version: 0.13.21
version: 0.13.22
3 changes: 2 additions & 1 deletion charts/merlin/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# merlin

---
![Version: 0.13.21](https://img.shields.io/badge/Version-0.13.21-informational?style=flat-square)
![Version: 0.13.22](https://img.shields.io/badge/Version-0.13.22-informational?style=flat-square)
![AppVersion: v0.42.0](https://img.shields.io/badge/AppVersion-v0.42.0-informational?style=flat-square)

Kubernetes-friendly ML model management, deployment, and serving.
Expand Down Expand Up @@ -374,6 +374,7 @@ The following table lists the configurable parameters of the Merlin chart and th
| serviceAccount.annotations | object | `{}` | |
| serviceAccount.create | bool | `true` | |
| serviceAccount.name | string | `"merlin"` | |
| serviceAccount.rbac.create | bool | `false` | |
| swagger.apiHost | string | `"merlin.dev"` | |
| swagger.basePath | string | `"/api/merlin/v1"` | |
| swagger.enabled | bool | `true` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/merlin/templates/merlin-cluster-role-binding.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.clusterConfig.useInClusterConfig -}}
{{- if or .Values.clusterConfig.useInClusterConfig .Values.serviceAccount.rbac.create -}}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand Down
2 changes: 1 addition & 1 deletion charts/merlin/templates/merlin-cluster-role.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.clusterConfig.useInClusterConfig -}}
{{- if or .Values.clusterConfig.useInClusterConfig .Values.serviceAccount.rbac.create -}}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand Down
2 changes: 2 additions & 0 deletions charts/merlin/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,8 @@ serviceAccount:
name: merlin
annotations: {}
# example.io/example: example
rbac:
create: false
ingress:
enabled: false
# If you would like to use an external postgres database for Merlin, you can connect using these credentials
Expand Down
2 changes: 1 addition & 1 deletion charts/turing/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ maintainers:
- email: [email protected]
name: caraml-dev
name: turing
version: 0.3.24
version: 0.3.25
3 changes: 2 additions & 1 deletion charts/turing/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# turing

---
![Version: 0.3.24](https://img.shields.io/badge/Version-0.3.24-informational?style=flat-square)
![Version: 0.3.25](https://img.shields.io/badge/Version-0.3.25-informational?style=flat-square)
![AppVersion: v1.17.2](https://img.shields.io/badge/AppVersion-v1.17.2-informational?style=flat-square)

Kubernetes-friendly multi-model orchestration and experimentation system.
Expand Down Expand Up @@ -112,6 +112,7 @@ The following table lists the configurable parameters of the Turing chart and th
| serviceAccount.annotations | object | `{}` | |
| serviceAccount.create | bool | `true` | |
| serviceAccount.name | string | `"turing"` | |
| serviceAccount.rbac.create | bool | `false` | |
| turing-postgresql.enabled | bool | `true` | |
| turing-postgresql.persistence.size | string | `"10Gi"` | |
| turing-postgresql.postgresqlDatabase | string | `"turing"` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/turing/templates/turing-cluster-role-binding.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.clusterConfig.useInClusterConfig -}}
{{- if or .Values.clusterConfig.useInClusterConfig .Values.serviceAccount.rbac.create -}}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand Down
2 changes: 1 addition & 1 deletion charts/turing/templates/turing-cluster-role.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.clusterConfig.useInClusterConfig -}}
{{- if or .Values.clusterConfig.useInClusterConfig .Values.serviceAccount.rbac.create -}}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand Down
3 changes: 2 additions & 1 deletion charts/turing/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ serviceAccount:
name: turing
annotations: {}
# example.io/example: example

rbac:
create: false
ingress:
# -- Enable ingress to provision Ingress resource for external access to Turing API
enabled: false
Expand Down
Loading