Skip to content

Commit aa60d8b

Browse files
committed
fix helm.
1 parent 35b14a1 commit aa60d8b

File tree

4 files changed

+69
-3
lines changed

4 files changed

+69
-3
lines changed

config/charts/inferencepool/templates/_helpers.tpl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,14 @@ Selector labels
3131
{{- define "gateway-api-inference-extension.selectorLabels" -}}
3232
inferencepool: {{ include "gateway-api-inference-extension.name" . }}
3333
{{- end -}}
34+
35+
36+
37+
# {{/*
38+
# Metrics Reader SA
39+
# */}}
40+
# {{- define "gateway-api-inference-extension.metricsReader" -}}
41+
# {{- $base := .Release.Name | default "default-pool" | lower | trim | trunc 40 }}
42+
# {{- $ns := .Release.Namespace | default "default" | lower | trim | trunc 40 }}
43+
# {{- printf "%s-%s-metrics-reader" $base $ns | quote | trunc 84 }}
44+
# {{- end -}}

config/charts/inferencepool/templates/epp-sa-token-secret.yaml

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,63 @@
22
apiVersion: v1
33
kind: Secret
44
metadata:
5-
name: {{ .Values.inferenceExtension.monitoring.secret.name }}
5+
name: {{ .Release.Namespace }}-{{ .Release.Name }}-metrics-reader-secret
66
namespace: {{ .Release.Namespace }}
77
labels:
88
{{- include "gateway-api-inference-extension.labels" . | nindent 4 }}
99
annotations:
10-
kubernetes.io/service-account.name: {{ include "gateway-api-inference-extension.name" . }}
10+
kubernetes.io/service-account.name: {{ .Release.Namespace }}-{{ .Release.Name }}-metrics-reader-sa
1111
type: kubernetes.io/service-account-token
12+
---
13+
apiVersion: rbac.authorization.k8s.io/v1
14+
kind: ClusterRole
15+
metadata:
16+
name: {{ .Release.Namespace }}-{{ .Release.Name }}-metrics-reader-secret-read
17+
rules:
18+
- resources:
19+
- secrets
20+
apiGroups: [""]
21+
verbs: ["get", "list", "watch"]
22+
resourceNames: [{{ printf "%s-%s-metrics-reader-secret" .Release.Namespace .Release.Name | quote }}]
23+
---
24+
apiVersion: rbac.authorization.k8s.io/v1
25+
kind: ClusterRoleBinding
26+
metadata:
27+
name: gmp-system:collector:{{ .Release.Namespace }}-{{ .Release.Name }}-metrics-reader-secret-read
28+
roleRef:
29+
name: {{ .Release.Namespace }}-{{ .Release.Name }}-metrics-reader-secret-read
30+
kind: ClusterRole
31+
apiGroup: rbac.authorization.k8s.io
32+
subjects:
33+
- name: collector
34+
namespace: gmp-system
35+
kind: ServiceAccount
36+
---
37+
apiVersion: rbac.authorization.k8s.io/v1
38+
kind: ClusterRole
39+
metadata:
40+
name: {{ .Release.Namespace }}-{{ .Release.Name }}-metrics-reader
41+
rules:
42+
- nonResourceURLs:
43+
- /metrics
44+
verbs:
45+
- get
46+
---
47+
apiVersion: v1
48+
kind: ServiceAccount
49+
metadata:
50+
name: {{ .Release.Namespace }}-{{ .Release.Name }}-metrics-reader-sa
51+
---
52+
apiVersion: rbac.authorization.k8s.io/v1
53+
kind: ClusterRoleBinding
54+
metadata:
55+
name: {{ .Release.Namespace }}-{{ .Release.Name }}-metrics-reader-role-binding
56+
subjects:
57+
- kind: ServiceAccount
58+
name: {{ .Release.Namespace }}-{{ .Release.Name }}-metrics-reader-sa
59+
namespace: {{ .Release.Namespace }}
60+
roleRef:
61+
kind: ClusterRole
62+
name: {{ .Release.Namespace }}-{{ .Release.Name }}-metrics-reader
63+
apiGroup: rbac.authorization.k8s.io
1264
{{- end }}

config/charts/inferencepool/templates/gke.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ spec:
5252
type: Bearer
5353
credentials:
5454
secret:
55-
name: {{ .Values.inferenceExtension.monitoring.secret.name }}
55+
name: {{ .Release.Namespace }}-{{ .Release.Name }}-metrics-reader-secret
5656
key: token
5757
namespace: {{ .Release.Namespace }}
5858
selector:

config/charts/inferencepool/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ inferenceExtension:
5050
# Prometheus ServiceMonitor will be created when enabled for EPP metrics collection
5151
prometheus:
5252
enabled: false
53+
54+
gke:
55+
enabled: true
5356

5457
inferencePool:
5558
targetPorts:

0 commit comments

Comments
 (0)