feat: option for rbac creation (#428)

caraml-dev · Jan 2, 2025 · f60a41a · f60a41a
1 parent fcb12b3
commit f60a41a
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 9 deletions.
diff --git a/charts/merlin/Chart.yaml b/charts/merlin/Chart.yaml
@@ -33,4 +33,4 @@ maintainers:
 - email: [email protected]
   name: caraml-dev
 name: merlin
-version: 0.13.21
+version: 0.13.22
diff --git a/charts/merlin/README.md b/charts/merlin/README.md
@@ -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.
@@ -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` |  |

diff --git a/charts/merlin/templates/merlin-cluster-role-binding.yaml b/charts/merlin/templates/merlin-cluster-role-binding.yaml
@@ -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:

diff --git a/charts/merlin/templates/merlin-cluster-role.yaml b/charts/merlin/templates/merlin-cluster-role.yaml
@@ -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:

diff --git a/charts/merlin/values.yaml b/charts/merlin/values.yaml
@@ -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

diff --git a/charts/turing/Chart.yaml b/charts/turing/Chart.yaml
@@ -22,4 +22,4 @@ maintainers:
 - email: [email protected]
   name: caraml-dev
 name: turing
-version: 0.3.24
+version: 0.3.25
diff --git a/charts/turing/README.md b/charts/turing/README.md
@@ -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.
@@ -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"` |  |

diff --git a/charts/turing/templates/turing-cluster-role-binding.yaml b/charts/turing/templates/turing-cluster-role-binding.yaml
@@ -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:

diff --git a/charts/turing/templates/turing-cluster-role.yaml b/charts/turing/templates/turing-cluster-role.yaml
@@ -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:

diff --git a/charts/turing/values.yaml b/charts/turing/values.yaml
@@ -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