Skip to content

Bug 1884053: Configure CoreDNS to shut down gracefully #205

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
openshift-merge-robot merged 1 commit into from
Oct 24, 2020
Merged

Bug 1884053: Configure CoreDNS to shut down gracefully #205

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
5 changes: 3 additions & 2 deletions assets/dns/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ spec:
protocol: TCP
readinessProbe:
httpGet:
path: /health
port: 8080
path: /ready
port: 8181
scheme: HTTP
initialDelaySeconds: 10
periodSeconds: 10
Expand Down Expand Up @@ -152,6 +152,7 @@ spec:
dnsPolicy: Default
nodeSelector:
kubernetes.io/os: linux
terminationGracePeriodSeconds: 120
volumes:
- name: config-volume
configMap:
Expand Down
8 changes: 4 additions & 4 deletions pkg/manifests/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion pkg/operator/controller/controller_dns_configmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ var corefileTemplate = template.Must(template.New("Corefile").Parse(`{{range .Se
{{end -}}
.:5353 {
errors
health
health {
lameduck 60s
Copy link
Contributor

@sgreene570 sgreene570 Oct 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not trying to suggest that 60s is an unacceptable lameduck period, but I'm curious to hear how you arrived at this value.

Copy link
Contributor Author

@Miciah Miciah Oct 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The readiness probe has a period of 10 seconds and a failure threshold of 3, so I figure it might take 30 seconds for the kubelet to recognize that the pod is unresponsive, and I doubled that for good measure.

}
ready
kubernetes {{.ClusterDomain}} in-addr.arpa ip6.arpa {
pods insecure
upstream
Expand Down
5 changes: 4 additions & 1 deletion pkg/operator/controller/controller_dns_configmap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ bar.com:5353 example.com:5353 {
}
.:5353 {
errors
health
health {
lameduck 60s
}
ready
kubernetes cluster.local in-addr.arpa ip6.arpa {
pods insecure
upstream
Expand Down
Loading