Merge branch 'main' into feature/chat-mcp-ui-widgets

dimetron · web-flow · commit 1c2fab77e6be · 2026-06-18T19:21:34.000+02:00
diff --git a/Makefile b/Makefile
@@ -136,6 +136,10 @@ init-git-hooks:  ## Use the tracked version of Git hooks from this repo
 KMCP_ENABLED ?= true
 KMCP_VERSION ?= $(shell $(AWK) '/github\.com\/kagent-dev\/kmcp/ { print substr($$2, 2) }' go/go.mod) # KMCP version defaults to what's referenced in go.mod
 
+# Substrate
+SUBSTRATE_ENABLED ?= false
+SUBSTRATE_VERSION ?= $(shell $(AWK) '/github\.com\/kagent-dev\/substrate/ { print substr($$5, 2) }' go/go.mod) # Substrate version defaults to the replace target in go.mod
+
 HELM_ACTION=upgrade --install
 
 # Helm chart variables
@@ -394,8 +398,8 @@ helm-tools: ## Package all tool Helm charts into the dist folder
 .PHONY: helm-version
 helm-version: ## Stamp chart versions, update dependencies, and package kagent + kagent-crds
 helm-version: helm-cleanup helm-agents helm-tools
-	VERSION=$(VERSION) KMCP_VERSION=$(KMCP_VERSION) envsubst < helm/kagent-crds/Chart-template.yaml > helm/kagent-crds/Chart.yaml
-	VERSION=$(VERSION) KMCP_VERSION=$(KMCP_VERSION) envsubst < helm/kagent/Chart-template.yaml > helm/kagent/Chart.yaml
+	VERSION=$(VERSION) KMCP_VERSION=$(KMCP_VERSION) SUBSTRATE_VERSION=$(SUBSTRATE_VERSION) envsubst < helm/kagent-crds/Chart-template.yaml > helm/kagent-crds/Chart.yaml
+	VERSION=$(VERSION) KMCP_VERSION=$(KMCP_VERSION) SUBSTRATE_VERSION=$(SUBSTRATE_VERSION) envsubst < helm/kagent/Chart-template.yaml > helm/kagent/Chart.yaml
 	helm dependency update helm/kagent
 	helm dependency update helm/kagent-crds
 	helm package -d $(HELM_DIST_FOLDER) helm/kagent-crds
diff --git a/helm/agents/argo-rollouts/templates/_helpers.tpl b/helm/agents/argo-rollouts/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{- define "agent.deploymentSpec" -}}
+{{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.podSecurityContext }}
+podSecurityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.securityContext }}
+securityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+resources:
+  {{- toYaml .Values.resources | nindent 2 }}
+{{- end }}
diff --git a/helm/agents/argo-rollouts/templates/agent.yaml b/helm/agents/argo-rollouts/templates/agent.yaml
@@ -187,9 +187,4 @@ spec:
       compaction: {{- toYaml .Values.compaction | nindent 8 }}
     {{- end }}
     deployment:
-      {{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      resources:
-        {{- toYaml .Values.resources | nindent 8 }}
+      {{- include "agent.deploymentSpec" . | nindent 6 }}
diff --git a/helm/agents/argo-rollouts/values.yaml b/helm/agents/argo-rollouts/values.yaml
@@ -16,3 +16,7 @@ resources:
 
 
 compaction: {}
+
+podSecurityContext: {}
+
+securityContext: {}
diff --git a/helm/agents/cilium-debug/templates/_helpers.tpl b/helm/agents/cilium-debug/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{- define "agent.deploymentSpec" -}}
+{{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.podSecurityContext }}
+podSecurityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.securityContext }}
+securityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+resources:
+  {{- toYaml .Values.resources | nindent 2 }}
+{{- end }}
diff --git a/helm/agents/cilium-debug/templates/agent.yaml b/helm/agents/cilium-debug/templates/agent.yaml
@@ -160,9 +160,4 @@ spec:
       compaction: {{- toYaml .Values.compaction | nindent 8 }}
     {{- end }}
     deployment:
-      {{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      resources:
-        {{- toYaml .Values.resources | nindent 8 }}
+      {{- include "agent.deploymentSpec" . | nindent 6 }}
diff --git a/helm/agents/cilium-debug/values.yaml b/helm/agents/cilium-debug/values.yaml
@@ -15,3 +15,7 @@ resources:
     memory: 1Gi
 
 compaction: {}
+
+podSecurityContext: {}
+
+securityContext: {}
diff --git a/helm/agents/cilium-manager/templates/_helpers.tpl b/helm/agents/cilium-manager/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{- define "agent.deploymentSpec" -}}
+{{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.podSecurityContext }}
+podSecurityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.securityContext }}
+securityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+resources:
+  {{- toYaml .Values.resources | nindent 2 }}
+{{- end }}
diff --git a/helm/agents/cilium-manager/templates/agent.yaml b/helm/agents/cilium-manager/templates/agent.yaml
@@ -432,9 +432,4 @@ spec:
       compaction: {{- toYaml .Values.compaction | nindent 8 }}
     {{- end }}
     deployment:
-      {{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      resources:
-        {{- toYaml .Values.resources | nindent 8 }}
+      {{- include "agent.deploymentSpec" . | nindent 6 }}
diff --git a/helm/agents/cilium-manager/values.yaml b/helm/agents/cilium-manager/values.yaml
@@ -15,3 +15,7 @@ resources:
     memory: 1Gi
 
 compaction: {}
+
+podSecurityContext: {}
+
+securityContext: {}
diff --git a/helm/agents/cilium-policy/templates/_helpers.tpl b/helm/agents/cilium-policy/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{- define "agent.deploymentSpec" -}}
+{{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.podSecurityContext }}
+podSecurityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.securityContext }}
+securityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+resources:
+  {{- toYaml .Values.resources | nindent 2 }}
+{{- end }}
diff --git a/helm/agents/cilium-policy/templates/agent.yaml b/helm/agents/cilium-policy/templates/agent.yaml
@@ -524,9 +524,4 @@ spec:
       compaction: {{- toYaml .Values.compaction | nindent 8 }}
     {{- end }}
     deployment:
-      {{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      resources:
-        {{- toYaml .Values.resources | nindent 8 }}
+      {{- include "agent.deploymentSpec" . | nindent 6 }}
diff --git a/helm/agents/cilium-policy/values.yaml b/helm/agents/cilium-policy/values.yaml
@@ -16,3 +16,7 @@ resources:
 
 
 compaction: {}
+
+podSecurityContext: {}
+
+securityContext: {}
diff --git a/helm/agents/helm/templates/_helpers.tpl b/helm/agents/helm/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{- define "agent.deploymentSpec" -}}
+{{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.podSecurityContext }}
+podSecurityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.securityContext }}
+securityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+resources:
+  {{- toYaml .Values.resources | nindent 2 }}
+{{- end }}
diff --git a/helm/agents/helm/templates/agent.yaml b/helm/agents/helm/templates/agent.yaml
@@ -179,9 +179,4 @@ spec:
       compaction: {{- toYaml .Values.compaction | nindent 8 }}
     {{- end }}
     deployment:
-      {{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      resources:
-        {{- toYaml .Values.resources | nindent 8 }}
+      {{- include "agent.deploymentSpec" . | nindent 6 }}
diff --git a/helm/agents/helm/values.yaml b/helm/agents/helm/values.yaml
@@ -16,3 +16,7 @@ resources:
 
 
 compaction: {}
+
+podSecurityContext: {}
+
+securityContext: {}
diff --git a/helm/agents/istio/templates/_helpers.tpl b/helm/agents/istio/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{- define "agent.deploymentSpec" -}}
+{{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.podSecurityContext }}
+podSecurityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.securityContext }}
+securityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+resources:
+  {{- toYaml .Values.resources | nindent 2 }}
+{{- end }}
diff --git a/helm/agents/istio/templates/agent.yaml b/helm/agents/istio/templates/agent.yaml
@@ -232,9 +232,4 @@ spec:
       compaction: {{- toYaml .Values.compaction | nindent 8 }}
     {{- end }}
     deployment:
-      {{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      resources:
-        {{- toYaml .Values.resources | nindent 8 }}
+      {{- include "agent.deploymentSpec" . | nindent 6 }}
diff --git a/helm/agents/istio/values.yaml b/helm/agents/istio/values.yaml
@@ -15,3 +15,7 @@ resources:
     memory: 1Gi
 
 compaction: {}
+
+podSecurityContext: {}
+
+securityContext: {}
diff --git a/helm/agents/k8s/templates/_helpers.tpl b/helm/agents/k8s/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{- define "agent.deploymentSpec" -}}
+{{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.podSecurityContext }}
+podSecurityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.securityContext }}
+securityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+resources:
+  {{- toYaml .Values.resources | nindent 2 }}
+{{- end }}
diff --git a/helm/agents/k8s/templates/agent.yaml b/helm/agents/k8s/templates/agent.yaml
@@ -150,9 +150,4 @@ spec:
       compaction: {{- toYaml .Values.compaction | nindent 8 }}
     {{- end }}
     deployment:
-      {{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      resources:
-        {{- toYaml .Values.resources | nindent 8 }}
+      {{- include "agent.deploymentSpec" . | nindent 6 }}
diff --git a/helm/agents/k8s/values.yaml b/helm/agents/k8s/values.yaml
@@ -15,3 +15,7 @@ resources:
     memory: 1Gi
 
 compaction: {}
+
+podSecurityContext: {}
+
+securityContext: {}
diff --git a/helm/agents/kgateway/templates/_helpers.tpl b/helm/agents/kgateway/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{- define "agent.deploymentSpec" -}}
+{{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.podSecurityContext }}
+podSecurityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.securityContext }}
+securityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+resources:
+  {{- toYaml .Values.resources | nindent 2 }}
+{{- end }}
diff --git a/helm/agents/kgateway/templates/agent.yaml b/helm/agents/kgateway/templates/agent.yaml
@@ -314,9 +314,4 @@ spec:
       compaction: {{- toYaml .Values.compaction | nindent 8 }}
     {{- end }}
     deployment:
-      {{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      resources:
-        {{- toYaml .Values.resources | nindent 8 }}
+      {{- include "agent.deploymentSpec" . | nindent 6 }}
diff --git a/helm/agents/kgateway/values.yaml b/helm/agents/kgateway/values.yaml
@@ -15,3 +15,7 @@ resources:
     memory: 1Gi
 
 compaction: {}
+
+podSecurityContext: {}
+
+securityContext: {}
diff --git a/helm/agents/observability/templates/_helpers.tpl b/helm/agents/observability/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{- define "agent.deploymentSpec" -}}
+{{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.podSecurityContext }}
+podSecurityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.securityContext }}
+securityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+resources:
+  {{- toYaml .Values.resources | nindent 2 }}
+{{- end }}
diff --git a/helm/agents/observability/templates/agent.yaml b/helm/agents/observability/templates/agent.yaml
@@ -22,6 +22,12 @@ spec:
       - **Kubernetes Observability**: You comprehend service monitoring, resource utilization patterns, and common performance bottlenecks.
       - **Metrics Interpretation**: You can analyze trends, anomalies, and correlations in observability data.
       - **Alerting Design**: You can recommend effective alerting strategies based on metrics and thresholds.
+      {{- with .Values.grafana.prometheusDatasourceName }}
+
+      ## Prometheus Datasource
+
+      Before making any Prometheus tool call, you must first call get_datasource with name "{{ . }}" to resolve the datasource UID. Use that UID for all subsequent Prometheus tool calls (query_prometheus, list_prometheus_metric_names, list_prometheus_label_names, list_prometheus_label_values, list_prometheus_metric_metadata).
+      {{- end }}
 
       {{ `{{include "builtin/kubernetes-context"}}` }}
 
@@ -94,8 +100,7 @@ spec:
           - get_sift_analysis
           - get_oncall_shift
           - get_incident
-          - get_datasource_by_uid
-          - get_datasource_by_name
+          - get_datasource
           - get_dashboard_panel_queries
           - get_dashboard_by_uid
           - get_current_oncall_users
@@ -166,9 +171,4 @@ spec:
       compaction: {{- toYaml .Values.compaction | nindent 8 }}
     {{- end }}
     deployment:
-      {{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      resources:
-        {{- toYaml .Values.resources | nindent 8 }}
+      {{- include "agent.deploymentSpec" . | nindent 6 }}
diff --git a/helm/agents/observability/values.yaml b/helm/agents/observability/values.yaml
@@ -15,3 +15,12 @@ resources:
     memory: 1Gi
 
 compaction: {}
+
+podSecurityContext: {}
+
+securityContext: {}
+
+# -- Optional Grafana datasource name for Prometheus (e.g. "Prometheus"). When set, the agent
+# uses this datasource name for all Prometheus queries instead of discovering it at runtime.
+grafana:
+  prometheusDatasourceName: ""
diff --git a/helm/agents/promql/templates/_helpers.tpl b/helm/agents/promql/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{- define "agent.deploymentSpec" -}}
+{{- with coalesce (empty .Values.imagePullSecrets | ternary nil .Values.imagePullSecrets) .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.podSecurityContext }}
+podSecurityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.securityContext }}
+securityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+resources:
+  {{- toYaml .Values.resources | nindent 2 }}
+{{- end }}
diff --git a/helm/agents/promql/templates/agent.yaml b/helm/agents/promql/templates/agent.yaml
diff --git a/helm/agents/promql/values.yaml b/helm/agents/promql/values.yaml
diff --git a/helm/kagent-crds/Chart-template.yaml b/helm/kagent-crds/Chart-template.yaml
diff --git a/helm/kagent-crds/templates/NOTES.txt b/helm/kagent-crds/templates/NOTES.txt
diff --git a/helm/kagent-crds/values.yaml b/helm/kagent-crds/values.yaml
diff --git a/helm/kagent/Chart-template.yaml b/helm/kagent/Chart-template.yaml
diff --git a/helm/kagent/templates/NOTES.txt b/helm/kagent/templates/NOTES.txt
diff --git a/helm/kagent/templates/openshift-route.yaml b/helm/kagent/templates/openshift-route.yaml
diff --git a/helm/kagent/tests/openshift-route_test.yaml b/helm/kagent/tests/openshift-route_test.yaml
diff --git a/helm/kagent/values.yaml b/helm/kagent/values.yaml
