Skip to content

Add workeer log-groomer-sidecar enable option in helm chart #27178

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
potiuk merged 1 commit into from
Nov 13, 2022
Merged

Add workeer log-groomer-sidecar enable option in helm chart #27178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion chart/templates/workers/worker-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ spec:
{{- if and (.Values.dags.gitSync.enabled) (not .Values.dags.persistence.enabled) }}
{{- include "git_sync_container" . | indent 8 }}
{{- end }}
{{- if $persistence }}
{{- if and $persistence .Values.workers.logGroomerSidecar.enabled }}
- name: worker-log-groomer
image: {{ template "airflow_image" . }}
imagePullPolicy: {{ .Values.images.airflow.pullPolicy }}
Expand Down
5 changes: 5 additions & 0 deletions chart/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,6 +1561,11 @@
"type": "object",
"additionalProperties": false,
"properties": {
"enabled": {
"description": "Whether to deploy the Airflow worker log groomer sidecar.",
"type": "boolean",
"default": true
},
"command": {
"description": "Command to use when running the Airflow workers log groomer sidecar (templated).",
"type": [
Expand Down
2 changes: 2 additions & 0 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,8 @@ workers:
labels: {}

logGroomerSidecar:
# Whether to deploy the Airflow worker log groomer sidecar.
enabled: true
# Command to use when running the Airflow worker log groomer sidecar (templated).
command: ~
# Args to use when running the Airflow worker log groomer sidecar (templated).
Expand Down
17 changes: 17 additions & 0 deletions tests/charts/test_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,23 @@ def test_command_and_args_overrides_are_templated(self):
assert ["release-name"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
assert ["Helm"] == jmespath.search("spec.template.spec.containers[0].args", docs[0])

def test_log_groomer_collector_default_enabled(self):
docs = render_chart(show_only=["templates/workers/worker-deployment.yaml"])
assert 2 == len(jmespath.search("spec.template.spec.containers", docs[0]))
assert "worker-log-groomer" in [
c["name"] for c in jmespath.search("spec.template.spec.containers", docs[0])
]

def test_log_groomer_collector_can_be_disabled(self):
docs = render_chart(
values={"workers": {"logGroomerSidecar": {"enabled": False}}},
show_only=["templates/workers/worker-deployment.yaml"],
)
assert 1 == len(jmespath.search("spec.template.spec.containers", docs[0]))
assert "worker-log-groomer" not in [
c["name"] for c in jmespath.search("spec.template.spec.containers", docs[0])
]

def test_log_groomer_default_command_and_args(self):
docs = render_chart(show_only=["templates/workers/worker-deployment.yaml"])

Expand Down