Skip to content

create gitSync container in dag-processor pod when gitSync is enabled regardless the persistence conf #27124

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

Closed
hussein-awala wants to merge 3 commits into from
Closed

create gitSync container in dag-processor pod when gitSync is enabled regardless the persistence conf #27124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd7e2c5
create gitSync container and init container in dag-processor pod when…
hussein-awala Oct 18, 2022
01f1585
update helm unit tests
hussein-awala Oct 19, 2022
c1a9cf8
Merge branch 'main' into fix/gitSync_with_persistence
hussein-awala Oct 21, 2022
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: 2 additions & 2 deletions chart/templates/dag-processor/dag-processor-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ spec:
{{ tpl (toYaml .Values.dagProcessor.waitForMigrations.env) $ | indent 12 }}
{{- end }}
{{- end }}
{{- if and (.Values.dags.gitSync.enabled) (not .Values.dags.persistence.enabled) }}
{{- if .Values.dags.gitSync.enabled }}
{{- include "git_sync_container" (dict "Values" .Values "is_init" "true") | nindent 8 }}
{{- end }}
{{- if .Values.dagProcessor.extraInitContainers }}
Expand Down Expand Up @@ -186,7 +186,7 @@ spec:
{{- else }}
{{- include "dag_processor_liveness_check_command" . | nindent 16 }}
{{- end }}
{{- if and (.Values.dags.gitSync.enabled) (not .Values.dags.persistence.enabled) }}
{{- if .Values.dags.gitSync.enabled }}
{{- include "git_sync_container" . | indent 8 }}
{{- end }}
{{- if .Values.dagProcessor.extraContainers }}
Expand Down
10 changes: 4 additions & 6 deletions tests/charts/test_dag_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ def test_dags_gitsync_sidecar_and_init_container(self):
c["name"] for c in jmespath.search("spec.template.spec.initContainers", docs[0])
]

def test_dags_gitsync_with_persistence_no_sidecar_or_init_container(self):
def test_dags_gitsync_with_persistence_sidecar_and_init_container(self):
docs = render_chart(
values={
"dagProcessor": {"enabled": True},
Expand All @@ -490,10 +490,8 @@ def test_dags_gitsync_with_persistence_no_sidecar_or_init_container(self):
show_only=["templates/dag-processor/dag-processor-deployment.yaml"],
)

# No gitsync sidecar or init container
assert "git-sync" not in [
c["name"] for c in jmespath.search("spec.template.spec.containers", docs[0])
]
assert "git-sync-init" not in [
# gitsync sidecar and init container should be created
assert "git-sync" in [c["name"] for c in jmespath.search("spec.template.spec.containers", docs[0])]
assert "git-sync-init" in [
c["name"] for c in jmespath.search("spec.template.spec.initContainers", docs[0])
]