Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pawan-59 merged 4 commits into from
Jul 3, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa06a0e
Update deployment.yaml
jatin-jangir-0220 Jul 3, 2023
740e0f6
Update deployment.yaml
jatin-jangir-0220 Jul 3, 2023
804932a
added is_default false
jatin-jangir-0220 Jul 3, 2023
9445f5a
Update 153_chart_ref_4-18.up.sql
jatin-jangir-0220 Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions scripts/devtron-reference-helm-charts/deployment-chart_4-18-0/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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}}
Expand All @@ -344,7 +341,6 @@ spec:
{{- end }}
{{- end }}
{{- end }}
{{- end }}

{{- if or $.Values.LivenessProbe.Path $.Values.LivenessProbe.command $.Values.LivenessProbe.tcp }}
livenessProbe:
Expand Down
4 changes: 0 additions & 4 deletions scripts/devtron-reference-helm-charts/reference-chart_4-18-0/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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}}
Expand All @@ -346,7 +343,6 @@ spec:
{{- end }}
{{- end }}
{{- end }}
{{- end }}

{{- if or $.Values.LivenessProbe.Path $.Values.LivenessProbe.command $.Values.LivenessProbe.tcp }}
livenessProbe:
Expand Down
3 changes: 2 additions & 1 deletion scripts/sql/152_deployment_chart_ref_4-18-0.up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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),
Expand Down
3 changes: 1 addition & 2 deletions scripts/sql/153_chart_ref_4-18.up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down