Skip to content

Commit fdf1406

Browse files
Revert "uniquely name CRBAC (#1545)" (#1565)
This reverts commit 7d53aa0.
1 parent 7d53aa0 commit fdf1406

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

config/charts/inferencepool/templates/_helpers.tpl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,6 @@ Inference extension name
1616
{{ $base }}-epp
1717
{{- end -}}
1818

19-
{{/*
20-
Cluster RBAC unique name
21-
*/}}
22-
{{- define "gateway-api-inference-extension.cluster-rbac-name" -}}
23-
{{- $base := .Release.Name | default "default-pool" | lower | trim | trunc 40 -}}
24-
{{- $base := .Release.Namespace | default "default" | lower | trim | trunc 40 - }}
25-
{{ printf "%s-%s-epp" $rn $ns | quote | trunc 84 }}
26-
{{- end -}}
27-
2819
{{/*
2920
Selector labels
3021
*/}}

config/charts/inferencepool/templates/rbac.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
kind: ClusterRole
22
apiVersion: rbac.authorization.k8s.io/v1
33
metadata:
4-
name: {{ include "gateway-api-inference-extension.cluster-rbac-name" . }}
4+
name: {{ include "gateway-api-inference-extension.name" . }}
55
labels:
66
{{- include "gateway-api-inference-extension.labels" . | nindent 4 }}
77
rules:
@@ -21,15 +21,15 @@ rules:
2121
kind: ClusterRoleBinding
2222
apiVersion: rbac.authorization.k8s.io/v1
2323
metadata:
24-
name: {{ include "gateway-api-inference-extension.cluster-rbac-name" . }}
24+
name: {{ include "gateway-api-inference-extension.name" . }}
2525
subjects:
2626
- kind: ServiceAccount
2727
name: {{ include "gateway-api-inference-extension.name" . }}
2828
namespace: {{ .Release.Namespace }}
2929
roleRef:
3030
apiGroup: rbac.authorization.k8s.io
3131
kind: ClusterRole
32-
name: {{ include "gateway-api-inference-extension.cluster-rbac-name" . }}
32+
name: {{ include "gateway-api-inference-extension.name" . }}
3333
---
3434
apiVersion: rbac.authorization.k8s.io/v1
3535
kind: Role

0 commit comments

Comments
 (0)