fix: removed extra condition in ref-chart 4.18 (#3586)

* Fixed for envFrom condition

* Made deployment chart as default chart.

Author: jatin-jangir-0220

scripts/devtron-reference-helm-charts/deployment-chart_4-18-0/templates/deployment.yaml

@@ -318,7 +318,6 @@ spec:
           envFrom:
           {{- if .Values.ConfigMaps.enabled }}
           {{- range .Values.ConfigMaps.maps }}
-          {{- if and .name .type .external }}
           {{- if eq .type "environment" }}
           - configMapRef:
               {{- if eq .external true }}
@@ -329,10 +328,8 @@ spec:
           {{- end }}
           {{- end }}
           {{- end }}
-          {{- end }}
           {{- if .Values.ConfigSecrets.enabled }}
           {{- range .Values.ConfigSecrets.secrets }}
-          {{- if and .name .type .external }}
           {{- if eq .type "environment" }}
           - secretRef:
               {{if eq .external true}}
@@ -344,7 +341,6 @@ spec:
           {{- end }}
           {{- end }}
           {{- end }}
-          {{- end }}
 
 {{- if or $.Values.LivenessProbe.Path $.Values.LivenessProbe.command $.Values.LivenessProbe.tcp }}
           livenessProbe:

scripts/devtron-reference-helm-charts/reference-chart_4-18-0/templates/deployment.yaml

@@ -320,7 +320,6 @@ spec:
           envFrom:
           {{- if .Values.ConfigMaps.enabled }}
           {{- range .Values.ConfigMaps.maps }}
-          {{- if and .name .type .external }}
           {{- if eq .type "environment" }}
           - configMapRef:
               {{- if eq .external true }}
@@ -331,10 +330,8 @@ spec:
           {{- end }}
           {{- end }}
           {{- end }}
-          {{- end }}
           {{- if .Values.ConfigSecrets.enabled }}
           {{- range .Values.ConfigSecrets.secrets }}
-          {{- if and .name .type .external }}
           {{- if eq .type "environment" }}
           - secretRef:
               {{if eq .external true}}
@@ -346,7 +343,6 @@ spec:
           {{- end }}
           {{- end }}
           {{- end }}
-          {{- end }}
 
 {{- if or $.Values.LivenessProbe.Path $.Values.LivenessProbe.command $.Values.LivenessProbe.tcp }}
           livenessProbe:

scripts/sql/152_deployment_chart_ref_4-18-0.up.sql

@@ -1,5 +1,6 @@
+UPDATE chart_ref SET is_default=false;
 INSERT INTO "public"."chart_ref" ("name","location", "version", "deployment_strategy_path","is_default", "active", "created_on", "created_by", "updated_on", "updated_by") VALUES
-     ('Deployment','deployment-chart_4-18-0', '4.18.0','pipeline-values.yaml','f', 't', 'now()', 1, 'now()', 1);
+     ('Deployment','deployment-chart_4-18-0', '4.18.0','pipeline-values.yaml','t', 't', 'now()', 1, 'now()', 1);
 
 INSERT INTO global_strategy_metadata_chart_ref_mapping ("global_strategy_metadata_id", "chart_ref_id", "active", "created_on", "created_by", "updated_on", "updated_by","default")
 VALUES (1,(select id from chart_ref where version='4.18.0' and name='Deployment'), true, now(), 1, now(), 1,true),

scripts/sql/153_chart_ref_4-18.up.sql

@@ -1,6 +1,5 @@
-UPDATE chart_ref SET is_default=false;
 INSERT INTO "public"."chart_ref" ("location", "version","deployment_strategy_path", "is_default", "active", "created_on", "created_by", "updated_on", "updated_by") VALUES
-    ('reference-chart_4-18-0', '4.18.0','pipeline-values.yaml', 't', 't', 'now()', 1, 'now()', 1);
+    ('reference-chart_4-18-0', '4.18.0','pipeline-values.yaml', 'f', 't', 'now()', 1, 'now()', 1);
 
 
 INSERT INTO global_strategy_metadata_chart_ref_mapping ("global_strategy_metadata_id", "chart_ref_id", "active", "created_on", "created_by", "updated_on", "updated_by","default")