From 409fe24ebce1d79862820c8a335f943c99a60db5 Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Tue, 24 Mar 2026 09:43:13 +0000
Subject: [PATCH 01/34] Updated release-notes files

---
 beta-releasenotes.md | 3 +++
 releasenotes.md      | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)
 create mode 100644 beta-releasenotes.md

diff --git a/beta-releasenotes.md b/beta-releasenotes.md
new file mode 100644
index 0000000000..83cc13d7e7
--- /dev/null
+++ b/beta-releasenotes.md
@@ -0,0 +1,3 @@
+## Enhancements
+## Bugs
+## Others
diff --git a/releasenotes.md b/releasenotes.md
index 5ae13f8bab..e69de29bb2 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,6 +0,0 @@
-## v2.1.1
-
-
-## Bugs
-- fix: auto assign permission group related fixes (#6934)
-- fix: clusterId check for modifying triggers for cluster level notific… (#6932)

From 4b798785ff4fc0fce781f1e1dba061fd6c8f5783 Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Wed, 25 Mar 2026 10:37:18 +0000
Subject: [PATCH 02/34] Updated release notes

---
 beta-releasenotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/beta-releasenotes.md b/beta-releasenotes.md
index 83cc13d7e7..3d1eb775eb 100644
--- a/beta-releasenotes.md
+++ b/beta-releasenotes.md
@@ -1,3 +1,4 @@
 ## Enhancements
 ## Bugs
 ## Others
+- sync: migration seq (#6942)

From 4783923f0cb1c1d38f1fd2ec4efe99febdfc52a6 Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Wed, 25 Mar 2026 11:50:53 +0000
Subject: [PATCH 03/34] Updated release notes

---
 beta-releasenotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/beta-releasenotes.md b/beta-releasenotes.md
index 3d1eb775eb..182e6effb2 100644
--- a/beta-releasenotes.md
+++ b/beta-releasenotes.md
@@ -1,4 +1,5 @@
 ## Enhancements
+- feat: app filters enhancement (#6939)
 ## Bugs
 ## Others
 - sync: migration seq (#6942)

From e757f5e21b70afaba52a368a33e1df728608c5b8 Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Tue, 31 Mar 2026 08:09:26 +0000
Subject: [PATCH 04/34] Updated release notes

---
 beta-releasenotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/beta-releasenotes.md b/beta-releasenotes.md
index 182e6effb2..e263431958 100644
--- a/beta-releasenotes.md
+++ b/beta-releasenotes.md
@@ -1,4 +1,5 @@
 ## Enhancements
+- feat: add env-driven timeout for buildx builder pod readiness (#6944)
 - feat: app filters enhancement (#6939)
 ## Bugs
 ## Others

From 4d24b998ffad286f4b5c93fb5a3224c363d8b20a Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Mon, 6 Apr 2026 10:37:44 +0000
Subject: [PATCH 05/34] Updated release notes

---
 beta-releasenotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/beta-releasenotes.md b/beta-releasenotes.md
index e263431958..854a08c9b9 100644
--- a/beta-releasenotes.md
+++ b/beta-releasenotes.md
@@ -1,4 +1,5 @@
 ## Enhancements
+- feat: add native sidecar container support (#6946)
 - feat: add env-driven timeout for buildx builder pod readiness (#6944)
 - feat: app filters enhancement (#6939)
 ## Bugs

From f1122d5025ea1cdd3055ca4f215792d3e8d1b6e3 Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Mon, 13 Apr 2026 07:44:19 +0000
Subject: [PATCH 06/34] Updated release notes

---
 beta-releasenotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/beta-releasenotes.md b/beta-releasenotes.md
index 854a08c9b9..a05e1f3a20 100644
--- a/beta-releasenotes.md
+++ b/beta-releasenotes.md
@@ -3,5 +3,6 @@
 - feat: add env-driven timeout for buildx builder pod readiness (#6944)
 - feat: app filters enhancement (#6939)
 ## Bugs
+- fix: dependabot security advisory (#6945)
 ## Others
 - sync: migration seq (#6942)

From 0c53519fe3b8727351720615fc7aaccb1783693e Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Tue, 14 Apr 2026 08:48:44 +0000
Subject: [PATCH 07/34] Updated release notes

---
 beta-releasenotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/beta-releasenotes.md b/beta-releasenotes.md
index a05e1f3a20..7a47393d3b 100644
--- a/beta-releasenotes.md
+++ b/beta-releasenotes.md
@@ -5,4 +5,5 @@
 ## Bugs
 - fix: dependabot security advisory (#6945)
 ## Others
+- misc: mig seq in develop (#6949)
 - sync: migration seq (#6942)

From 3e0ec143920f306e1b7186aae071c3821a99928a Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Wed, 15 Apr 2026 10:35:26 +0000
Subject: [PATCH 08/34] Updated release notes

---
 beta-releasenotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/beta-releasenotes.md b/beta-releasenotes.md
index 7a47393d3b..274e6c440b 100644
--- a/beta-releasenotes.md
+++ b/beta-releasenotes.md
@@ -3,6 +3,7 @@
 - feat: add env-driven timeout for buildx builder pod readiness (#6944)
 - feat: app filters enhancement (#6939)
 ## Bugs
+- fix: streamline AWS session creation and improve error handling (#6948)
 - fix: dependabot security advisory (#6945)
 ## Others
 - misc: mig seq in develop (#6949)

From 76166c688bf6404fc535c50ce932cf68461868ea Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Wed, 15 Apr 2026 12:40:05 +0000
Subject: [PATCH 09/34] Updated release notes

---
 beta-releasenotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/beta-releasenotes.md b/beta-releasenotes.md
index 274e6c440b..e088338857 100644
--- a/beta-releasenotes.md
+++ b/beta-releasenotes.md
@@ -6,5 +6,6 @@
 - fix: streamline AWS session creation and improve error handling (#6948)
 - fix: dependabot security advisory (#6945)
 ## Others
+- sync: new dependabot security fixes (#6950)
 - misc: mig seq in develop (#6949)
 - sync: migration seq (#6942)

From 332a6339c850f6d936a0825c8d697a37abed4493 Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Mon, 20 Apr 2026 12:59:18 +0000
Subject: [PATCH 10/34] Updated release notes

---
 beta-releasenotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/beta-releasenotes.md b/beta-releasenotes.md
index e088338857..514c4ceba2 100644
--- a/beta-releasenotes.md
+++ b/beta-releasenotes.md
@@ -6,6 +6,7 @@
 - fix: streamline AWS session creation and improve error handling (#6948)
 - fix: dependabot security advisory (#6945)
 ## Others
+- misc: Release candidate v0.46.0 (#6953)
 - sync: new dependabot security fixes (#6950)
 - misc: mig seq in develop (#6949)
 - sync: migration seq (#6942)

From 710103d53264333d23afc375f819571f8fc7ecc7 Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Tue, 21 Apr 2026 08:00:59 +0000
Subject: [PATCH 11/34] Updated release notes

---
 beta-releasenotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/beta-releasenotes.md b/beta-releasenotes.md
index 514c4ceba2..03ad52c3c3 100644
--- a/beta-releasenotes.md
+++ b/beta-releasenotes.md
@@ -6,6 +6,7 @@
 - fix: streamline AWS session creation and improve error handling (#6948)
 - fix: dependabot security advisory (#6945)
 ## Others
+- chore: added sql migration  (#6951)
 - misc: Release candidate v0.46.0 (#6953)
 - sync: new dependabot security fixes (#6950)
 - misc: mig seq in develop (#6949)

From ae4c1ee6b36c3650b87b49f2c8905e8bbf2a204a Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Tue, 21 Apr 2026 10:21:37 +0000
Subject: [PATCH 12/34] Updated release notes

---
 beta-releasenotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/beta-releasenotes.md b/beta-releasenotes.md
index 03ad52c3c3..e6ece1bc41 100644
--- a/beta-releasenotes.md
+++ b/beta-releasenotes.md
@@ -3,6 +3,7 @@
 - feat: add env-driven timeout for buildx builder pod readiness (#6944)
 - feat: app filters enhancement (#6939)
 ## Bugs
+- fix: new dependabot fixes (#6955)
 - fix: streamline AWS session creation and improve error handling (#6948)
 - fix: dependabot security advisory (#6945)
 ## Others

From e0e821b8ee2b5e378361fb2d129934e54cbbf1b2 Mon Sep 17 00:00:00 2001
From: akshatsinha007 <akshat.sinha@devtron.ai>
Date: Mon, 6 Jul 2026 00:22:12 +0530
Subject: [PATCH 13/34] Added Athena, Silver Surfer and handled external
 postgres migration issue.

---
 charts/devtron/Chart.yaml                     |  7 +-
 charts/devtron/devtron-bom.yaml               | 35 +++++++-
 .../devtron/templates/configmap-secret.yaml   | 33 ++++++++
 charts/devtron/templates/dashboard.yaml       |  1 +
 charts/devtron/templates/devtron.yaml         |  2 +
 charts/devtron/templates/migrator.yaml        | 83 ++++++++++++++++++-
 charts/devtron/templates/postgresql.yaml      |  1 +
 charts/devtron/values.yaml                    | 37 +++++++--
 8 files changed, 186 insertions(+), 13 deletions(-)

diff --git a/charts/devtron/Chart.yaml b/charts/devtron/Chart.yaml
index 558e0c3ba4..3a9052b224 100644
--- a/charts/devtron/Chart.yaml
+++ b/charts/devtron/Chart.yaml
@@ -23,9 +23,12 @@ dependencies:
   version: "0.x.x"
   repository: https://helm.devtron.ai
   condition: security.enabled
+- name: redis
+  version: "2.4.0"
+  repository: "https://groundhog2k.github.io/helm-charts/"
+  condition: athenaApi.enabled
 maintainers:
 - email: prakarsh@devtron.ai
   name: Prakarsh
 icon: https://s3-ap-southeast-1.amazonaws.com/devtron.ai/images/devtron-sqr-logo.png
-home: https://devtron.ai
-
+home: https://devtron.ai
\ No newline at end of file
diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index d9d0fc7c46..892f36592a 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -240,6 +240,10 @@ monitoring:
       image: "k8s-sidecar:1.1.0"
       curlImage: "curl:7.73.0"
       imagePullPolicy: IfNotPresent
+redis:
+  image:
+    registry: "mirror.gcr.io"
+  fullnameOverride: "redis"
 devtronEnterprise:
   enabled: false
   finops:
@@ -270,6 +274,35 @@ devtronEnterprise:
       runAsNonRoot: true
       runAsUser: 1001
     healthPort: 8080
+  silverSurfer:
+    image: "silver-surfer:e3b9a2f6-1191-38789"
+    imagePullPolicy: IfNotPresent
+    resources: {}
+    podSecurityContext:
+      fsGroup: 1001
+      runAsGroup: 1001
+      runAsUser: 1001
+    containerSecurityContext:
+      allowPrivilegeEscalation: false
+      runAsNonRoot: true
+      runAsUser: 1001
+  athenaApi:
+    registry: ""
+    image: ""
+    imagePullPolicy: IfNotPresent
+    healthPort: "8000"
+    configs:
+      LLM_TEMPERATURE: "0.01"
+      REDIS_URL: redis://redis.devtroncd
+      PG_DATABASE: athena
+    secrets: {}
+  athenaMcp:
+    registry: ""
+    image: ""
+    imagePullPolicy: IfNotPresent
+    healthPort: "8000"
+    configs: {}
+    secrets: {}
   scoop:
     enabled: false
     registry: ""
@@ -278,4 +311,4 @@ devtronEnterprise:
     resources: {}
     configs:
       CLUSTER_ID: "1"
-      ORCHESTRATOR_URL: http://devtron-service.devtroncd.svc.cluster.local/orchestrator
+      ORCHESTRATOR_URL: http://devtron-service.devtroncd.svc.cluster.local/orchestrator
\ No newline at end of file
diff --git a/charts/devtron/templates/configmap-secret.yaml b/charts/devtron/templates/configmap-secret.yaml
index f9c48511d5..d80086c787 100644
--- a/charts/devtron/templates/configmap-secret.yaml
+++ b/charts/devtron/templates/configmap-secret.yaml
@@ -447,3 +447,36 @@ metadata:
   namespace: devtroncd  
 {{- end }}
 {{- end }}
+---
+{{- if and $.Values.devtronEnterprise.enabled $.Values.devtronEnterprise.athenaApi.enabled }}
+apiVersion: v1
+data:
+{{- if and $.Values.global.externalPostgres $.Values.global.externalPostgres.enabled }}
+  PG_PASSWORD: {{ $.Values.global.externalPostgres.PG_PASSWORD | b64enc }}
+{{- else }}
+  PG_PASSWORD: {{ $postgresPwd }}
+{{- end }}
+{{- range $k, $v := $.Values.devtronEnterprise.athenaApi.secrets }}
+  {{ $k }}: {{ $v | b64enc | quote }}
+{{- end }}
+kind: Secret
+metadata:
+  labels:
+    app: athena-api
+  name: athena-api-secret
+  namespace: devtroncd
+type: Opaque
+---
+apiVersion: v1
+data:
+{{- range $k, $v := $.Values.devtronEnterprise.athenaMcp.secrets }}
+  {{ $k }}: {{ $v | b64enc | quote }}
+{{- end }}
+kind: Secret
+metadata:
+  labels:
+    app: athena-mcp
+  name: athena-mcp-secret
+  namespace: devtroncd
+type: Opaque
+{{- end }}
\ No newline at end of file
diff --git a/charts/devtron/templates/dashboard.yaml b/charts/devtron/templates/dashboard.yaml
index 31bccf38ed..fecc0b9bc9 100644
--- a/charts/devtron/templates/dashboard.yaml
+++ b/charts/devtron/templates/dashboard.yaml
@@ -23,6 +23,7 @@ data:
   FEATURE_STORAGE_ENABLE: "true"
   FEATURE_RESOURCE_WATCHER_ENABLE: "true"
   FEATURE_SOFTWARE_DISTRIBUTION_HUB_ENABLE: "true"
+  FEATURE_AI_INTEGRATION_ENABLE: "true"
 {{- end }}
 {{- if .config }}
   GA_ENABLED: {{ .config.analytics | default "false" | quote }}
diff --git a/charts/devtron/templates/devtron.yaml b/charts/devtron/templates/devtron.yaml
index d1392fd129..71e80271ef 100644
--- a/charts/devtron/templates/devtron.yaml
+++ b/charts/devtron/templates/devtron.yaml
@@ -36,6 +36,8 @@ data:
   DEVTRON_VERSION_IDENTIFIER_IN_HELM_VALUES: "devtron.installer.release"
   DEVTRON_MANAGED_LICENSING_ENABLED: "false"
   DEVTRON_BOM_URL: https://raw.githubusercontent.com/devtron-labs/charts/refs/tags/devtron-enterprise-%s/charts/devtron-enterprise/devtron-bom.yaml
+  SILVER_SURFER_CLIENT_URL: silver-surfer.devtroncd:8111
+  PROXY_SERVICE_CONFIG: '{"athena":{"host":"athena-api-service.devtroncd","port":"80"}}'
   {{- end }}
 {{- if $.Values.installer.modules }}
 {{- if has "cicd" $.Values.installer.modules }}
diff --git a/charts/devtron/templates/migrator.yaml b/charts/devtron/templates/migrator.yaml
index 92da8fea60..538683b611 100644
--- a/charts/devtron/templates/migrator.yaml
+++ b/charts/devtron/templates/migrator.yaml
@@ -548,8 +548,6 @@ kind: Job
 metadata:
   namespace: devtroncd
   name: postgresql-create-databases-{{ randAlphaNum 5 | lower }}
-  annotations:
-    "helm.sh/hook": pre-install
 spec:
   activeDeadlineSeconds: 1500
   ttlSecondsAfterFinished: 1000
@@ -599,4 +597,85 @@ spec:
           image: {{ include "common.image" (dict "component" $.Values.components.postgres "global" $.Values.global "extraImage" $.Values.components.postgres.image ) }}
           name: postgresql-database-creator
       restartPolicy: OnFailure
+{{- end }}
+{{- if and $.Values.devtronEnterprise.enabled $.Values.devtronEnterprise.athenaApi.enabled }}
+---
+{{- if $.Capabilities.APIVersions.Has "batch/v1/Job" }}
+apiVersion: batch/v1
+{{- else }}
+apiVersion: batch/v1beta1
+{{- end }}
+kind: Job
+metadata:
+  name: postgresql-migrate-athena-{{ randAlphaNum 5 | lower }}
+spec:
+  template:
+    spec:
+      {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.components.migrator.nodeSelector "tolerations" $.Values.components.migrator.tolerations "imagePullSecrets" $.Values.components.migrator.imagePullSecrets "global" $.Values.global) | indent 6 }}
+      serviceAccountName: devtron-default-sa
+      {{- if and $.Values.global $.Values.global.podSecurityContext }}
+      securityContext:
+{{- toYaml $.Values.global.podSecurityContext | nindent 8 }}
+      {{- end }}
+      initContainers:
+        - command:
+            - /bin/sh
+            - -c
+            - cp -r migrations/db_scripts/ /shared/
+          image: {{ include "common.image" (dict "component" $.Values.devtronEnterprise.athenaApi "global" $.Values.global) }}
+          {{- if and $.Values.global $.Values.global.containerSecurityContext }}
+          securityContext:
+{{- toYaml $.Values.global.containerSecurityContext | nindent 12 }}
+          {{- end }}
+          name: athena-init
+          envFrom:
+            - configMapRef:
+                name: devtron-common-cm
+          volumeMounts:
+            - mountPath: /shared
+              name: shared-volume
+      containers:
+        - command:
+            - /bin/sh
+            - -c
+            - 'if [ $(MIGRATE_TO_VERSION) -eq "0" ]; then migrate -path $(SCRIPT_LOCATION) -database postgres://$(PG_USER):$(DB_PASSWORD)@$(PG_ADDR):$(PG_PORT)/$(PG_DATABASE)?sslmode=disable up;  else   echo $(MIGRATE_TO_VERSION); migrate -path $(SCRIPT_LOCATION)  -database postgres://$(PG_USER):$(DB_PASSWORD)@$(PG_ADDR):$(PG_PORT)/$(PG_DATABASE)?sslmode=disable goto $(MIGRATE_TO_VERSION);    fi '
+          env:
+            - name: SCRIPT_LOCATION
+              value: /shared/db_scripts/
+            - name: DB_TYPE
+              value: postgres
+            - name: MIGRATE_TO_VERSION
+              value: "0"
+          envFrom:
+            - secretRef:
+                name: postgresql-migrator
+            - configMapRef:
+                name: athena-api-cm
+            - configMapRef:
+                name: devtron-common-cm
+          {{- if .image }}        
+          image: {{ include "common.image" (dict "component" $.Values.components.migrator "global" $.Values.global) }}
+          {{- else }}
+          image: migrate/migrate
+          {{- end }} 
+          {{- if and $.Values.global $.Values.global.containerSecurityContext }}
+          securityContext:
+{{- toYaml $.Values.global.containerSecurityContext | nindent 12 }}
+          {{- end }}
+          name: postgresql-migrate-athena
+          volumeMounts:
+            - mountPath: /shared
+              name: shared-volume
+          {{- if .athenaApi }}
+          {{- if .athenaApi.resources }}        
+          resources:
+          {{- toYaml .athenaApi.resources | nindent 10 }}
+          {{- end }}
+          {{- end }}
+      restartPolicy: OnFailure
+      volumes:
+        - emptyDir: {}
+          name: shared-volume 
+  backoffLimit: 20
+  activeDeadlineSeconds: 1500
 {{- end }}
\ No newline at end of file
diff --git a/charts/devtron/templates/postgresql.yaml b/charts/devtron/templates/postgresql.yaml
index 251bfa03f7..6cd6771e7b 100644
--- a/charts/devtron/templates/postgresql.yaml
+++ b/charts/devtron/templates/postgresql.yaml
@@ -314,6 +314,7 @@ data:
     create database git_sensor;
     create database lens;
     create database clairv4;
+    create database athena;
 ---
 # Source: devtron-operator/templates/postgresql.yaml
 apiVersion: v1
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index 3f71e8db22..e1a7b66c89 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -480,7 +480,11 @@ monitoring:
       resources: {}
     persistence:
       storage: "2Gi"
-# Change these values for Devtron-Enterprise 
+redis:
+  image:
+    registry: "mirror.gcr.io"
+  fullnameOverride: "redis"
+# Change these values for Devtron-Enterprise
 devtronEnterprise:
   enabled: false
   finops:
@@ -497,11 +501,10 @@ devtronEnterprise:
     image: "casbin:f6ff5f74-064b67e5-462-30822"
     imagePullPolicy: IfNotPresent
     healthPort: 8080
-    configs:
-      PG_DATABASE: casbin
-    dbconfig:
-      secretName: postgresql-postgresql
-      keyName: postgresql-password
+  silverSurfer:
+    image: "silver-surfer:e3b9a2f6-1191-38789"
+    imagePullPolicy: IfNotPresent
+    resources: {}
     podSecurityContext:
       fsGroup: 1001
       runAsGroup: 1001
@@ -510,7 +513,25 @@ devtronEnterprise:
       allowPrivilegeEscalation: false
       runAsNonRoot: true
       runAsUser: 1001
-    resources: {}
+  athenaApi:
+    enabled: false
+    registry: ""
+    image: ""
+    imagePullPolicy: IfNotPresent
+    healthPort: "8000"
+    configs:
+      LLM_MODEL_ID: ""
+      LLM_TEMPERATURE: "0.01"
+      REDIS_URL: redis://redis.devtroncd
+      PG_DATABASE: athena
+    secrets: {}
+  athenaMcp:
+    image: ""
+    registry: ""
+    imagePullPolicy: IfNotPresent
+    healthPort: "8000"
+    configs: {}
+    secrets: {}
   scoop:
     enabled: false
     registry: ""
@@ -519,4 +540,4 @@ devtronEnterprise:
     resources: {}
     configs:
       CLUSTER_ID: "1"
-      ORCHESTRATOR_URL: http://devtron-service.devtroncd.svc.cluster.local/orchestrator
+      ORCHESTRATOR_URL: http://devtron-service.devtroncd.svc.cluster.local/orchestrator
\ No newline at end of file

From cc06f2c18976573f3cd73535fb8d23eebfe8d81a Mon Sep 17 00:00:00 2001
From: akshatsinha007 <akshat.sinha@devtron.ai>
Date: Mon, 6 Jul 2026 00:25:01 +0530
Subject: [PATCH 14/34] Added Athena, Silver Surfer Yamls

---
 charts/devtron/templates/athena-api.yaml    | 106 ++++++++++++++++++++
 charts/devtron/templates/athena-mcp.yaml    | 103 +++++++++++++++++++
 charts/devtron/templates/silver-surfer.yaml |  60 +++++++++++
 3 files changed, 269 insertions(+)
 create mode 100644 charts/devtron/templates/athena-api.yaml
 create mode 100644 charts/devtron/templates/athena-mcp.yaml
 create mode 100644 charts/devtron/templates/silver-surfer.yaml

diff --git a/charts/devtron/templates/athena-api.yaml b/charts/devtron/templates/athena-api.yaml
new file mode 100644
index 0000000000..22d317a9b1
--- /dev/null
+++ b/charts/devtron/templates/athena-api.yaml
@@ -0,0 +1,106 @@
+{{- if and $.Values.devtronEnterprise.enabled $.Values.devtronEnterprise.athenaApi.enabled }}
+{{- with $.Values.devtronEnterprise.athenaApi }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: athena-api-service
+  labels:
+    app: athena-api
+spec:
+  type: ClusterIP
+  ports:
+    - port: "80"
+      targetPort: app
+      protocol: TCP
+      name: app
+  selector:
+    app: athena-api
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: athena-api
+  labels:
+    app: athena-api
+spec:
+  selector:
+    matchLabels:
+      app: athena-api
+  replicas: 1
+  minReadySeconds: 60
+  template:
+    metadata:
+      labels:
+        app: athena-api
+    spec:
+      {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.devtronEnterprise.athenaApi.nodeSelector "tolerations" $.Values.devtronEnterprise.athenaApi.tolerations "imagePullSecrets" $.Values.devtronEnterprise.athenaApi.imagePullSecrets "global" $.Values.global) | indent 6 }}
+      {{- include "common.podSecurityContext" (dict "podSecurityContext" $.Values.devtronEnterprise.athenaApi.podSecurityContext "global" $.Values.global) | indent 6 }}
+      livenessProbe:
+        failureThreshold: 3
+        httpGet:
+          path: /health
+          port: {{ $.Values.devtronEnterprise.athenaApi.healthPort}}
+          scheme: HTTP
+        initialDelaySeconds: 20
+        periodSeconds: 300
+        successThreshold: 1
+        timeoutSeconds: 5
+      readinessProbe:
+        failureThreshold: 3
+        httpGet:
+          path: /health
+          port: {{ $.Values.devtronEnterprise.athenaApi.healthPort}}
+          scheme: HTTP
+        initialDelaySeconds: 20
+        periodSeconds: 600
+        successThreshold: 1
+        timeoutSeconds: 5
+      terminationGracePeriodSeconds: 30
+      restartPolicy: Always
+      serviceAccountName: devtron
+      containers:
+        image: {{ include "common.image" (dict "component" $.Values.devtronEnterprise.athenaApi "global" $.Values.global) }}
+        {{- if  .imagePullPolicy }}
+        imagePullPolicy: {{ .imagePullPolicy }}
+        {{- end }}
+        {{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.devtron.containerSecurityContext "global" $.Values.global) | indent 8 }}
+        ports:
+          - name: app
+            containerPort: 8000
+            protocol: TCP
+        {{- if .resources }}
+        resources:
+        {{- toYaml .resources | nindent 10 }}
+        {{- end }}
+        envFrom:
+          - configMapRef:
+              name: athena-api-cm
+          - secretRef:
+              name: athena-api-secret
+          - configMapRef:
+              name: devtron-common-cm
+---
+apiVersion: v1
+data:
+  ARGOCD_OPTS: --grpc-web --insecure
+  ARGOCD_SERVER: argocd-server.devtroncd:80
+  DEVTRON_MCP_API_ENDPOINT: http://athena-mcp-engine-service.devtroncd/devtron/mcp
+  HOLMES_ENABLED: "true"
+  LLM_MAX_OUTPUT_TOKEN: "6000"
+  MAX_TOOL_RESPONSE_TOKENS: "3000"
+  CHAT_AGENT_MAX_TOOL_CALLS: "10"
+{{ toYaml $.Values.global.dbConfig | indent 2 }}
+{{- if .configs}}
+{{ toYaml $.Values.devtronEnterprise.athenaApi.configs | indent 2 }}
+{{- end }}
+  SERVICE_NAME: athena-api
+  SERVICE_PLATFORM: local
+  SERVICE_VERSION: 0.2.0
+kind: ConfigMap
+metadata:
+  labels:
+    app: athena-api-server
+  name: athena-api-cm
+  namespace: devtroncd
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/devtron/templates/athena-mcp.yaml b/charts/devtron/templates/athena-mcp.yaml
new file mode 100644
index 0000000000..32c48f133d
--- /dev/null
+++ b/charts/devtron/templates/athena-mcp.yaml
@@ -0,0 +1,103 @@
+{{- if and $.Values.devtronEnterprise.enabled $.Values.devtronEnterprise.athenaApi.enabled }}
+{{- with $.Values.devtronEnterprise.athenaMcp }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: athena-mcp-engine-service
+  labels:
+    app: athena-mcp
+spec:
+  type: ClusterIP
+  ports:
+    - port: "80"
+      targetPort: app
+      protocol: TCP
+      name: app
+  selector:
+    app: athena-mcp
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: athena-mcp
+  labels:
+    app: athena-mcp
+spec:
+  selector:
+    matchLabels:
+      app: athena-mcp
+  replicas: 1
+  minReadySeconds: 60
+  template:
+    metadata:
+      labels:
+        app: athena-mcp
+    spec:
+      {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.devtronEnterprise.athenaMcp.nodeSelector "tolerations" $.Values.devtronEnterprise.athenaMcp.tolerations "imagePullSecrets" $.Values.devtronEnterprise.athenaMcp.imagePullSecrets "global" $.Values.global) | indent 6 }}
+      {{- include "common.podSecurityContext" (dict "podSecurityContext" $.Values.devtronEnterprise.athenaMcp.podSecurityContext "global" $.Values.global) | indent 6 }}
+      livenessProbe:
+        failureThreshold: 3
+        httpGet:
+          path: /health
+          port: {{ $.Values.devtronEnterprise.athenaMcp.healthPort}}
+          scheme: HTTP
+        initialDelaySeconds: 20
+        periodSeconds: 300
+        successThreshold: 1
+        timeoutSeconds: 5
+      readinessProbe:
+        failureThreshold: 3
+        httpGet:
+          path: /health
+          port: {{ $.Values.devtronEnterprise.athenaMcp.healthPort}}
+          scheme: HTTP
+        initialDelaySeconds: 20
+        periodSeconds: 600
+        successThreshold: 1
+        timeoutSeconds: 5
+      terminationGracePeriodSeconds: 30
+      restartPolicy: Always
+      serviceAccountName: devtron
+      containers:
+        image: {{ include "common.image" (dict "component" $.Values.devtronEnterprise.athenaMcp "global" $.Values.global) }}
+        {{- if  .imagePullPolicy }}
+        imagePullPolicy: {{ .imagePullPolicy }}
+        {{- end }}
+        {{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.devtron.containerSecurityContext "global" $.Values.global) | indent 8 }}
+        ports:
+          - name: app
+            containerPort: 8000
+            protocol: TCP
+        {{- if .resources }}
+        resources:
+        {{- toYaml .resources | nindent 10 }}
+        {{- end }}
+        envFrom:
+          - configMapRef:
+              name: athena-mcp-cm
+          - secretRef:
+              name: athena-mcp-secret
+          - configMapRef:
+              name: devtron-common-cm
+---
+apiVersion: v1
+data:
+  DEVTRON_API_ENDPOINT: http://devtron-service.devtroncd
+  DEVTRON_CENTRAL_API_URL: https://api.devtron.ai
+  DOC_RAG_SEARCH_SERVER_URL: https://api.devtron.ai
+  REQUIRED_RECOMMENDATION_DATA_COUNT: "10"
+  SERVICE_NAME: athena-mcp-engine-service
+  SERVICE_PLATFORM: k8s
+  SERVICE_VERSION: 0.2.0
+{{ toYaml $.Values.global.dbConfig | indent 2 }}
+{{- if .configs}}
+{{ toYaml $.Values.devtronEnterprise.athenaMcp.configs | indent 2 }}
+{{- end }}
+kind: ConfigMap
+metadata:
+  labels:
+    app: athena-mcp-server
+  name: athena-mcp-cm
+  namespace: devtroncd
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/devtron/templates/silver-surfer.yaml b/charts/devtron/templates/silver-surfer.yaml
new file mode 100644
index 0000000000..c23fa70e5f
--- /dev/null
+++ b/charts/devtron/templates/silver-surfer.yaml
@@ -0,0 +1,60 @@
+{{- if $.Values.devtronEnterprise.enabled }}
+{{- with $.Values.devtronEnterprise.silverSurfer }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: silver-surfer
+  labels:
+    app: silver-surfer
+spec:
+  type: ClusterIP
+  ports:
+    - port: "8111"
+      targetPort: "8111"
+      protocol: TCP
+      name: app
+  selector:
+    app: silver-surfer
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: silver-surfer
+  labels:
+    app: silver-surfer
+spec:
+  selector:
+    matchLabels:
+      app: silver-surfer
+  replicas: 1
+  minReadySeconds: 60
+  template:
+    metadata:
+      labels:
+        app: silver-surfer
+    spec:
+      {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.devtronEnterprise.silverSurfer.nodeSelector "tolerations" $.Values.devtronEnterprise.silverSurfer.tolerations "imagePullSecrets" $.Values.devtronEnterprise.silverSurfer.imagePullSecrets "global" $.Values.global) | indent 6 }}
+      {{- include "common.podSecurityContext" (dict "podSecurityContext" $.Values.devtronEnterprise.silverSurfer.podSecurityContext "global" $.Values.global) | indent 6 }}
+      terminationGracePeriodSeconds: 30
+      restartPolicy: Always
+      serviceAccountName: devtron
+      containers:
+        image: {{ include "common.image" (dict "component" $.Values.devtronEnterprise.silverSurfer "global" $.Values.global) }}
+        {{- if  .imagePullPolicy }}
+        imagePullPolicy: {{ .imagePullPolicy }}
+        {{- end }}
+        {{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.devtron.containerSecurityContext "global" $.Values.global) | indent 8 }}
+        ports:
+          - name: app
+            containerPort: 8111
+            protocol: TCP
+        {{- if .resources }}
+        resources:
+        {{- toYaml .resources | nindent 10 }}
+        {{- end }}
+        envFrom:
+          - configMapRef:
+              name: devtron-common-cm
+{{- end }}
+{{- end }}
+

From ef818acd58d7338da2d7f461f04b1ddf367fa53c Mon Sep 17 00:00:00 2001
From: akshatsinha007 <akshat.sinha@devtron.ai>
Date: Mon, 6 Jul 2026 00:38:10 +0530
Subject: [PATCH 15/34] updated redis condition in Chart.yaml

---
 charts/devtron/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/devtron/Chart.yaml b/charts/devtron/Chart.yaml
index 3a9052b224..caaa106254 100644
--- a/charts/devtron/Chart.yaml
+++ b/charts/devtron/Chart.yaml
@@ -26,7 +26,7 @@ dependencies:
 - name: redis
   version: "2.4.0"
   repository: "https://groundhog2k.github.io/helm-charts/"
-  condition: athenaApi.enabled
+  condition: devtronEnterprise.athenaApi.enabled
 maintainers:
 - email: prakarsh@devtron.ai
   name: Prakarsh

From 00f2f509d24272bb3ef6a8b97bf89b0c99a8a56d Mon Sep 17 00:00:00 2001
From: akshatsinha007 <akshat.sinha@devtron.ai>
Date: Mon, 6 Jul 2026 01:24:25 +0530
Subject: [PATCH 16/34] added condition for athena in devtron-bom.yaml

---
 charts/devtron/devtron-bom.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index 892f36592a..224feb0a9c 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -287,6 +287,7 @@ devtronEnterprise:
       runAsNonRoot: true
       runAsUser: 1001
   athenaApi:
+    enabled: false
     registry: ""
     image: ""
     imagePullPolicy: IfNotPresent

From 3f938af75078b42c059e449578c6b0223142d334 Mon Sep 17 00:00:00 2001
From: akshatsinha007 <akshat.sinha@devtron.ai>
Date: Mon, 6 Jul 2026 02:54:33 +0530
Subject: [PATCH 17/34] updated flags for athena

---
 charts/devtron/templates/dashboard.yaml | 1 +
 charts/devtron/templates/devtron.yaml   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/charts/devtron/templates/dashboard.yaml b/charts/devtron/templates/dashboard.yaml
index fecc0b9bc9..41d707f847 100644
--- a/charts/devtron/templates/dashboard.yaml
+++ b/charts/devtron/templates/dashboard.yaml
@@ -24,6 +24,7 @@ data:
   FEATURE_RESOURCE_WATCHER_ENABLE: "true"
   FEATURE_SOFTWARE_DISTRIBUTION_HUB_ENABLE: "true"
   FEATURE_AI_INTEGRATION_ENABLE: "true"
+  FEATURE_ATHENA_DEBUG_MODE_ENABLE: "true"
 {{- end }}
 {{- if .config }}
   GA_ENABLED: {{ .config.analytics | default "false" | quote }}
diff --git a/charts/devtron/templates/devtron.yaml b/charts/devtron/templates/devtron.yaml
index 71e80271ef..75d06d41b1 100644
--- a/charts/devtron/templates/devtron.yaml
+++ b/charts/devtron/templates/devtron.yaml
@@ -37,8 +37,11 @@ data:
   DEVTRON_MANAGED_LICENSING_ENABLED: "false"
   DEVTRON_BOM_URL: https://raw.githubusercontent.com/devtron-labs/charts/refs/tags/devtron-enterprise-%s/charts/devtron-enterprise/devtron-bom.yaml
   SILVER_SURFER_CLIENT_URL: silver-surfer.devtroncd:8111
+  {{- if $.Values.devtronEnterprise.athenaApi.enabled }}
+  FEATURE_ASK_DEVTRON_EXPERT: true
   PROXY_SERVICE_CONFIG: '{"athena":{"host":"athena-api-service.devtroncd","port":"80"}}'
   {{- end }}
+  {{- end }}
 {{- if $.Values.installer.modules }}
 {{- if has "cicd" $.Values.installer.modules }}
   CD_HOST: "argocd-server.devtroncd"

From 6c147799baf2b4fce241ef89ccd5ba74e314aa6a Mon Sep 17 00:00:00 2001
From: akshatsinha007 <akshat.sinha@devtron.ai>
Date: Mon, 6 Jul 2026 04:11:53 +0530
Subject: [PATCH 18/34] Handled cases discovered during 1st phase of release
 testing

---
 charts/devtron/templates/athena-api.yaml    |  5 +++--
 charts/devtron/templates/athena-mcp.yaml    |  5 +++--
 charts/devtron/templates/devtron.yaml       |  2 +-
 charts/devtron/templates/migrator.yaml      | 25 ++++++++++++++++++++-
 charts/devtron/templates/silver-surfer.yaml |  7 +++---
 charts/devtron/values.yaml                  | 14 ++++++++++++
 6 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/charts/devtron/templates/athena-api.yaml b/charts/devtron/templates/athena-api.yaml
index 22d317a9b1..8b3ed56556 100644
--- a/charts/devtron/templates/athena-api.yaml
+++ b/charts/devtron/templates/athena-api.yaml
@@ -9,10 +9,10 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: "80"
+    - name: app 
       targetPort: app
       protocol: TCP
-      name: app
+      port: 80
   selector:
     app: athena-api
 ---
@@ -59,6 +59,7 @@ spec:
       restartPolicy: Always
       serviceAccountName: devtron
       containers:
+      - name: athena-api
         image: {{ include "common.image" (dict "component" $.Values.devtronEnterprise.athenaApi "global" $.Values.global) }}
         {{- if  .imagePullPolicy }}
         imagePullPolicy: {{ .imagePullPolicy }}
diff --git a/charts/devtron/templates/athena-mcp.yaml b/charts/devtron/templates/athena-mcp.yaml
index 32c48f133d..fd96d2febb 100644
--- a/charts/devtron/templates/athena-mcp.yaml
+++ b/charts/devtron/templates/athena-mcp.yaml
@@ -9,10 +9,10 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: "80"
+    - name: app
       targetPort: app
       protocol: TCP
-      name: app
+      port: 80
   selector:
     app: athena-mcp
 ---
@@ -59,6 +59,7 @@ spec:
       restartPolicy: Always
       serviceAccountName: devtron
       containers:
+      - name: athena-mcp-server
         image: {{ include "common.image" (dict "component" $.Values.devtronEnterprise.athenaMcp "global" $.Values.global) }}
         {{- if  .imagePullPolicy }}
         imagePullPolicy: {{ .imagePullPolicy }}
diff --git a/charts/devtron/templates/devtron.yaml b/charts/devtron/templates/devtron.yaml
index 75d06d41b1..59bcd44dac 100644
--- a/charts/devtron/templates/devtron.yaml
+++ b/charts/devtron/templates/devtron.yaml
@@ -38,7 +38,7 @@ data:
   DEVTRON_BOM_URL: https://raw.githubusercontent.com/devtron-labs/charts/refs/tags/devtron-enterprise-%s/charts/devtron-enterprise/devtron-bom.yaml
   SILVER_SURFER_CLIENT_URL: silver-surfer.devtroncd:8111
   {{- if $.Values.devtronEnterprise.athenaApi.enabled }}
-  FEATURE_ASK_DEVTRON_EXPERT: true
+  FEATURE_ASK_DEVTRON_EXPERT: "true"
   PROXY_SERVICE_CONFIG: '{"athena":{"host":"athena-api-service.devtroncd","port":"80"}}'
   {{- end }}
   {{- end }}
diff --git a/charts/devtron/templates/migrator.yaml b/charts/devtron/templates/migrator.yaml
index 538683b611..dbb38ec327 100644
--- a/charts/devtron/templates/migrator.yaml
+++ b/charts/devtron/templates/migrator.yaml
@@ -618,6 +618,25 @@ spec:
 {{- toYaml $.Values.global.podSecurityContext | nindent 8 }}
       {{- end }}
       initContainers:
+        - name: create-athena-database
+          image: postgres:14
+          command:
+            - /bin/sh
+            - -c
+            - |
+              echo "Checking if database exists..."
+              psql "postgres://$(PG_USER):"$(DB_PASSWORD)"@$(PG_ADDR):$(PG_PORT)/postgres?sslmode=disable" \
+              -tc "SELECT 1 FROM pg_database WHERE datname='$PG_DATABASE'" \
+              | grep -q 1 || \
+              psql "postgres://$(PG_USER):"$(DB_PASSWORD)"@$(PG_ADDR):$(PG_PORT)/postgres?sslmode=disable" \
+              -c "CREATE DATABASE $PG_DATABASE;"
+          envFrom:
+            - secretRef:
+                name: postgresql-migrator
+            - configMapRef:
+                name: athena-api-cm
+            - configMapRef:
+                name: devtron-common-cm
         - command:
             - /bin/sh
             - -c
@@ -627,8 +646,12 @@ spec:
           securityContext:
 {{- toYaml $.Values.global.containerSecurityContext | nindent 12 }}
           {{- end }}
-          name: athena-init
+          name: migration-copy
           envFrom:
+            - secretRef:
+                name: postgresql-migrator
+            - configMapRef:
+                name: athena-api-cm
             - configMapRef:
                 name: devtron-common-cm
           volumeMounts:
diff --git a/charts/devtron/templates/silver-surfer.yaml b/charts/devtron/templates/silver-surfer.yaml
index c23fa70e5f..d9209835e7 100644
--- a/charts/devtron/templates/silver-surfer.yaml
+++ b/charts/devtron/templates/silver-surfer.yaml
@@ -9,10 +9,10 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: "8111"
-      targetPort: "8111"
+    - name: app 
+      targetPort: 8111
       protocol: TCP
-      name: app
+      port: 8111
   selector:
     app: silver-surfer
 ---
@@ -39,6 +39,7 @@ spec:
       restartPolicy: Always
       serviceAccountName: devtron
       containers:
+      - name: silver-surfer
         image: {{ include "common.image" (dict "component" $.Values.devtronEnterprise.silverSurfer "global" $.Values.global) }}
         {{- if  .imagePullPolicy }}
         imagePullPolicy: {{ .imagePullPolicy }}
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index e1a7b66c89..d69e968fd2 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -501,6 +501,20 @@ devtronEnterprise:
     image: "casbin:f6ff5f74-064b67e5-462-30822"
     imagePullPolicy: IfNotPresent
     healthPort: 8080
+    configs:
+      PG_DATABASE: casbin
+    dbconfig:
+      secretName: postgresql-postgresql
+      keyName: postgresql-password
+    podSecurityContext:
+      fsGroup: 1001
+      runAsGroup: 1001
+      runAsUser: 1001
+    containerSecurityContext:
+      allowPrivilegeEscalation: false
+      runAsNonRoot: true
+      runAsUser: 1001
+    resources: {}
   silverSurfer:
     image: "silver-surfer:e3b9a2f6-1191-38789"
     imagePullPolicy: IfNotPresent

From dc29ff05dd44cd4f4f7b977b4c10c22de49b7977 Mon Sep 17 00:00:00 2001
From: akshatsinha007 <akshat.sinha@devtron.ai>
Date: Mon, 6 Jul 2026 22:41:53 +0530
Subject: [PATCH 19/34] Updated Kublink, Devtron and hyperion image

---
 charts/devtron/devtron-bom.yaml | 6 +++---
 charts/devtron/values.yaml      | 6 +++---
 devtron-images.txt.source       | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index 224feb0a9c..d41dacb731 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -46,8 +46,8 @@ components:
     healthPort: 8080
   devtron:
     registry: ""
-    image: "hyperion:1188d0b9-280-38819"
-    cicdImage: "devtron:1188d0b9-434-38818"
+    image: "hyperion:0874dcaf-280-39287"
+    cicdImage: "devtron:0874dcaf-434-39286"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
     podSecurityContext:
@@ -93,7 +93,7 @@ components:
     healthPort: 50052
   kubewatch:
     registry: ""
-    image: "kubewatch:fbde4d5e-419-38744"
+    image: "kubewatch:09867a9c-419-39288"
     imagePullPolicy: IfNotPresent
     healthPort: 8080
     configs:
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index d69e968fd2..135c35f037 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -102,8 +102,8 @@ components:
     healthPort: 8080
   devtron:
     registry: ""
-    image: "hyperion:1188d0b9-280-38819"
-    cicdImage: "devtron:1188d0b9-434-38818"
+    image: "hyperion:0874dcaf-280-39287"
+    cicdImage: "devtron:0874dcaf-434-39286"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
     healthPort: 8080
@@ -174,7 +174,7 @@ components:
       keyName: postgresql-password
   kubewatch:
     registry: ""
-    image: "kubewatch:fbde4d5e-419-38744"
+    image: "kubewatch:09867a9c-419-39288"
     imagePullPolicy: IfNotPresent
     healthPort: 8080
     configs:
diff --git a/devtron-images.txt.source b/devtron-images.txt.source
index 5b5010ed5a..6023df1f03 100644
--- a/devtron-images.txt.source
+++ b/devtron-images.txt.source
@@ -13,11 +13,11 @@ quay.io/devtron/clair:4.3.6
 quay.io/devtron/curl:7.73.0
 quay.io/devtron/dashboard:8a175cbd-690-38843
 quay.io/devtron/devtron-utils:dup-chart-repo-v1.1.0
-quay.io/devtron/devtron:1188d0b9-434-38818
+quay.io/devtron/devtron:0874dcaf-434-39286
 quay.io/devtron/dex:v2.30.2
 quay.io/devtron/git-sensor:fbde4d5e-200-38750
 quay.io/devtron/grafana:7.3.1
-quay.io/devtron/hyperion:1188d0b9-280-38819
+quay.io/devtron/hyperion:0874dcaf-280-39287
 quay.io/devtron/image-scanner:fbde4d5e-141-38756
 quay.io/devtron/inception:473deaa4-185-21582
 quay.io/devtron/k8s-sidecar:1.1.0
@@ -25,7 +25,7 @@ quay.io/devtron/k8s-utils:tutum-curl
 quay.io/devtron/k9s-k8s-utils:latest
 quay.io/devtron/kubectl:latest
 quay.io/devtron/kubelink:fbde4d5e-564-38749
-quay.io/devtron/kubewatch:fbde4d5e-419-38744
+quay.io/devtron/kubewatch:09867a9c-419-39288
 quay.io/devtron/lens:fbde4d5e-333-38752
 quay.io/devtron/migrator:v4.16.2
 quay.io/devtron/minideb:latest

From 8ed8d471972bd6ff3ae4c1c5499a500893d63619 Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Mon, 6 Jul 2026 17:14:49 +0000
Subject: [PATCH 20/34] Updated kubelink to 09867a9c-564-39289 tag in values
 file

---
 charts/devtron/devtron-bom.yaml | 4 ++--
 charts/devtron/values.yaml      | 4 ++--
 devtron-images.txt.source       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index d41dacb731..0925ec53de 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -70,7 +70,7 @@ components:
       authenticator: "authenticator:e414faff-393-13273"
   kubelink:
     registry: ""
-    image: "kubelink:fbde4d5e-564-38749"
+    image: "kubelink:09867a9c-564-39289"
     imagePullPolicy: IfNotPresent
     configs:
       ENABLE_HELM_RELEASE_CACHE: "true"
@@ -312,4 +312,4 @@ devtronEnterprise:
     resources: {}
     configs:
       CLUSTER_ID: "1"
-      ORCHESTRATOR_URL: http://devtron-service.devtroncd.svc.cluster.local/orchestrator
\ No newline at end of file
+      ORCHESTRATOR_URL: http://devtron-service.devtroncd.svc.cluster.local/orchestrator
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index 135c35f037..26f38f1d92 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -151,7 +151,7 @@ components:
       authenticator: "authenticator:e414faff-393-13273"
   kubelink:
     registry: ""
-    image: "kubelink:fbde4d5e-564-38749"
+    image: "kubelink:09867a9c-564-39289"
     imagePullPolicy: IfNotPresent
     healthPort: 50052
     podSecurityContext:
@@ -554,4 +554,4 @@ devtronEnterprise:
     resources: {}
     configs:
       CLUSTER_ID: "1"
-      ORCHESTRATOR_URL: http://devtron-service.devtroncd.svc.cluster.local/orchestrator
\ No newline at end of file
+      ORCHESTRATOR_URL: http://devtron-service.devtroncd.svc.cluster.local/orchestrator
diff --git a/devtron-images.txt.source b/devtron-images.txt.source
index 6023df1f03..5d70e569a7 100644
--- a/devtron-images.txt.source
+++ b/devtron-images.txt.source
@@ -24,7 +24,7 @@ quay.io/devtron/k8s-sidecar:1.1.0
 quay.io/devtron/k8s-utils:tutum-curl
 quay.io/devtron/k9s-k8s-utils:latest
 quay.io/devtron/kubectl:latest
-quay.io/devtron/kubelink:fbde4d5e-564-38749
+quay.io/devtron/kubelink:09867a9c-564-39289
 quay.io/devtron/kubewatch:09867a9c-419-39288
 quay.io/devtron/lens:fbde4d5e-333-38752
 quay.io/devtron/migrator:v4.16.2

From cd7548ca9eab371fa0f7cf7dc221a8f78dc5a498 Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Mon, 6 Jul 2026 17:19:16 +0000
Subject: [PATCH 21/34] Updated lens to 3b3d6d0e-333-39292 tag in values file

---
 charts/devtron/devtron-bom.yaml | 2 +-
 charts/devtron/values.yaml      | 2 +-
 devtron-images.txt.source       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index 0925ec53de..e1e47d63b7 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -136,7 +136,7 @@ components:
   # Values for lens
   lens:
     registry: ""
-    image: "lens:fbde4d5e-333-38752"
+    image: "lens:3b3d6d0e-333-39292"
     imagePullPolicy: IfNotPresent
     configs:
       GIT_SENSOR_PROTOCOL: GRPC
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index 26f38f1d92..f6384de8ae 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -219,7 +219,7 @@ components:
   # Values for lens
   lens:
     registry: ""
-    image: "lens:fbde4d5e-333-38752"
+    image: "lens:3b3d6d0e-333-39292"
     imagePullPolicy: IfNotPresent
     secrets: {}
     resources: {}
diff --git a/devtron-images.txt.source b/devtron-images.txt.source
index 5d70e569a7..b6cd5b8ef7 100644
--- a/devtron-images.txt.source
+++ b/devtron-images.txt.source
@@ -26,7 +26,7 @@ quay.io/devtron/k9s-k8s-utils:latest
 quay.io/devtron/kubectl:latest
 quay.io/devtron/kubelink:09867a9c-564-39289
 quay.io/devtron/kubewatch:09867a9c-419-39288
-quay.io/devtron/lens:fbde4d5e-333-38752
+quay.io/devtron/lens:3b3d6d0e-333-39292
 quay.io/devtron/migrator:v4.16.2
 quay.io/devtron/minideb:latest
 quay.io/devtron/minio-mc:RELEASE.2021-02-14T04-28-06Z

From 9d286fa97607532380eb9e836645c87a3e1c1dfb Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Mon, 6 Jul 2026 17:20:06 +0000
Subject: [PATCH 22/34] Updated git-sensor to 3b3d6d0e-200-39291 tag in values
 file

---
 charts/devtron/devtron-bom.yaml | 2 +-
 charts/devtron/values.yaml      | 2 +-
 devtron-images.txt.source       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index e1e47d63b7..d83cf026d7 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -118,7 +118,7 @@ components:
       image: postgres_exporter:v0.10.1
   gitsensor:
     registry: ""
-    image: "git-sensor:fbde4d5e-200-38750"
+    image: "git-sensor:3b3d6d0e-200-39291"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index f6384de8ae..59f4ecc81e 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -201,7 +201,7 @@ components:
       volumeSize: "20Gi"
   gitsensor:
     registry: ""
-    image: "git-sensor:fbde4d5e-200-38750"
+    image: "git-sensor:3b3d6d0e-200-39291"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false
diff --git a/devtron-images.txt.source b/devtron-images.txt.source
index b6cd5b8ef7..df541263f7 100644
--- a/devtron-images.txt.source
+++ b/devtron-images.txt.source
@@ -15,7 +15,7 @@ quay.io/devtron/dashboard:8a175cbd-690-38843
 quay.io/devtron/devtron-utils:dup-chart-repo-v1.1.0
 quay.io/devtron/devtron:0874dcaf-434-39286
 quay.io/devtron/dex:v2.30.2
-quay.io/devtron/git-sensor:fbde4d5e-200-38750
+quay.io/devtron/git-sensor:3b3d6d0e-200-39291
 quay.io/devtron/grafana:7.3.1
 quay.io/devtron/hyperion:0874dcaf-280-39287
 quay.io/devtron/image-scanner:fbde4d5e-141-38756

From 0e9e590d5a7d5f8da25ee09fb2b245eecfca1a7d Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Mon, 6 Jul 2026 17:21:36 +0000
Subject: [PATCH 23/34] Updated dashboard to c7b89667-690-39290 tag in values
 file

---
 charts/devtron/devtron-bom.yaml | 2 +-
 charts/devtron/values.yaml      | 2 +-
 devtron-images.txt.source       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index d83cf026d7..5ff3693dcb 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -41,7 +41,7 @@ components:
         FEATURE_CODE_MIRROR_ENABLE: "true"
         FEATURE_GROUPED_APP_LIST_FILTERS_ENABLE: "true"
     registry: ""
-    image: "dashboard:8a175cbd-690-38843"
+    image: "dashboard:c7b89667-690-39290"
     imagePullPolicy: IfNotPresent
     healthPort: 8080
   devtron:
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index 59f4ecc81e..f963818236 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -97,7 +97,7 @@ components:
         FEATURE_CODE_MIRROR_ENABLE: "true"
         FEATURE_GROUPED_APP_LIST_FILTERS_ENABLE: "true"
     registry: ""
-    image: "dashboard:8a175cbd-690-38843"
+    image: "dashboard:c7b89667-690-39290"
     imagePullPolicy: IfNotPresent
     healthPort: 8080
   devtron:
diff --git a/devtron-images.txt.source b/devtron-images.txt.source
index df541263f7..8adb87acf8 100644
--- a/devtron-images.txt.source
+++ b/devtron-images.txt.source
@@ -11,7 +11,7 @@ quay.io/devtron/chart-sync:fbde4d5e-836-38757
 quay.io/devtron/ci-runner:fbde4d5e-138-38754
 quay.io/devtron/clair:4.3.6
 quay.io/devtron/curl:7.73.0
-quay.io/devtron/dashboard:8a175cbd-690-38843
+quay.io/devtron/dashboard:c7b89667-690-39290
 quay.io/devtron/devtron-utils:dup-chart-repo-v1.1.0
 quay.io/devtron/devtron:0874dcaf-434-39286
 quay.io/devtron/dex:v2.30.2

From bbb3f9d9e2e2a73bda18972be67fe7e4f549ea2c Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Mon, 6 Jul 2026 17:22:25 +0000
Subject: [PATCH 24/34] Updated ci-runner to 3b3d6d0e-138-39293 tag in values
 file

---
 charts/devtron/devtron-bom.yaml | 2 +-
 charts/devtron/values.yaml      | 2 +-
 devtron-images.txt.source       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index 5ff3693dcb..eb11aa2e9f 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -61,7 +61,7 @@ components:
     healthPort: 8080
   ciRunner:
     registry: ""
-    image: "ci-runner:fbde4d5e-138-38754"
+    image: "ci-runner:3b3d6d0e-138-39293"
   argocdDexServer:
     registry: ""
     image: "dex:v2.30.2"
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index f963818236..666852720f 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -140,7 +140,7 @@ components:
       #      - devtron.example.com
   ciRunner:
     registry: ""
-    image: "ci-runner:fbde4d5e-138-38754"
+    image: "ci-runner:3b3d6d0e-138-39293"
     # Add annotations for ci-runner & cd-runner serviceAccount. 
     annotations: {}
   argocdDexServer:
diff --git a/devtron-images.txt.source b/devtron-images.txt.source
index 8adb87acf8..4eb9702093 100644
--- a/devtron-images.txt.source
+++ b/devtron-images.txt.source
@@ -8,7 +8,7 @@ quay.io/devtron/bats:v1.4.1
 quay.io/devtron/busybox:1.31.1
 quay.io/devtron/centos-k8s-utils:latest
 quay.io/devtron/chart-sync:fbde4d5e-836-38757
-quay.io/devtron/ci-runner:fbde4d5e-138-38754
+quay.io/devtron/ci-runner:3b3d6d0e-138-39293
 quay.io/devtron/clair:4.3.6
 quay.io/devtron/curl:7.73.0
 quay.io/devtron/dashboard:c7b89667-690-39290

From f86defd9d60d89e8fe36fe620f2149ffe96b2741 Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Mon, 6 Jul 2026 17:24:08 +0000
Subject: [PATCH 25/34] Updated notifier to 9804331c-372-39294 tag in values
 file

---
 charts/devtron/devtron-bom.yaml | 2 +-
 charts/devtron/values.yaml      | 2 +-
 devtron-images.txt.source       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index eb11aa2e9f..cd84fbc1a5 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -220,7 +220,7 @@ security:
       tag: 4.3.6
 # Values for notifier integration
 notifier:
-  image: "notifier:580d409b-372-38755"
+  image: "notifier:9804331c-372-39294"
   healthPort: 3000
 minio:
   image: "minio:RELEASE.2021-02-14T04-01-33Z"
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index 666852720f..13c217b311 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -431,7 +431,7 @@ security:
 notifier:
   enabled: false
   imagePullPolicy: IfNotPresent
-  image: "notifier:580d409b-372-38755"
+  image: "notifier:9804331c-372-39294"
   configs:
     CD_ENVIRONMENT: PROD
   secrets: {}
diff --git a/devtron-images.txt.source b/devtron-images.txt.source
index 4eb9702093..fb9978a085 100644
--- a/devtron-images.txt.source
+++ b/devtron-images.txt.source
@@ -34,7 +34,7 @@ quay.io/devtron/minio:RELEASE.2021-02-14T04-01-33Z
 quay.io/devtron/nats-box
 quay.io/devtron/nats-server-config-reloader:0.6.2
 quay.io/devtron/nats:2.9.3-alpine
-quay.io/devtron/notifier:580d409b-372-38755
+quay.io/devtron/notifier:9804331c-372-39294
 quay.io/devtron/postgres:14.9
 quay.io/devtron/postgres_exporter:v0.10.1
 quay.io/devtron/postgres_exporter:v0.4.7

From 42b4a41a248d9b1cc25d3c4c33c3b1fac7256466 Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Mon, 6 Jul 2026 17:25:08 +0000
Subject: [PATCH 26/34] Updated image-scanner to 3b3d6d0e-141-39295 tag in
 values file

---
 charts/devtron/devtron-bom.yaml | 2 +-
 charts/devtron/values.yaml      | 2 +-
 devtron-images.txt.source       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index cd84fbc1a5..fdff26988e 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -209,7 +209,7 @@ workflowController:
   IMDSv1ExecutorImage: "argoexec:v3.0.7"
 security:
   imageScanner:
-    image: "image-scanner:fbde4d5e-141-38756"
+    image: "image-scanner:3b3d6d0e-141-39295"
     healthPort: 8080
     configs:
       TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index 13c217b311..6cc60a24fd 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -412,7 +412,7 @@ argo-cd:
 security:
   enabled: false
   imageScanner:
-    image: "image-scanner:fbde4d5e-141-38756"
+    image: "image-scanner:3b3d6d0e-141-39295"
     healthPort: 8080
     configs:
       TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db
diff --git a/devtron-images.txt.source b/devtron-images.txt.source
index fb9978a085..6da21b8607 100644
--- a/devtron-images.txt.source
+++ b/devtron-images.txt.source
@@ -18,7 +18,7 @@ quay.io/devtron/dex:v2.30.2
 quay.io/devtron/git-sensor:3b3d6d0e-200-39291
 quay.io/devtron/grafana:7.3.1
 quay.io/devtron/hyperion:0874dcaf-280-39287
-quay.io/devtron/image-scanner:fbde4d5e-141-38756
+quay.io/devtron/image-scanner:3b3d6d0e-141-39295
 quay.io/devtron/inception:473deaa4-185-21582
 quay.io/devtron/k8s-sidecar:1.1.0
 quay.io/devtron/k8s-utils:tutum-curl

From 24538cd62d666323262f7a33594717e0848d5c0c Mon Sep 17 00:00:00 2001
From: systemsdt <systems@devtron.ai>
Date: Mon, 6 Jul 2026 17:27:06 +0000
Subject: [PATCH 27/34] Updated chart-sync to 3b3d6d0e-836-39296 tag in values
 file

---
 charts/devtron/devtron-bom.yaml | 2 +-
 charts/devtron/values.yaml      | 2 +-
 devtron-images.txt.source       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index fdff26988e..b14261dbbb 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -171,7 +171,7 @@ components:
     entMigratorImage: "devtron-utils:geni-v1.1.4"
   chartSync:
     registry: ""
-    image: chart-sync:fbde4d5e-836-38757
+    image: chart-sync:3b3d6d0e-836-39296
     schedule: "0 19 * * *"
     podSecurityContext:
       fsGroup: 1001
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index 6cc60a24fd..6b7fc4ac3d 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -256,7 +256,7 @@ components:
     entMigratorImage: "devtron-utils:geni-v1.1.4"
   chartSync:
     registry: ""
-    image: chart-sync:fbde4d5e-836-38757
+    image: chart-sync:3b3d6d0e-836-39296
     schedule: "0 19 * * *"
     extraConfigs: {}
     podSecurityContext:
diff --git a/devtron-images.txt.source b/devtron-images.txt.source
index 6da21b8607..8540c03839 100644
--- a/devtron-images.txt.source
+++ b/devtron-images.txt.source
@@ -7,7 +7,7 @@ quay.io/devtron/authenticator:e414faff-393-13273
 quay.io/devtron/bats:v1.4.1
 quay.io/devtron/busybox:1.31.1
 quay.io/devtron/centos-k8s-utils:latest
-quay.io/devtron/chart-sync:fbde4d5e-836-38757
+quay.io/devtron/chart-sync:3b3d6d0e-836-39296
 quay.io/devtron/ci-runner:3b3d6d0e-138-39293
 quay.io/devtron/clair:4.3.6
 quay.io/devtron/curl:7.73.0

From cac6a8820f3ec609e990d5ce3953a3d7514efd84 Mon Sep 17 00:00:00 2001
From: akshatsinha007 <akshat.sinha@devtron.ai>
Date: Tue, 7 Jul 2026 01:40:50 +0530
Subject: [PATCH 28/34] Added Proxy for Athena in devtron ingress

---
 charts/devtron/templates/devtron-ingress.yaml | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/charts/devtron/templates/devtron-ingress.yaml b/charts/devtron/templates/devtron-ingress.yaml
index f2f280f4e9..86196d5f26 100644
--- a/charts/devtron/templates/devtron-ingress.yaml
+++ b/charts/devtron/templates/devtron-ingress.yaml
@@ -34,6 +34,16 @@ spec:
           servicePort: 80
         path: /grafana
         pathType: ImplementationSpecific
+{{- if $.Values.devtronEnterprise }}
+{{- if and $.Values.devtronEnterprise.enabled $.Values.devtronEnterprise.athenaApi }}
+{{- if $.Values.devtronEnterprise.athenaApi.enabled }}
+      - backend:
+          serviceName: devtron-service
+          servicePort: 80
+        path: /proxy
+{{- end }}
+{{- end }}
+{{- end }}
   {{- if .tls }}
   tls:
 {{ toYaml .tls | nindent 4 }}
@@ -82,6 +92,19 @@ spec:
               number: 80
         path: /grafana
         pathType: {{ .pathType }}
+{{- if $.Values.devtronEnterprise }}
+{{- if and $.Values.devtronEnterprise.enabled $.Values.devtronEnterprise.athenaApi }}
+{{- if $.Values.devtronEnterprise.athenaApi.enabled }}
+      - backend:
+          service:
+            name: devtron-service
+            port:
+              number: 80
+        path: /proxy
+        pathType: {{ .pathType }}
+{{- end }}
+{{- end }}
+{{- end }}
   {{- if .tls }}
   tls:
 {{ toYaml .tls | nindent 4 }}

From e88c3594b2f056f1f3cf42fabcbeffe5c75bf6c8 Mon Sep 17 00:00:00 2001
From: akshatsinha007 <akshat.sinha@devtron.ai>
Date: Tue, 7 Jul 2026 02:37:15 +0530
Subject: [PATCH 29/34] updated the athena service images

---
 charts/devtron/devtron-bom.yaml | 4 ++--
 charts/devtron/values.yaml      | 4 ++--
 devtron-images.txt.source       | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index b14261dbbb..ba428ed030 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -289,7 +289,7 @@ devtronEnterprise:
   athenaApi:
     enabled: false
     registry: ""
-    image: ""
+    image: "athena-api:75a5ebf3-1218-39284"
     imagePullPolicy: IfNotPresent
     healthPort: "8000"
     configs:
@@ -299,7 +299,7 @@ devtronEnterprise:
     secrets: {}
   athenaMcp:
     registry: ""
-    image: ""
+    image: "athena-mcp:75a5ebf3-1219-39285"
     imagePullPolicy: IfNotPresent
     healthPort: "8000"
     configs: {}
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index 6b7fc4ac3d..b59662b57e 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -530,7 +530,7 @@ devtronEnterprise:
   athenaApi:
     enabled: false
     registry: ""
-    image: ""
+    image: "athena-api:75a5ebf3-1218-39284"
     imagePullPolicy: IfNotPresent
     healthPort: "8000"
     configs:
@@ -540,8 +540,8 @@ devtronEnterprise:
       PG_DATABASE: athena
     secrets: {}
   athenaMcp:
-    image: ""
     registry: ""
+    image: "athena-mcp:75a5ebf3-1219-39285"
     imagePullPolicy: IfNotPresent
     healthPort: "8000"
     configs: {}
diff --git a/devtron-images.txt.source b/devtron-images.txt.source
index 8540c03839..73b6331a72 100644
--- a/devtron-images.txt.source
+++ b/devtron-images.txt.source
@@ -42,3 +42,7 @@ quay.io/devtron/prometheus-nats-exporter:0.9.0
 quay.io/devtron/ubuntu-k8s-utils:latest
 quay.io/devtron/cost-sync:46ed7c67-1159-38183
 quay.io/devtron/timescaledb-ha:pg18
+quay.io/devtron/athena-mcp:75a5ebf3-1219-39285
+quay.io/devtron/athena-api:75a5ebf3-1218-39284
+quay.io/devtron/silver-surfer:e3b9a2f6-1191-38789
+

From 1ffac4160e79960743ff79dc9912c075584d5c11 Mon Sep 17 00:00:00 2001
From: akshatsinha007 <akshat.sinha@devtron.ai>
Date: Tue, 7 Jul 2026 15:37:29 +0530
Subject: [PATCH 30/34] Updated the livenessProbe and readinessProbe for athena
 services

---
 charts/devtron/templates/athena-api.yaml | 40 +++++++++++-----------
 charts/devtron/templates/athena-mcp.yaml | 42 ++++++++++++------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/charts/devtron/templates/athena-api.yaml b/charts/devtron/templates/athena-api.yaml
index 8b3ed56556..15d1d9bfeb 100644
--- a/charts/devtron/templates/athena-api.yaml
+++ b/charts/devtron/templates/athena-api.yaml
@@ -35,26 +35,6 @@ spec:
     spec:
       {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.devtronEnterprise.athenaApi.nodeSelector "tolerations" $.Values.devtronEnterprise.athenaApi.tolerations "imagePullSecrets" $.Values.devtronEnterprise.athenaApi.imagePullSecrets "global" $.Values.global) | indent 6 }}
       {{- include "common.podSecurityContext" (dict "podSecurityContext" $.Values.devtronEnterprise.athenaApi.podSecurityContext "global" $.Values.global) | indent 6 }}
-      livenessProbe:
-        failureThreshold: 3
-        httpGet:
-          path: /health
-          port: {{ $.Values.devtronEnterprise.athenaApi.healthPort}}
-          scheme: HTTP
-        initialDelaySeconds: 20
-        periodSeconds: 300
-        successThreshold: 1
-        timeoutSeconds: 5
-      readinessProbe:
-        failureThreshold: 3
-        httpGet:
-          path: /health
-          port: {{ $.Values.devtronEnterprise.athenaApi.healthPort}}
-          scheme: HTTP
-        initialDelaySeconds: 20
-        periodSeconds: 600
-        successThreshold: 1
-        timeoutSeconds: 5
       terminationGracePeriodSeconds: 30
       restartPolicy: Always
       serviceAccountName: devtron
@@ -80,6 +60,26 @@ spec:
               name: athena-api-secret
           - configMapRef:
               name: devtron-common-cm
+        livenessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /health
+            port: {{ $.Values.devtronEnterprise.athenaApi.healthPort}}
+            scheme: HTTP
+          initialDelaySeconds: 20
+          periodSeconds: 300
+          successThreshold: 1
+          timeoutSeconds: 5
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /health
+            port: {{ $.Values.devtronEnterprise.athenaApi.healthPort}}
+            scheme: HTTP
+          initialDelaySeconds: 20
+          periodSeconds: 600
+          successThreshold: 1
+          timeoutSeconds: 5
 ---
 apiVersion: v1
 data:
diff --git a/charts/devtron/templates/athena-mcp.yaml b/charts/devtron/templates/athena-mcp.yaml
index fd96d2febb..8730ca8961 100644
--- a/charts/devtron/templates/athena-mcp.yaml
+++ b/charts/devtron/templates/athena-mcp.yaml
@@ -35,27 +35,6 @@ spec:
     spec:
       {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.devtronEnterprise.athenaMcp.nodeSelector "tolerations" $.Values.devtronEnterprise.athenaMcp.tolerations "imagePullSecrets" $.Values.devtronEnterprise.athenaMcp.imagePullSecrets "global" $.Values.global) | indent 6 }}
       {{- include "common.podSecurityContext" (dict "podSecurityContext" $.Values.devtronEnterprise.athenaMcp.podSecurityContext "global" $.Values.global) | indent 6 }}
-      livenessProbe:
-        failureThreshold: 3
-        httpGet:
-          path: /health
-          port: {{ $.Values.devtronEnterprise.athenaMcp.healthPort}}
-          scheme: HTTP
-        initialDelaySeconds: 20
-        periodSeconds: 300
-        successThreshold: 1
-        timeoutSeconds: 5
-      readinessProbe:
-        failureThreshold: 3
-        httpGet:
-          path: /health
-          port: {{ $.Values.devtronEnterprise.athenaMcp.healthPort}}
-          scheme: HTTP
-        initialDelaySeconds: 20
-        periodSeconds: 600
-        successThreshold: 1
-        timeoutSeconds: 5
-      terminationGracePeriodSeconds: 30
       restartPolicy: Always
       serviceAccountName: devtron
       containers:
@@ -80,6 +59,27 @@ spec:
               name: athena-mcp-secret
           - configMapRef:
               name: devtron-common-cm
+        livenessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /health
+            port: {{ $.Values.devtronEnterprise.athenaMcp.healthPort}}
+            scheme: HTTP
+          initialDelaySeconds: 20
+          periodSeconds: 300
+          successThreshold: 1
+          timeoutSeconds: 5
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /health
+            port: {{ $.Values.devtronEnterprise.athenaMcp.healthPort}}
+            scheme: HTTP
+          initialDelaySeconds: 20
+          periodSeconds: 600
+          successThreshold: 1
+          timeoutSeconds: 5
+        terminationGracePeriodSeconds: 30
 ---
 apiVersion: v1
 data:

From c4c48758b8a20feed604839fa43bab055169b39e Mon Sep 17 00:00:00 2001
From: akshatsinha007 <akshat.sinha@devtron.ai>
Date: Tue, 7 Jul 2026 15:38:49 +0530
Subject: [PATCH 31/34] updated the ports for health check

---
 charts/devtron/devtron-bom.yaml | 4 ++--
 charts/devtron/values.yaml      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index ba428ed030..6ad62947c0 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -291,7 +291,7 @@ devtronEnterprise:
     registry: ""
     image: "athena-api:75a5ebf3-1218-39284"
     imagePullPolicy: IfNotPresent
-    healthPort: "8000"
+    healthPort: 8000
     configs:
       LLM_TEMPERATURE: "0.01"
       REDIS_URL: redis://redis.devtroncd
@@ -301,7 +301,7 @@ devtronEnterprise:
     registry: ""
     image: "athena-mcp:75a5ebf3-1219-39285"
     imagePullPolicy: IfNotPresent
-    healthPort: "8000"
+    healthPort: 8000
     configs: {}
     secrets: {}
   scoop:
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index b59662b57e..ea7fe8aea1 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -532,7 +532,7 @@ devtronEnterprise:
     registry: ""
     image: "athena-api:75a5ebf3-1218-39284"
     imagePullPolicy: IfNotPresent
-    healthPort: "8000"
+    healthPort: 8000
     configs:
       LLM_MODEL_ID: ""
       LLM_TEMPERATURE: "0.01"
@@ -543,7 +543,7 @@ devtronEnterprise:
     registry: ""
     image: "athena-mcp:75a5ebf3-1219-39285"
     imagePullPolicy: IfNotPresent
-    healthPort: "8000"
+    healthPort: 8000
     configs: {}
     secrets: {}
   scoop:

From 090c576b06beb2f50cdb81162e0e887113a6a857 Mon Sep 17 00:00:00 2001
From: akshatsinha007 <156403098+akshatsinha007@users.noreply.github.com>
Date: Tue, 7 Jul 2026 15:58:06 +0530
Subject: [PATCH 32/34] Add terminationGracePeriodSeconds to athena-mcp.yaml

---
 charts/devtron/templates/athena-mcp.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/devtron/templates/athena-mcp.yaml b/charts/devtron/templates/athena-mcp.yaml
index 8730ca8961..ab235eb6f0 100644
--- a/charts/devtron/templates/athena-mcp.yaml
+++ b/charts/devtron/templates/athena-mcp.yaml
@@ -37,6 +37,7 @@ spec:
       {{- include "common.podSecurityContext" (dict "podSecurityContext" $.Values.devtronEnterprise.athenaMcp.podSecurityContext "global" $.Values.global) | indent 6 }}
       restartPolicy: Always
       serviceAccountName: devtron
+      terminationGracePeriodSeconds: 30
       containers:
       - name: athena-mcp-server
         image: {{ include "common.image" (dict "component" $.Values.devtronEnterprise.athenaMcp "global" $.Values.global) }}
@@ -79,7 +80,6 @@ spec:
           periodSeconds: 600
           successThreshold: 1
           timeoutSeconds: 5
-        terminationGracePeriodSeconds: 30
 ---
 apiVersion: v1
 data:
@@ -101,4 +101,4 @@ metadata:
   name: athena-mcp-cm
   namespace: devtroncd
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}

From 49e2e6e6406c6bb16f79be1e5dc7c628d3e69ba6 Mon Sep 17 00:00:00 2001
From: akshatsinha007 <156403098+akshatsinha007@users.noreply.github.com>
Date: Tue, 7 Jul 2026 16:48:53 +0530
Subject: [PATCH 33/34] Remove liveness and readiness probes

Removed liveness and readiness probes from athena-mcp.yaml.
---
 charts/devtron/templates/athena-mcp.yaml | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/charts/devtron/templates/athena-mcp.yaml b/charts/devtron/templates/athena-mcp.yaml
index ab235eb6f0..2bab6277fb 100644
--- a/charts/devtron/templates/athena-mcp.yaml
+++ b/charts/devtron/templates/athena-mcp.yaml
@@ -60,26 +60,6 @@ spec:
               name: athena-mcp-secret
           - configMapRef:
               name: devtron-common-cm
-        livenessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /health
-            port: {{ $.Values.devtronEnterprise.athenaMcp.healthPort}}
-            scheme: HTTP
-          initialDelaySeconds: 20
-          periodSeconds: 300
-          successThreshold: 1
-          timeoutSeconds: 5
-        readinessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /health
-            port: {{ $.Values.devtronEnterprise.athenaMcp.healthPort}}
-            scheme: HTTP
-          initialDelaySeconds: 20
-          periodSeconds: 600
-          successThreshold: 1
-          timeoutSeconds: 5
 ---
 apiVersion: v1
 data:

From 0822e136e0d7525ce065fe532d8727a936c57f68 Mon Sep 17 00:00:00 2001
From: ReleaseBot <systems@devtron.ai>
Date: Wed, 8 Jul 2026 11:19:23 +0000
Subject: [PATCH 34/34] Updated the version in scripts

---
 .../release-notes-v2.2.0.md                    |  4 ++++
 charts/devtron/Chart.yaml                      |  4 ++--
 charts/devtron/devtron-bom.yaml                |  2 +-
 charts/devtron/values.yaml                     |  2 +-
 manifests/install/devtron-installer.yaml       |  2 +-
 manifests/installation-script                  |  2 +-
 releasenotes.md                                | 18 ++++++++++++++++++
 7 files changed, 28 insertions(+), 6 deletions(-)
 rename beta-releasenotes.md => CHANGELOG/release-notes-v2.2.0.md (97%)

diff --git a/beta-releasenotes.md b/CHANGELOG/release-notes-v2.2.0.md
similarity index 97%
rename from beta-releasenotes.md
rename to CHANGELOG/release-notes-v2.2.0.md
index e6ece1bc41..b3d6ca5077 100644
--- a/beta-releasenotes.md
+++ b/CHANGELOG/release-notes-v2.2.0.md
@@ -1,3 +1,5 @@
+## v2.2.0
+
 ## Enhancements
 - feat: add native sidecar container support (#6946)
 - feat: add env-driven timeout for buildx builder pod readiness (#6944)
@@ -12,3 +14,5 @@
 - sync: new dependabot security fixes (#6950)
 - misc: mig seq in develop (#6949)
 - sync: migration seq (#6942)
+
+
diff --git a/charts/devtron/Chart.yaml b/charts/devtron/Chart.yaml
index caaa106254..af6c8ced17 100644
--- a/charts/devtron/Chart.yaml
+++ b/charts/devtron/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: devtron-operator
-appVersion: 2.1.1
+appVersion: 2.2.0
 description: Chart to configure and install Devtron. Devtron is a Kubernetes Orchestration system.
 keywords:
   - Devtron
@@ -11,7 +11,7 @@ keywords:
   - argocd
   - Hyperion
 engine: gotpl
-version: 0.23.2
+version: 0.23.3
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:
diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index 6ad62947c0..b6b280e960 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -15,7 +15,7 @@ global:
     PG_DATABASE: orchestrator
 extraManifests: []
 installer:
-  release: "v2.1.1"
+  release: "v2.2.0"
   registry: ""
   image: "inception"
   tag: "473deaa4-185-21582"
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index ea7fe8aea1..85c462ed14 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -42,7 +42,7 @@ nfs:
 extraManifests: []
 installer:
   repo: "devtron-labs/devtron"
-  release: "v2.1.1"
+  release: "v2.2.0"
   registry: ""
   image: inception
   tag: 473deaa4-185-21582
diff --git a/manifests/install/devtron-installer.yaml b/manifests/install/devtron-installer.yaml
index c1586e124d..9703a53ffd 100644
--- a/manifests/install/devtron-installer.yaml
+++ b/manifests/install/devtron-installer.yaml
@@ -4,4 +4,4 @@ metadata:
   name: installer-devtron
   namespace: devtroncd
 spec:
-  url: https://raw.githubusercontent.com/devtron-labs/devtron/v2.1.1/manifests/installation-script
+  url: https://raw.githubusercontent.com/devtron-labs/devtron/v2.2.0/manifests/installation-script
diff --git a/manifests/installation-script b/manifests/installation-script
index a2b914b7a3..c3536b7492 100644
--- a/manifests/installation-script
+++ b/manifests/installation-script
@@ -1,4 +1,4 @@
-LTAG="v2.1.1";
+LTAG="v2.2.0";
 REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/";
 shebang = `#!/bin/bash
 `;
diff --git a/releasenotes.md b/releasenotes.md
index e69de29bb2..b3d6ca5077 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -0,0 +1,18 @@
+## v2.2.0
+
+## Enhancements
+- feat: add native sidecar container support (#6946)
+- feat: add env-driven timeout for buildx builder pod readiness (#6944)
+- feat: app filters enhancement (#6939)
+## Bugs
+- fix: new dependabot fixes (#6955)
+- fix: streamline AWS session creation and improve error handling (#6948)
+- fix: dependabot security advisory (#6945)
+## Others
+- chore: added sql migration  (#6951)
+- misc: Release candidate v0.46.0 (#6953)
+- sync: new dependabot security fixes (#6950)
+- misc: mig seq in develop (#6949)
+- sync: migration seq (#6942)
+
+