Apply review suggestions

kacpersaw · kacpersaw · commit 108f3c302bcc · 2025-08-25T12:13:38.000+02:00
diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml
@@ -1,21 +1,45 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: coder-logstream-kube-role
-rules:
+{{- define "coder-logstream-kube.rules" -}}
 - apiGroups: [""]
   resources: ["pods", "events"]
   verbs: ["get", "watch", "list"]
 - apiGroups: ["apps"]
   resources: ["replicasets", "events"]
   verbs: ["get", "watch", "list"]
+{{- end -}}
+
+{{- if .Values.namespaces }}
+{{- range .Values.namespaces }}
 ---
-apiVersion: v1
-kind: ServiceAccount
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
 metadata:
-  name: {{ .Values.serviceAccount.name | quote }}
-  annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
-  labels: {{ toYaml .Values.serviceAccount.labels | nindent 4 }}
+  name: coder-logstream-kube-role
+  namespace: {{ . }}
+rules:
+{{ include "coder-logstream-kube.rules" . | nindent 2 }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: coder-logstream-kube-rolebinding
+  namespace: {{ . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: coder-logstream-kube-role
+subjects:
+- kind: ServiceAccount
+  name: {{ $.Values.serviceAccount.name | quote }}
+  namespace: {{ $.Release.Namespace }}
+{{- end }}
+{{- else }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: coder-logstream-kube-role
+rules:
+{{ include "coder-logstream-kube.rules" . | nindent 2 }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -29,6 +53,14 @@ subjects:
 - kind: ServiceAccount
   name: {{ .Values.serviceAccount.name | quote }}
   namespace: {{ .Release.Namespace }}
+{{- end }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Values.serviceAccount.name | quote }}
+  annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
+  labels: {{ toYaml .Values.serviceAccount.labels | nindent 4 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -76,8 +108,10 @@ spec:
           env:
             - name: CODER_URL
               value: {{ .Values.url }}
+            {{- if .Values.namespaces }}
             - name: CODER_NAMESPACES
-              value: {{ if .Values.namespaces }}{{ join "," .Values.namespaces }}{{ else }}{{ end }}
+              value: {{ join "," .Values.namespaces }}
+            {{- end }}
             {{- if .Values.image.sslCertFile }}
             - name: SSL_CERT_FILE
               value: {{ .Values.image.sslCertFile }}
diff --git a/logger.go b/logger.go
@@ -106,7 +106,8 @@ type podEventLogger struct {
 	lq    *logQueuer
 }
 
-// init starts the informer factory and registers event handlers.
+// initNamespace starts the informer factory and registers event handlers for a given namespace.
+// If provided namespace is empty, it will start the informer factory and register event handlers for all namespaces.
 func (p *podEventLogger) initNamespace(namespace string) error {
 	// We only track events that happen after the reporter starts.
 	// This is to prevent us from sending duplicate events.

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,8 @@ type podEventLogger struct {`
`106`	`106`	`lq *logQueuer`
`107`	`107`	`}`
`108`	`108`
`109`		`-// init starts the informer factory and registers event handlers.`
	`109`	`+// initNamespace starts the informer factory and registers event handlers for a given namespace.`
	`110`	`+// If provided namespace is empty, it will start the informer factory and register event handlers for all namespaces.`
`110`	`111`	`func (p *podEventLogger) initNamespace(namespace string) error {`
`111`	`112`	`// We only track events that happen after the reporter starts.`
`112`	`113`	`// This is to prevent us from sending duplicate events.`