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.

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

Jump to bottom

kubeadm: Only check for well-known files in preflight #57287

Merged
merged 1 commit into from
Dec 18, 2017
Merged

kubeadm: Only check for well-known files in preflight #57287

merged 1 commit into from
Dec 18, 2017

Conversation

mattkelly
Copy link

@mattkelly mattkelly commented Dec 17, 2017 •
edited
Loading

What this PR does / why we need it:
This makes the preflight checks less heavy-handed by specifically checking for well-known files (kube-apiserver.yaml, kube-controller-manager.yaml, kube-scheduler.yaml, etcd.yaml) in /etc/kubernetes/manifests instead of simply checking for a non-empty directory.

Which issue(s) this PR fixes:
Fixes kubernetes/kubeadm#595

Special notes for your reviewer:

Release note:

Check for known manifests during preflight instead of only checking for non-empty manifests directory.

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 17, 2017
@mattkelly
Copy link
Author

/assign @luxas

@mattkelly
Copy link
Author

Testing:

Before patch where /etc/kubernetes/manifests contained a single dummy file foo:

[preflight] Some fatal errors occurred:
        [ERROR DirAvailable--etc-kubernetes-manifests]: /etc/kubernetes/manifests is not empty

After patch and after already running kubeadm init once without a kubeadm reset:

[preflight] Some fatal errors occurred:
        [ERROR FileAvailable--etc-kubernetes-manifests-kube-apiserver.yaml]: /etc/kubernetes/manifests/kube-apiserver.yaml already exists
        [ERROR FileAvailable--etc-kubernetes-manifests-kube-controller-manager.yaml]: /etc/kubernetes/manifests/kube-controller-manager.yaml already exists
        [ERROR FileAvailable--etc-kubernetes-manifests-kube-scheduler.yaml]: /etc/kubernetes/manifests/kube-scheduler.yaml already exists
        [ERROR FileAvailable--etc-kubernetes-manifests-etcd.yaml]: /etc/kubernetes/manifests/etcd.yaml already exists

@cblecker
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Dec 17, 2017
luxas
luxas approved these changes Dec 18, 2017
View reviewed changes
Copy link
Member

@luxas luxas left a comment

Choose a reason for hiding this comment

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

/lgtm

Thank you for this contribution!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 18, 2017
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: luxas, mattkelly

Associated issue: #595

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your 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 Dec 18, 2017
@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 8c8175e into kubernetes:master Dec 18, 2017
@mattkelly mattkelly mentioned this pull request Dec 19, 2017
Merged
@luxas luxas added this to the v1.9 milestone Dec 26, 2017
@luxas luxas added cherrypick-candidate kind/bug Categorizes issue or PR as related to a bug. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels Dec 26, 2017
@luxas luxas mentioned this pull request Dec 26, 2017
Closed
3 tasks
@mattkelly mattkelly mentioned this pull request Dec 26, 2017
Merged
mattkelly pushed a commit to mattkelly/kubeadm that referenced this pull request Dec 26, 2017
Update preflight check description for manifests
0b1617a 
These changes were made in kubernetes/kubernetes#57287
@mattkelly mattkelly mentioned this pull request Dec 26, 2017
Merged
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Dec 29, 2017
k8s-github-robot pushed a commit that referenced this pull request Jan 3, 2018
Merge pull request #57635 from mattkelly/automated-cherry-pick-of-#57…
f90697b 
…287-upstream-release-1.9

Automatic merge from submit-queue.

Automated cherry pick of #57287: kubeadm: Only check for well-known files in preflight

Cherry pick of #57287 on release-1.9.

#57287: kubeadm: Only check for well-known files in preflight

**Release note**:
```release-note
Check for known manifests during preflight instead of only checking for non-empty manifests directory.
```
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.9" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@mattkelly mattkelly deleted the kubeadm-preflight-check-files-not-dir branch March 1, 2018 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@luxas luxas luxas approved these changes

Assignees

@mikedanese mikedanese

@mattmoyer mattmoyer

@luxas luxas

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.9
Development

Successfully merging this pull request may close these issues.

Only check for well-known files in /etc/kubernetes/manifests, not the whole directory
8 participants
@mattkelly @cblecker @k8s-ci-robot @k8s-github-robot @k8s-cherrypick-bot @luxas @mikedanese @mattmoyer