Skip to content

Commit 6534a4b

Browse files
MiretplMiretpl
committed
Fix spellcheck & tests
1 parent 6eddcdf commit 6534a4b

3 files changed

Lines changed: 20 additions & 22 deletions

File tree

‎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,
@@ -3660,15 +3660,15 @@
36603660
"default": []
36613661
},
36623662
"retentionDays": {
3663-
"description": "Number of days to retain the logs when running the Airflow log groomer sidecar. Total retention time is retentionDays + retentionMinutes.",
3663+
"description": "Number of days to retain the logs when running the Airflow log groomer sidecar. Total retention time is ``retentionDays`` + ``retentionMinutes``.",
36643664
"type": [
36653665
"integer",
36663666
"null"
36673667
],
36683668
"default": null
36693669
},
36703670
"retentionMinutes": {
3671-
"description": "Number of minutes to retain the logs when running the Airflow log groomer sidecar. Total retention time is retentionDays + retentionMinutes.",
3671+
"description": "Number of minutes to retain the logs when running the Airflow log groomer sidecar. Total retention time is ``retentionDays`` + ``retentionMinutes``.",
36723672
"type": [
36733673
"integer",
36743674
"null"
@@ -3693,7 +3693,7 @@
36933693
"minimum": 0
36943694
},
36953695
"maxSizePercent": {
3696-
"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.",
3696+
"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.",
36973697
"type": [
36983698
"integer",
36993699
"null"
@@ -14961,12 +14961,12 @@
1496114961
]
1496214962
},
1496314963
"retentionDays": {
14964-
"description": "Number of days to retain the logs when running the Airflow log groomer sidecar. Total retention time is retentionDays + retentionMinutes.",
14964+
"description": "Number of days to retain the logs when running the Airflow log groomer sidecar. Total retention time is ``retentionDays`` + ``retentionMinutes``.",
1496514965
"type": "integer",
1496614966
"default": 15
1496714967
},
1496814968
"retentionMinutes": {
14969-
"description": "Number of minutes to retain the logs when running the Airflow log groomer sidecar. Total retention time is retentionDays + retentionMinutes.",
14969+
"description": "Number of minutes to retain the logs when running the Airflow log groomer sidecar. Total retention time is ``retentionDays`` + ``retentionMinutes``.",
1497014970
"type": "integer",
1497114971
"default": 0
1497214972
},
@@ -14982,7 +14982,7 @@
1498214982
"minimum": 0
1498314983
},
1498414984
"maxSizePercent": {
14985-
"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.",
14985+
"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.",
1498614986
"type": "integer",
1498714987
"default": 0,
1498814988
"minimum": 0,

‎chart/values.yaml‎

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

11571157
# Number of minutes to retain logs.
11581158
# This can be used for finer granularity than days.
1159-
# Total retention is retentionDays + retentionMinutes.
1159+
# Total retention is `retentionDays` + `retentionMinutes`.
11601160
# (deprecated, use `workers.celery.logGroomerSidecar.retentionMinutes` instead)
11611161
retentionMinutes: 0
11621162

@@ -1168,7 +1168,7 @@ workers:
11681168
# (deprecated, use `workers.celery.logGroomerSidecar.maxSizeBytes` instead)
11691169
maxSizeBytes: 0
11701170

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

@@ -1181,7 +1181,7 @@ workers:
11811181
# cpu: 100m
11821182
# memory: 128Mi
11831183

1184-
# Detailed default security context for logGroomerSidecar for container level
1184+
# Detailed default security context for `logGroomerSidecar` for container level
11851185
# (deprecated, use `workers.celery.logGroomerSidecar.securityContexts` instead)
11861186
securityContexts:
11871187
# (deprecated, use `workers.celery.logGroomerSidecar.securityContexts.container` instead)
@@ -1546,7 +1546,7 @@ workers:
15461546

15471547
# Number of minutes to retain logs.
15481548
# This can be used for finer granularity than days.
1549-
# Total retention is retentionDays + retentionMinutes.
1549+
# Total retention is `retentionDays` + `retentionMinutes`.
15501550
retentionMinutes: ~
15511551

15521552
# Frequency to attempt to groom logs (in minutes)
@@ -1555,7 +1555,7 @@ workers:
15551555
# Max size of logs in bytes. 0 = disabled
15561556
maxSizeBytes: ~
15571557

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

15611561
resources: {}
@@ -1566,7 +1566,7 @@ workers:
15661566
# cpu: 100m
15671567
# memory: 128Mi
15681568

1569-
# Detailed default security context for logGroomerSidecar for container level
1569+
# Detailed default security context for `logGroomerSidecar` for container level
15701570
securityContexts:
15711571
container: {}
15721572

@@ -1942,7 +1942,7 @@ scheduler:
19421942
# Max size of logs in bytes. 0 = disabled
19431943
maxSizeBytes: 0
19441944

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

19481948
resources: {}
@@ -1953,7 +1953,7 @@ scheduler:
19531953
# cpu: 100m
19541954
# memory: 128Mi
19551955

1956-
# Detailed default security context for logGroomerSidecar for container level
1956+
# Detailed default security context for `logGroomerSidecar` for container level
19571957
securityContexts:
19581958
container: {}
19591959

@@ -2876,7 +2876,7 @@ triggerer:
28762876
# cpu: 100m
28772877
# memory: 128Mi
28782878

2879-
# Detailed default security context for logGroomerSidecar for container level
2879+
# Detailed default security context for `logGroomerSidecar` for container level
28802880
securityContexts:
28812881
container: {}
28822882

‎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)