From 8e17e55ad72f21333d11b5ea76939832c1193d3c Mon Sep 17 00:00:00 2001
From: akshatsinha007 <156403098+akshatsinha007@users.noreply.github.com>
Date: Wed, 7 May 2025 17:16:20 +0530
Subject: [PATCH 1/3] updated ucid-cm and added prehook

---
 charts/devtron/templates/configmap-secret.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/charts/devtron/templates/configmap-secret.yaml b/charts/devtron/templates/configmap-secret.yaml
index 5039d292db..aa140efdbc 100644
--- a/charts/devtron/templates/configmap-secret.yaml
+++ b/charts/devtron/templates/configmap-secret.yaml
@@ -388,4 +388,6 @@ kind: ConfigMap
 metadata:
   name: devtron-ucid
   namespace: devtroncd
+  annotations:
+    "helm.sh/hook": pre-install
 {{- end }}

From cc49a6b498bf6706b0e21cc62f325d9dbeec0c2b Mon Sep 17 00:00:00 2001
From: akshatsinha007 <156403098+akshatsinha007@users.noreply.github.com>
Date: Wed, 7 May 2025 17:16:48 +0530
Subject: [PATCH 2/3] Update 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 0c12090ba7..42647cd02b 100644
--- a/charts/devtron/Chart.yaml
+++ b/charts/devtron/Chart.yaml
@@ -11,7 +11,7 @@ keywords:
   - argocd
   - Hyperion
 engine: gotpl
-version: 0.22.91
+version: 0.22.92
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:

From 900f4344f57ca0cc58b8719c5ffacb23cc5ae3d9 Mon Sep 17 00:00:00 2001
From: akshatsinha007 <156403098+akshatsinha007@users.noreply.github.com>
Date: Thu, 8 May 2025 11:50:07 +0530
Subject: [PATCH 3/3] Update configmap-secret.yaml

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

diff --git a/charts/devtron/templates/configmap-secret.yaml b/charts/devtron/templates/configmap-secret.yaml
index aa140efdbc..04b79f4e52 100644
--- a/charts/devtron/templates/configmap-secret.yaml
+++ b/charts/devtron/templates/configmap-secret.yaml
@@ -378,12 +378,11 @@ data:
 {{- end }}
 {{- end }}
 {{- if $.Values.devtronEnterprise.enabled }}
+{{- if or $.Values.UCID $.Values.ucid }}
 ---
 apiVersion: v1
 data:
-{{- if or $.Values.UCID $.Values.ucid }}
   UCID: {{ $.Values.UCID | default $.Values.ucid }}
-{{- end }}
 kind: ConfigMap
 metadata:
   name: devtron-ucid
@@ -391,3 +390,4 @@ metadata:
   annotations:
     "helm.sh/hook": pre-install
 {{- end }}
+{{- end }}