Skip to content

Commit

Permalink
Merge pull request #49410 from jasonbrooks/patch-1
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 65449, 65373, 49410). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

add kernel config locations for fedora and atomic

**What this PR does / why we need it**:

* Fedora stores its kernel configs in /usr/lib/modules/$(uname -r)/config
* Fedora/CentOS/RHEL atomic hosts use /usr/lib/ostree-boot/$(uname -r), though this location is deprecated
* The lack of these locations in the validator is causing kubeadm to hang on "failed to parse kernel config" in its preflight checking on fedora and atomic host

**Special notes for your reviewer**:

**Release note**:

```release-note
```
  • Loading branch information
Kubernetes Submit Queue committed Jun 26, 2018
2 parents 3d69499 + fa03b1e commit 76b4699
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions test/e2e_node/system/kernel_validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@ func (k *KernelValidator) getKernelConfigReader() (io.Reader, error) {
"/boot/config-" + k.kernelRelease,
"/usr/src/linux-" + k.kernelRelease + "/.config",
"/usr/src/linux/.config",
"/usr/lib/modules/" + k.kernelRelease + "/config",
"/usr/lib/ostree-boot/config-" + k.kernelRelease,
}
configsModule := "configs"
modprobeCmd := "modprobe"
Expand Down

0 comments on commit 76b4699

Please sign in to comment.