Skip to content

Commit 8e8a314

Browse files
committed
Reduce gracefulShutdownTimeout to 10s in test specs to ensure pods terminate leaving sufficient time for PVC finaliser cleanup
1 parent 50b6b10 commit 8e8a314

7 files changed

Lines changed: 21 additions & 5 deletions

File tree

tests/templates/kuttl/ldap/60-install-airflow-cluster.yaml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ commands:
8585
roleConfig:
8686
listenerClass: external-unstable
8787
config:
88+
gracefulShutdownTimeout: 10s
8889
logging:
8990
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
9091
roleGroups:
@@ -102,6 +103,7 @@ commands:
102103
host: airflow-redis-master
103104
credentialsSecretName: airflow-redis-credentials
104105
config:
106+
gracefulShutdownTimeout: 10s
105107
logging:
106108
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
107109
roleGroups:

tests/templates/kuttl/logging/41-install-airflow-cluster.yaml.j2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ spec:
103103
roleConfig:
104104
listenerClass: external-unstable
105105
config:
106+
gracefulShutdownTimeout: 10s
106107
resources:
107108
cpu:
108109
min: 1000m
@@ -172,6 +173,7 @@ spec:
172173
host: airflow-redis-master
173174
credentialsSecretName: airflow-redis-credentials
174175
config:
176+
gracefulShutdownTimeout: 10s
175177
resources:
176178
cpu:
177179
min: 1000m
@@ -225,6 +227,7 @@ spec:
225227
{% elif test_scenario['values']['executor'] == 'kubernetes' %}
226228
kubernetesExecutors:
227229
config:
230+
gracefulShutdownTimeout: 10s
228231
resources:
229232
cpu:
230233
min: 50m
@@ -264,6 +267,7 @@ spec:
264267
{% endif %}
265268
schedulers:
266269
config:
270+
gracefulShutdownTimeout: 10s
267271
resources:
268272
cpu:
269273
min: 1000m

tests/templates/kuttl/mount-dags-configmap/30-install-airflow-cluster.yaml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ spec:
105105
roleConfig:
106106
listenerClass: external-unstable
107107
config:
108+
gracefulShutdownTimeout: 10s
108109
logging:
109110
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
110111
roleGroups:
@@ -124,6 +125,7 @@ spec:
124125
host: airflow-redis-master
125126
credentialsSecretName: airflow-redis-credentials
126127
config:
128+
gracefulShutdownTimeout: 10s
127129
logging:
128130
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
129131
roleGroups:

tests/templates/kuttl/mount-dags-gitsync/30-install-airflow-cluster.yaml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ spec:
123123
roleConfig:
124124
listenerClass: external-unstable
125125
config:
126+
gracefulShutdownTimeout: 10s
126127
logging:
127128
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
128129
roleGroups:
@@ -142,6 +143,7 @@ spec:
142143
host: airflow-redis-master
143144
credentialsSecretName: airflow-redis-credentials
144145
config:
146+
gracefulShutdownTimeout: 10s
145147
logging:
146148
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
147149
roleGroups:

tests/templates/kuttl/smoke/40-assert.yaml.j2

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ metadata:
2222
spec:
2323
template:
2424
spec:
25-
terminationGracePeriodSeconds: 120
25+
terminationGracePeriodSeconds: 10
2626
status:
2727
readyReplicas: 1
2828
replicas: 1
@@ -37,7 +37,7 @@ metadata:
3737
spec:
3838
template:
3939
spec:
40-
terminationGracePeriodSeconds: 300
40+
terminationGracePeriodSeconds: 10
4141
status:
4242
readyReplicas: 2
4343
replicas: 2
@@ -52,7 +52,7 @@ metadata:
5252
spec:
5353
template:
5454
spec:
55-
terminationGracePeriodSeconds: 120
55+
terminationGracePeriodSeconds: 10
5656
status:
5757
readyReplicas: 1
5858
replicas: 1
@@ -66,7 +66,7 @@ metadata:
6666
spec:
6767
template:
6868
spec:
69-
terminationGracePeriodSeconds: 120
69+
terminationGracePeriodSeconds: 10
7070
status:
7171
readyReplicas: 1
7272
replicas: 1
@@ -80,7 +80,7 @@ metadata:
8080
spec:
8181
template:
8282
spec:
83-
terminationGracePeriodSeconds: 120
83+
terminationGracePeriodSeconds: 10
8484
status:
8585
readyReplicas: 1
8686
replicas: 1

tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ spec:
6262
roleConfig:
6363
listenerClass: external-unstable
6464
config:
65+
gracefulShutdownTimeout: 10s
6566
logging:
6667
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
6768
configOverrides:
@@ -90,6 +91,7 @@ spec:
9091
host: airflow-redis-master
9192
credentialsSecretName: airflow-redis-credentials
9293
config:
94+
gracefulShutdownTimeout: 10s
9395
logging:
9496
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
9597
roleGroups:
@@ -103,20 +105,23 @@ spec:
103105
{% endif %}
104106
schedulers:
105107
config:
108+
gracefulShutdownTimeout: 10s
106109
logging:
107110
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
108111
roleGroups:
109112
default:
110113
replicas: 1
111114
dagProcessors:
112115
config:
116+
gracefulShutdownTimeout: 10s
113117
logging:
114118
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
115119
roleGroups:
116120
default:
117121
replicas: 1
118122
triggerers:
119123
config:
124+
gracefulShutdownTimeout: 10s
120125
logging:
121126
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
122127
roleGroups:

tests/templates/kuttl/versioning/30-install-airflow-cluster.yaml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ spec:
7070
roleConfig:
7171
listenerClass: external-unstable
7272
config:
73+
gracefulShutdownTimeout: 10s
7374
logging:
7475
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
7576
roleGroups:

0 commit comments

Comments
 (0)