Skip to content
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.

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

add workaround for klog/coredns crash issue #85212

Merged
merged 1 commit into from
Nov 26, 2019

Conversation

chrisohaver
Copy link
Contributor

What type of PR is this?

/kind bug

What this PR does / why we need it:

Adding a /tmp volume mount resolves the issue in CoreDNS 1.3.1 where CoreDNS will crash when the Kubernetes API shuts down.

This is the same fix as #82128, which was merged into the 1.14 branch. CoreDNS 1.3.1 is installed by kubeadm/kubeup in K8s 1.14 and 1.15, so the fix should be in 1.15 too.

Fixes #85205

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:


@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. release-note-none Denotes a PR that doesn't merit a release note. labels Nov 13, 2019
@k8s-ci-robot k8s-ci-robot added this to the v1.15 milestone Nov 13, 2019
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Nov 13, 2019
@k8s-ci-robot k8s-ci-robot added area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Nov 13, 2019
@chrisohaver
Copy link
Contributor Author

/cc @rajansandeep

@chrisohaver
Copy link
Contributor Author

/retest

@@ -129,6 +129,8 @@ spec:
- name: config-volume
mountPath: /etc/coredns
readOnly: true
- name: tmp
mountPath: /tmp
Copy link
Contributor

Choose a reason for hiding this comment

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

Extra indent needs to be fixed.

- name: tmp
  mountPath: /tmp

@@ -163,6 +165,8 @@ spec:
readOnlyRootFilesystem: true
dnsPolicy: Default
volumes:
- name: tmp
emptyDir: {}
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here as well, extra indent

- name: tmp
  emptyDir: {}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks - same copy paste error in the other files too.
And there was also a tab that snuck into manifests.go.

@rajansandeep
Copy link
Contributor

/kind bug
/priority important-soon

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Nov 13, 2019
Signed-off-by: Chris O'Haver <cohaver@infoblox.com>
@rajansandeep
Copy link
Contributor

/lgtm
Thank you @chrisohaver
/assign @neolit123 @MrHohn
cc @kubernetes/patch-release-team

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 13, 2019
@neolit123
Copy link
Member

/approve
for kubeadm

@neolit123
Copy link
Member

thanks @chrisohaver
ping @kubernetes/patch-release-team

Copy link
Member

@MrHohn MrHohn left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrisohaver, MrHohn, neolit123

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 19, 2019
@drpaneas
Copy link

Thanks for the PR. This fixes the issue indeed.

@blurpy
Copy link

blurpy commented Nov 26, 2019

Is there anything blocking merge of this? Really hoping to see this fix in the next patch release.

@dims
Copy link
Member

dims commented Nov 26, 2019

/assign @tpepper

needs sign off from the patch release team

Copy link
Member

@dougm dougm left a comment

Choose a reason for hiding this comment

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

The change lgtm, was it not possible to use the automated cherry pick (cherry_pick_pull.sh) for this one?

@tpepper
Copy link
Member

tpepper commented Nov 26, 2019

The change lgtm, was it not possible to use the automated cherry pick (cherry_pick_pull.sh) for this one?

See also https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/cherry-picks.md

It's not necessary to re-do this via the cherrypick automation, but just want to FYI in the event in the future you have a choice between using the automation versus manual.

@dougm
Copy link
Member

dougm commented Nov 26, 2019

@tpepper yes, the manual pick looks correct now, agreed no need for re-do. In general though, automated cherry-pick should be preferred when there are no merge conflicts. Helps avoid the manual errors that happened here and git tooling plays better when the original commit hash is maintained.

@dougm dougm added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Nov 26, 2019
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Nov 26, 2019
@k8s-ci-robot k8s-ci-robot merged commit 61f02c8 into kubernetes:release-1.15 Nov 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants