Skip to content

Commit aebf9e0

Browse files
fix: Disable postgres-clean-job when the disablePostgresForEventbus option is enabled (#420)
1 parent 7f9ad76 commit aebf9e0

2 files changed

Lines changed: 1 addition & 7 deletions

File tree

charts/codefresh/templates/legacy/postgres-clean-job.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{{- $nodeSelector := .Values.postgresqlCleanJob.nodeSelector | default dict }}
99
{{- $globalNodeSelector := .Values.global.nodeSelector | default dict }}
1010
{{- $allNodeSelector := mergeOverwrite $globalNodeSelector $nodeSelector }}
11-
{{- if and .Values.postgresqlCleanJob.enabled }}
11+
{{- if and .Values.postgresqlCleanJob.enabled (ne .Values.global.disablePostgresForEventbus "true") }}
1212
---
1313
apiVersion: batch/v1
1414
kind: CronJob

charts/codefresh/tests/private-registry/other_templates_test.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ templates:
77
- hooks/post-upgrade/update-system-re.yaml
88
- hooks/pre-upgrade/set-mongodb-compat-version.yaml
99
- hooks/pre-upgrade/delete-consul-svc-job.yaml
10-
- legacy/postgres-clean-job.yaml
1110
tests:
1211
- it: "(Other templates) should test image private registry prefix"
1312
values:
@@ -33,11 +32,6 @@ tests:
3332
path: spec.template.spec.containers[0].image
3433
pattern: ^myregistry.io/.*$
3534
template: hooks/post-upgrade/update-system-re.yaml
36-
# postgres-clean-job template
37-
- matchRegex:
38-
path: spec.jobTemplate.spec.template.spec.containers[0].image
39-
pattern: ^myregistry.io/.*$
40-
template: legacy/postgres-clean-job.yaml
4135
# set-mongodb-compact template
4236
- matchRegex:
4337
path: spec.template.spec.containers[0].image

0 commit comments

Comments
 (0)