Skip to content

Commit f6d39c3

Browse files
MiretplMiretpl
committed
Fix spellcheck & tests
1 parent ed109dd commit f6d39c3

File tree

3 files changed

+20
-22
lines changed

3 files changed

+20
-22
lines changed

‎chart/values.schema.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2471,12 +2471,12 @@
24712471
]
24722472
},
24732473
"retentionDays": {
2474-
"description": "Number of days to retain the logs when running the Airflow log groomer sidecar (deprecated, use ``workers.celery.logGroomerSidecar.retentionDays`` instead). Total retention time is retentionDays + retentionMinutes.",
2474+
"description": "Number of days to retain the logs when running the Airflow log groomer sidecar (deprecated, use ``workers.celery.logGroomerSidecar.retentionDays`` instead). Total retention time is ``retentionDays`` + ``retentionMinutes``.",
24752475
"type": "integer",
24762476
"default": 15
24772477
},
24782478
"retentionMinutes": {
2479-
"description": "Number of minutes to retain the logs when running the Airflow log groomer sidecar (deprecated, use ``workers.celery.logGroomerSidecar.retentionMinutes`` instead). Total retention time is retentionDays + retentionMinutes.",
2479+
"description": "Number of minutes to retain the logs when running the Airflow log groomer sidecar (deprecated, use ``workers.celery.logGroomerSidecar.retentionMinutes`` instead). Total retention time is ``retentionDays`` + ``retentionMinutes``.",
24802480
"type": "integer",
24812481
"default": 0
24822482
},
@@ -2492,7 +2492,7 @@
24922492
"minimum": 0
24932493
},
24942494
"maxSizePercent": {
2495-
"description": "Max size of logs as a percentage of total disk space (deprecated, use ``workers.celery.logGroomerSidecar.maxSizePercent`` instead). When exceeded, the log groomer reduces retention until size is under limit. 0 = disabled. Ignored if maxSizeBytes is set.",
2495+
"description": "Max size of logs as a percentage of total disk space (deprecated, use ``workers.celery.logGroomerSidecar.maxSizePercent`` instead). When exceeded, the log groomer reduces retention until size is under limit. 0 = disabled. Ignored if ``maxSizeBytes`` is set.",
24962496
"type": "integer",
24972497
"default": 0,
24982498
"minimum": 0,
@@ -3684,15 +3684,15 @@
36843684
"default": []
36853685
},
36863686
"retentionDays": {
3687-
"description": "Number of days to retain the logs when running the Airflow log groomer sidecar. Total retention time is retentionDays + retentionMinutes.",
3687+
"description": "Number of days to retain the logs when running the Airflow log groomer sidecar. Total retention time is ``retentionDays`` + ``retentionMinutes``.",
36883688
"type": [
36893689
"integer",
36903690
"null"
36913691
],
36923692
"default": null
36933693
},
36943694
"retentionMinutes": {
3695-
"description": "Number of minutes to retain the logs when running the Airflow log groomer sidecar. Total retention time is retentionDays + retentionMinutes.",
3695+
"description": "Number of minutes to retain the logs when running the Airflow log groomer sidecar. Total retention time is ``retentionDays`` + ``retentionMinutes``.",
36963696
"type": [
36973697
"integer",
36983698
"null"
@@ -3717,7 +3717,7 @@
37173717
"minimum": 0
37183718
},
37193719
"maxSizePercent": {
3720-
"description": "Max size of logs as a percentage of total disk space. When exceeded, the log groomer reduces retention until size is under limit. 0 = disabled. Ignored if maxSizeBytes is set.",
3720+
"description": "Max size of logs as a percentage of total disk space. When exceeded, the log groomer reduces retention until size is under limit. 0 = disabled. Ignored if ``maxSizeBytes`` is set.",
37213721
"type": [
37223722
"integer",
37233723
"null"
@@ -15001,12 +15001,12 @@
1500115001
]
1500215002
},
1500315003
"retentionDays": {
15004-
"description": "Number of days to retain the logs when running the Airflow log groomer sidecar. Total retention time is retentionDays + retentionMinutes.",
15004+
"description": "Number of days to retain the logs when running the Airflow log groomer sidecar. Total retention time is ``retentionDays`` + ``retentionMinutes``.",
1500515005
"type": "integer",
1500615006
"default": 15
1500715007
},
1500815008
"retentionMinutes": {
15009-
"description": "Number of minutes to retain the logs when running the Airflow log groomer sidecar. Total retention time is retentionDays + retentionMinutes.",
15009+
"description": "Number of minutes to retain the logs when running the Airflow log groomer sidecar. Total retention time is ``retentionDays`` + ``retentionMinutes``.",
1501015010
"type": "integer",
1501115011
"default": 0
1501215012
},
@@ -15022,7 +15022,7 @@
1502215022
"minimum": 0
1502315023
},
1502415024
"maxSizePercent": {
15025-
"description": "Max size of logs as a percentage of total disk space. When exceeded, the log groomer reduces retention until size is under limit. 0 = disabled. Ignored if maxSizeBytes is set.",
15025+
"description": "Max size of logs as a percentage of total disk space. When exceeded, the log groomer reduces retention until size is under limit. 0 = disabled. Ignored if ``maxSizeBytes`` is set.",
1502615026
"type": "integer",
1502715027
"default": 0,
1502815028
"minimum": 0,

‎chart/values.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,7 +1162,7 @@ workers:
11621162

11631163
# Number of minutes to retain logs.
11641164
# This can be used for finer granularity than days.
1165-
# Total retention is retentionDays + retentionMinutes.
1165+
# Total retention is `retentionDays` + `retentionMinutes`.
11661166
# (deprecated, use `workers.celery.logGroomerSidecar.retentionMinutes` instead)
11671167
retentionMinutes: 0
11681168

@@ -1174,7 +1174,7 @@ workers:
11741174
# (deprecated, use `workers.celery.logGroomerSidecar.maxSizeBytes` instead)
11751175
maxSizeBytes: 0
11761176

1177-
# Max size of logs as a percent of disk usage. 0 = disabled. Ignored if maxSizeBytes is set.
1177+
# Max size of logs as a percent of disk usage. 0 = disabled. Ignored if `maxSizeBytes` is set.
11781178
# (deprecated, use `workers.celery.logGroomerSidecar.maxSizePercent` instead)
11791179
maxSizePercent: 0
11801180

@@ -1187,7 +1187,7 @@ workers:
11871187
# cpu: 100m
11881188
# memory: 128Mi
11891189

1190-
# Detailed default security context for logGroomerSidecar for container level
1190+
# Detailed default security context for `logGroomerSidecar` for container level
11911191
# (deprecated, use `workers.celery.logGroomerSidecar.securityContexts` instead)
11921192
securityContexts:
11931193
# (deprecated, use `workers.celery.logGroomerSidecar.securityContexts.container` instead)
@@ -1566,7 +1566,7 @@ workers:
15661566

15671567
# Number of minutes to retain logs.
15681568
# This can be used for finer granularity than days.
1569-
# Total retention is retentionDays + retentionMinutes.
1569+
# Total retention is `retentionDays` + `retentionMinutes`.
15701570
retentionMinutes: ~
15711571

15721572
# Frequency to attempt to groom logs (in minutes)
@@ -1575,7 +1575,7 @@ workers:
15751575
# Max size of logs in bytes. 0 = disabled
15761576
maxSizeBytes: ~
15771577

1578-
# Max size of logs as a percent of disk usage. 0 = disabled. Ignored if maxSizeBytes is set.
1578+
# Max size of logs as a percent of disk usage. 0 = disabled. Ignored if `maxSizeBytes` is set.
15791579
maxSizePercent: ~
15801580

15811581
resources: {}
@@ -1586,7 +1586,7 @@ workers:
15861586
# cpu: 100m
15871587
# memory: 128Mi
15881588

1589-
# Detailed default security context for logGroomerSidecar for container level
1589+
# Detailed default security context for `logGroomerSidecar` for container level
15901590
securityContexts:
15911591
container: {}
15921592

@@ -1973,7 +1973,7 @@ scheduler:
19731973
# Max size of logs in bytes. 0 = disabled
19741974
maxSizeBytes: 0
19751975

1976-
# Max size of logs as a percent of disk usage. 0 = disabled. Ignored if maxSizeBytes is set.
1976+
# Max size of logs as a percent of disk usage. 0 = disabled. Ignored if `maxSizeBytes` is set.
19771977
maxSizePercent: 0
19781978

19791979
resources: {}
@@ -1984,7 +1984,7 @@ scheduler:
19841984
# cpu: 100m
19851985
# memory: 128Mi
19861986

1987-
# Detailed default security context for logGroomerSidecar for container level
1987+
# Detailed default security context for `logGroomerSidecar` for container level
19881988
securityContexts:
19891989
container: {}
19901990

@@ -2907,7 +2907,7 @@ triggerer:
29072907
# cpu: 100m
29082908
# memory: 128Mi
29092909

2910-
# Detailed default security context for logGroomerSidecar for container level
2910+
# Detailed default security context for `logGroomerSidecar` for container level
29112911
securityContexts:
29122912
container: {}
29132913

‎helm-tests/tests/chart_utils/log_groomer.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,9 @@ def test_log_groomer_collector_default_retention_days(self):
9393

9494
docs = render_chart(values=values, show_only=self.get_show_only())
9595

96-
assert (
97-
jmespath.search("spec.template.spec.containers[1].env[0].name", docs[0])
98-
== "AIRFLOW__LOG_RETENTION_DAYS"
96+
assert {"name": "AIRFLOW__LOG_RETENTION_DAYS", "value": "15"} in jmespath.search(
97+
"spec.template.spec.containers[1].env", docs[0]
9998
)
100-
assert jmespath.search("spec.template.spec.containers[1].env[0].value", docs[0]) == "15"
10199

102100
def test_log_groomer_collector_custom_env(self):
103101
env = [

0 commit comments

Comments
 (0)