Skip to content

K
k3s
Switch branch/tag
  1. 30 May, 2018 9 commits
  3. 29 May, 2018 26 commits
  5. 28 May, 2018 5 commits
    • Nail Islamov's avatar
      Declare wait flag in way consistent with other deletion flags · 6f1b178e
      Nail Islamov authored
      6f1b178e
    • Kubernetes Submit Queue's avatar
      Merge pull request #64396 from rosti/local-loadpodfromfile · 0125edb4
      Kubernetes Submit Queue authored 
      Automatic merge from submit-queue (batch tested with PRs 64399, 64324, 64404, 64406, 64396). 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>.

kubeadm: Use loadPodSpecFromFile instead of LoadPodFromFile
Signed-off-by: 's avatarRostislav M. Georgiev <rostislavg@vmware.com>



**What this PR does / why we need it**:
Implement and use loadPodSpecFromFile which loads and returns PodSpec object
from YAML or JSON file. Use this function in the places where LoadPodFromFile
is used to load Pod object and then return the PodSpec portion of it. This
also removes the dependency on //pkg/volume/util and its dependencies (thus,
making kubeadm more lean).

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Refs kubernetes/kubeadm#839

**Special notes for your reviewer**:
/cc @kubernetes/sig-cluster-lifecycle-pr-reviews
/area kubeadm
/assign @luxas
/assign @timothysc

**Release note**:

```release-note
NONE
```
      0125edb4
    • Kubernetes Submit Queue's avatar
      Merge pull request #64406 from soltysh/issue64359 · 13f08493
      Kubernetes Submit Queue authored 
      Automatic merge from submit-queue (batch tested with PRs 64399, 64324, 64404, 64406, 64396). 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 daemonset when to getReplicasFromRuntimeObject when cleaning objects in e2e

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #64359

**Special notes for your reviewer**:
/assign @dims 

**Release note**:

```release-note
NONE
```
      13f08493
    • Kubernetes Submit Queue's avatar
      Merge pull request #64404 from soltysh/issue64340 · 83ae4147
      Kubernetes Submit Queue authored 
      Automatic merge from submit-queue (batch tested with PRs 64399, 64324, 64404, 64406, 64396). 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>.

DaemonSet internals are still in extensions

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #64384

**Special notes for your reviewer**:

/assign @jiayingz @vishh

**Release note**:

```release-note
NONE
```
      83ae4147
    • Kubernetes Submit Queue's avatar
      Merge pull request #64324 from cofyc/fix62102 · 881c3cf5
      Kubernetes Submit Queue authored 
      Automatic merge from submit-queue (batch tested with PRs 64399, 64324, 64404, 64406, 64396). 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>.

Should use `hostProcMountinfoPath` constant in nsenter_mount.go.

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

In nsenter mounter implementation, we should read mountinfo from `/rootfs/proc/1/mountinfo` instead of `/proc/self/mountinfo`.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

`/proc/self/mountinfo` will prefix `/rootfs` on mount point path, see

```
$ mkdir /mnt/test
$ mount -t tmpfs tmpfs /mnt/test/
$ docker run -it --volume=/:/rootfs:ro,rslave --net=host --pid=host --privileged=true busybox:latest cat /rootfs/proc/1/mountinfo | grep '\/mnt\/test'
442 25 0:80 / /mnt/test rw,relatime shared:70 - tmpfs tmpfs rw
$ docker run -it --volume=/:/rootfs:ro,rslave --net=host --pid=host --privileged=true busybox:latest cat /proc/self/mountinfo | grep '\/mnt\/test'
1075 985 0:80 / /rootfs/mnt/test rw,relatime master:70 - tmpfs tmpfs rw
```

**Release note**:

```release-note
NONE
```
      881c3cf5