Merge branch 'main' into feat/298/namespace-filtering

Author: sbx0r

helm/kagent/templates/deployment.yaml

@@ -47,6 +47,9 @@ spec:
             - name: WATCH_NAMESPACES
               value: {{ include "kagent.watchNamespaces" . }}
             {{- end }}
+          {{- with .Values.controller.env }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
         - name: app
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
@@ -66,6 +69,13 @@ spec:
               value: {{ .Values.otel.tracing.exporter.otlp.timeout | quote }}
             - name: OTEL_EXPORTER_OTLP_TRACES_INSECURE
               value: {{ .Values.otel.tracing.exporter.otlp.insecure | quote }}
+            - name: KAGENT_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          {{- with .Values.app.env }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           ports:
             - name: http
               containerPort: {{ .Values.service.ports.app.targetPort }}
@@ -86,6 +96,9 @@ spec:
           env:
             - name: NEXT_PUBLIC_BACKEND_URL
               value: "http://{{ include "kagent.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local/api"
+          {{- with .Values.ui.env }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           ports:
             - name: http
               containerPort: {{ .Values.service.ports.ui.targetPort }}

helm/kagent/values.yaml

@@ -38,6 +38,7 @@ controller:
     limits:
       cpu: 500m
       memory: 512Mi
+  env: {} # Additional environment variables for the controller can be added here
 
 app:
   image:
@@ -52,6 +53,7 @@ app:
     limits:
       cpu: 1000m
       memory: 1Gi
+  env: {} # Additional environment variables for the app can be added here
 
 ui:
   image:
@@ -66,6 +68,7 @@ ui:
     limits:
       cpu: 1000m
       memory: 1Gi
+  env: {} # Additional environment variables for the ui can be added here
 
 service:
   type: ClusterIP