diff --git a/config/charts/inferencepool/templates/_helpers.tpl b/config/charts/inferencepool/templates/_helpers.tpl index 1f77b8a35..e011bb7c1 100644 --- a/config/charts/inferencepool/templates/_helpers.tpl +++ b/config/charts/inferencepool/templates/_helpers.tpl @@ -16,15 +16,6 @@ Inference extension name {{ $base }}-epp {{- end -}} -{{/* -Cluster RBAC unique name -*/}} -{{- define "gateway-api-inference-extension.cluster-rbac-name" -}} -{{- $base := .Release.Name | default "default-pool" | lower | trim | trunc 40 -}} -{{- $base := .Release.Namespace | default "default" | lower | trim | trunc 40 - }} -{{ printf "%s-%s-epp" $rn $ns | quote | trunc 84 }} -{{- end -}} - {{/* Selector labels */}} diff --git a/config/charts/inferencepool/templates/rbac.yaml b/config/charts/inferencepool/templates/rbac.yaml index e0b9f4e1d..a8d891c32 100644 --- a/config/charts/inferencepool/templates/rbac.yaml +++ b/config/charts/inferencepool/templates/rbac.yaml @@ -1,7 +1,7 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ include "gateway-api-inference-extension.cluster-rbac-name" . }} + name: {{ include "gateway-api-inference-extension.name" . }} labels: {{- include "gateway-api-inference-extension.labels" . | nindent 4 }} rules: @@ -21,7 +21,7 @@ rules: kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ include "gateway-api-inference-extension.cluster-rbac-name" . }} + name: {{ include "gateway-api-inference-extension.name" . }} subjects: - kind: ServiceAccount name: {{ include "gateway-api-inference-extension.name" . }} @@ -29,7 +29,7 @@ subjects: roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ include "gateway-api-inference-extension.cluster-rbac-name" . }} + name: {{ include "gateway-api-inference-extension.name" . }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role