Skip to content

Commit aeab9ab

Browse files
authored
Merge pull request #17678 from jan-kantert/patch-1
Prevent failing DNS requests on shutdown of CoreDNS pods
2 parents 3f370db + 1ee2e94 commit aeab9ab

File tree

165 files changed

+399
-165
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+399
-165
lines changed

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
version: 9.99.0
1414
- id: k8s-1.12
1515
manifest: coredns.addons.k8s.io/k8s-1.12.yaml
16-
manifestHash: 3091c744b367fba44c4be785383ba55dfaf6367ef8fb6d0c8dde4c8afb89be93
16+
manifestHash: d2a2ea738b9570195f5f5b99c5f5262a9d8573957a0bbbd9b93bf57509ce30a4
1717
name: coredns.addons.k8s.io
1818
selector:
1919
k8s-addon: coredns.addons.k8s.io

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ data:
6969
.:53 {
7070
errors
7171
health {
72-
lameduck 5s
72+
lameduck 10s
7373
}
7474
ready
7575
kubernetes cluster.local. in-addr.arpa ip6.arpa {
@@ -152,10 +152,13 @@ spec:
152152
name: metrics
153153
protocol: TCP
154154
readinessProbe:
155+
failureThreshold: 1
155156
httpGet:
156157
path: /ready
157158
port: 8181
158159
scheme: HTTP
160+
periodSeconds: 5
161+
timeoutSeconds: 5
159162
resources:
160163
limits:
161164
memory: 170Mi

tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
version: 9.99.0
1414
- id: k8s-1.12
1515
manifest: coredns.addons.k8s.io/k8s-1.12.yaml
16-
manifestHash: 3091c744b367fba44c4be785383ba55dfaf6367ef8fb6d0c8dde4c8afb89be93
16+
manifestHash: d2a2ea738b9570195f5f5b99c5f5262a9d8573957a0bbbd9b93bf57509ce30a4
1717
name: coredns.addons.k8s.io
1818
selector:
1919
k8s-addon: coredns.addons.k8s.io

tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ data:
6969
.:53 {
7070
errors
7171
health {
72-
lameduck 5s
72+
lameduck 10s
7373
}
7474
ready
7575
kubernetes cluster.local. in-addr.arpa ip6.arpa {
@@ -152,10 +152,13 @@ spec:
152152
name: metrics
153153
protocol: TCP
154154
readinessProbe:
155+
failureThreshold: 1
155156
httpGet:
156157
path: /ready
157158
port: 8181
158159
scheme: HTTP
160+
periodSeconds: 5
161+
timeoutSeconds: 5
159162
resources:
160163
limits:
161164
memory: 170Mi

tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
version: 9.99.0
1414
- id: k8s-1.12
1515
manifest: coredns.addons.k8s.io/k8s-1.12.yaml
16-
manifestHash: 3091c744b367fba44c4be785383ba55dfaf6367ef8fb6d0c8dde4c8afb89be93
16+
manifestHash: d2a2ea738b9570195f5f5b99c5f5262a9d8573957a0bbbd9b93bf57509ce30a4
1717
name: coredns.addons.k8s.io
1818
selector:
1919
k8s-addon: coredns.addons.k8s.io

tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ data:
6969
.:53 {
7070
errors
7171
health {
72-
lameduck 5s
72+
lameduck 10s
7373
}
7474
ready
7575
kubernetes cluster.local. in-addr.arpa ip6.arpa {
@@ -152,10 +152,13 @@ spec:
152152
name: metrics
153153
protocol: TCP
154154
readinessProbe:
155+
failureThreshold: 1
155156
httpGet:
156157
path: /ready
157158
port: 8181
158159
scheme: HTTP
160+
periodSeconds: 5
161+
timeoutSeconds: 5
159162
resources:
160163
limits:
161164
memory: 170Mi

tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
version: 9.99.0
1414
- id: k8s-1.12
1515
manifest: coredns.addons.k8s.io/k8s-1.12.yaml
16-
manifestHash: 3091c744b367fba44c4be785383ba55dfaf6367ef8fb6d0c8dde4c8afb89be93
16+
manifestHash: d2a2ea738b9570195f5f5b99c5f5262a9d8573957a0bbbd9b93bf57509ce30a4
1717
name: coredns.addons.k8s.io
1818
selector:
1919
k8s-addon: coredns.addons.k8s.io

tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ data:
6969
.:53 {
7070
errors
7171
health {
72-
lameduck 5s
72+
lameduck 10s
7373
}
7474
ready
7575
kubernetes cluster.local. in-addr.arpa ip6.arpa {
@@ -152,10 +152,13 @@ spec:
152152
name: metrics
153153
protocol: TCP
154154
readinessProbe:
155+
failureThreshold: 1
155156
httpGet:
156157
path: /ready
157158
port: 8181
158159
scheme: HTTP
160+
periodSeconds: 5
161+
timeoutSeconds: 5
159162
resources:
160163
limits:
161164
memory: 170Mi

tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
version: 9.99.0
1414
- id: k8s-1.12
1515
manifest: coredns.addons.k8s.io/k8s-1.12.yaml
16-
manifestHash: 3091c744b367fba44c4be785383ba55dfaf6367ef8fb6d0c8dde4c8afb89be93
16+
manifestHash: d2a2ea738b9570195f5f5b99c5f5262a9d8573957a0bbbd9b93bf57509ce30a4
1717
name: coredns.addons.k8s.io
1818
selector:
1919
k8s-addon: coredns.addons.k8s.io

tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ data:
6969
.:53 {
7070
errors
7171
health {
72-
lameduck 5s
72+
lameduck 10s
7373
}
7474
ready
7575
kubernetes cluster.local. in-addr.arpa ip6.arpa {
@@ -152,10 +152,13 @@ spec:
152152
name: metrics
153153
protocol: TCP
154154
readinessProbe:
155+
failureThreshold: 1
155156
httpGet:
156157
path: /ready
157158
port: 8181
158159
scheme: HTTP
160+
periodSeconds: 5
161+
timeoutSeconds: 5
159162
resources:
160163
limits:
161164
memory: 170Mi

0 commit comments

Comments
 (0)