From 5546a4e14b4af0f104733bc35aaa0663364d7574 Mon Sep 17 00:00:00 2001 From: greg pereira Date: Sun, 7 Sep 2025 13:27:41 -0700 Subject: [PATCH 1/2] uniquely name CRBAC Signed-off-by: greg pereira --- config/charts/inferencepool/templates/_helpers.tpl | 9 +++++++++ config/charts/inferencepool/templates/rbac.yaml | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/config/charts/inferencepool/templates/_helpers.tpl b/config/charts/inferencepool/templates/_helpers.tpl index e011bb7c1..1f77b8a35 100644 --- a/config/charts/inferencepool/templates/_helpers.tpl +++ b/config/charts/inferencepool/templates/_helpers.tpl @@ -16,6 +16,15 @@ 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 4924e4325..7ff534ff9 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.name" . }} + name: {{ include "gateway-api-inference-extension.cluster-rbac-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.name" . }} + name: {{ include "gateway-api-inference-extension.cluster-rbac-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.name" . }} + name: {{ include "gateway-api-inference-extension.cluster-rbac-name" . }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role From 50c5e1d7809579380065a0b10e448d8b5032beec Mon Sep 17 00:00:00 2001 From: greg pereira Date: Wed, 10 Sep 2025 08:10:37 -0700 Subject: [PATCH 2/2] bugfix with testing Signed-off-by: greg pereira --- config/charts/inferencepool/templates/_helpers.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/charts/inferencepool/templates/_helpers.tpl b/config/charts/inferencepool/templates/_helpers.tpl index 1f77b8a35..fdc9b1a2b 100644 --- a/config/charts/inferencepool/templates/_helpers.tpl +++ b/config/charts/inferencepool/templates/_helpers.tpl @@ -20,9 +20,9 @@ Inference extension name 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 }} +{{- $base := .Release.Name | default "default-pool" | lower | trim | trunc 40 }} +{{- $ns := .Release.Namespace | default "default" | lower | trim | trunc 40 }} +{{- printf "%s-%s-epp" $base $ns | quote | trunc 84 }} {{- end -}} {{/*