Update values and fix typo

helm/templates/service_metrics.yaml

@@ -0,0 +1,18 @@
+{{- if .Values.deploy -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "poolboy.name" . }}-metrics
+  namespace: {{ include "poolboy.namespaceName" . }}
+  labels:
+    {{- include "poolboy.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.serviceMetrics.type }}
+  {{- with .Values.serviceMetrics.ports }}
+  ports:
+    {{- toYaml . | nindent 2 }}
+  {{- end }}
+  selector:
+    {{- include "poolboy.selectorLabels" . | nindent 4 }}
+  sessionAffinity: None
+{{- end -}}

helm/templates/service_monitor.yaml

@@ -0,0 +1,18 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "poolboy.name" . }}
+  namespace: {{ include "poolboy.namespaceName" . }}
+  labels:
+    {{- include "poolboy.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "poolboy.name" . }}
+  namespaceSelector:
+    matchNames:
+    - {{ include "poolboy.namespaceName" . }}
+  endpoints:
+  - port: {{ include "poolboy.name" . }}
+    interval: "30s"
+    path: /metrics

helm/values.yaml

@@ -59,6 +59,12 @@ service:
     port: 8000
     protocol: TCP
     targetPort: 8000
+  - name: metrics-service
+    port: 8000
+    protocol: web
+    targetPort: 8000
+    path: /metrics
+
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

operator/poolboy_k8s.py

@@ -254,9 +254,6 @@ async def get_requester_from_namespace(namespace: str) -> tuple[Optional[Mapping
     if not user_name:
         return None, []
 
-    if user_name == 'system:admin':
-        user_name = 'mamorim-redhat.com'
-
     try:
         user = await Poolboy.custom_objects_api.get_cluster_custom_object(
             'user.openshift.io', 'v1', 'users', user_name