Commit Graph

37813 Commits

Author SHA1 Message Date
Anirudh
b5d9f2f336 Always run the podGC controller. 2016-10-24 17:15:39 -07:00
Kubernetes Submit Queue
03c69e114f Merge pull request #35270 from errordeveloper/bump-default-version-in-kubeadm
Automatic merge from submit-queue

Bump kubeadm to use v1.4.4 by default

**Release note**:

```release-note
NONE
```
2016-10-24 16:17:53 -07:00
Kubernetes Submit Queue
dfe801de10 Merge pull request #35127 from pmorie/selinux-overhaul
Automatic merge from submit-queue

Amendments to SELinux enhancement proposal

Makes some changes to the proposal from #33951 based on some further research.
2016-10-24 14:23:09 -07:00
Kubernetes Submit Queue
4fbbc746a0 Merge pull request #35161 from mtaufen/mike-klet-cmount-node-e2e
Automatic merge from submit-queue

e2e node plumbing and bundling for GCI mounter

**Note:** The code in this PR only bundles the mounter and modifies `--mounter-path` if it can find `cluster/gce/gci/mounter` in the K8s source dir when building the test bundle.

This bundles the mounter script for GCI with the node e2e tests and allows the `--mounter-path` to be passed to the Kubelet via the node test framework. The node test runner will detect when we are running on a remote GCI node and add the appropriate `--mounter-path` to the `testArgs`. 

It also includes a simple node test that mounts a tmpfs volume. This will exercise the Kubelet's mounter code path. 

**ITEM OF NOTE:** To get the k8s root dir (in order to copy the mount script into the tarball), I changed `getK8sRootDir` -> `GetK8sRootDir` in `test/e2e_node/build/build.go`. Based on the comment above that function (and the fact that it was private to begin with), I'm not sure this is the best way to do things:
```
// TODO: Dedup / merge this with comparable utilities in e2e/util.go
```
On the other hand, the `e2e/util.go` file mentioned in that comment doesn't exist anymore. This should be resolved before this PR is merged.
2016-10-24 14:22:57 -07:00
Kubernetes Submit Queue
a457cf49f4 Merge pull request #35440 from smarterclayton/clarify_compat
Automatic merge from submit-queue

Clarify backwards and forwards compatibility in docs

We weren't necessarily clear that we consider both required.

@eparis @kubernetes/api-review-team @bgrant0607

This came up during a discussion of changing an API and I thought it was important to clarify.
2016-10-24 13:38:55 -07:00
Kubernetes Submit Queue
4f072f7a06 Merge pull request #35401 from Random-Liu/add-containervm-cri-test
Automatic merge from submit-queue

CRI: Add cri test on containervm.

As is discussed with @yujuhong, we need to validate cri on containervm.

@yujuhong @feiskyer 
/cc @kubernetes/sig-node
2016-10-24 13:38:48 -07:00
Kubernetes Submit Queue
1569a8b04f Merge pull request #35322 from deads2k/controller-14-panic
Automatic merge from submit-queue

prevent panic if resourceversion checked early

Found panic while trying to use this in a separate API server.
2016-10-24 13:38:39 -07:00
Kubernetes Submit Queue
bedb4f368f Merge pull request #35018 from Random-Liu/add-kuberuntime-unit-test
Automatic merge from submit-queue

CRI: Refactor kuberuntime unit test

Based on https://github.com/kubernetes/kubernetes/pull/34858

This PR:
1) Refactor the fake runtime service and some kuberuntime unit test.
2) Add better garbage collection unit test.
3) Fix init container unit test which isn't testing correctly. Some other unit tests may also need to be fixed.
4) Add pod log directory garbage collection unit test.

@feiskyer @yujuhong 
/cc @kubernetes/sig-node
2016-10-24 13:38:29 -07:00
Kubernetes Submit Queue
3b9593e281 Merge pull request #35241 from nikhiljindal/secretFede2e
Automatic merge from submit-queue

Fixing a typo in federated secrets test

Realized that our secret e2e test was not running due to a typo in my last PR :)

cc @kubernetes/sig-cluster-federation
2016-10-24 13:38:18 -07:00
Kubernetes Submit Queue
9e50b284af Merge pull request #35435 from Crassirostris/grafana-usage-update
Automatic merge from submit-queue

Update grafana in kubernetes to version 3.1.1

Fix #33775

```release-note
Update grafana version used by default in kubernetes to 3.1.1
```

@piosz
2016-10-24 13:38:07 -07:00
Kubernetes Submit Queue
c3d104a38f Merge pull request #35365 from vmware/fix-vm-name-resolv.kerneltime
Automatic merge from submit-queue

vSphere Kube-up: resolve vm-names on all nodes.

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**:
This addresses the #35364

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #
fixes #35364
**Special notes for your reviewer**:
Will cherry pick to release-1.4

```release-note
vSphere Kube-up: resolve vm-names on all nodes
```
2016-10-24 13:37:57 -07:00
Anirudh Ramanathan
e1170f3cfa Merge pull request #35456 from deads2k/f
fix kubectl e2e test to avoid alpha versions unless needed
2016-10-24 12:57:29 -07:00
deads2k
fde2fedfa6 fix kubectl e2e test to avoid alpha versions unless needed 2016-10-24 14:39:55 -04:00
Clayton Coleman
d2ea4d5168
Clarify backwards and forwards compatibility in docs
We weren't necessarily clear that we consider both required.
2016-10-24 12:04:39 -04:00
Mik Vyatskov
bb4ba53de2 Update grafana in kubernetes to version 3.1.1 2016-10-24 16:46:30 +02:00
Vish Kannan
a8db72c4a3 Do not enable the new mounter on GCI nodes 2016-10-24 05:50:24 -07:00
Vish Kannan
d5b1b4087e Fix path to gci mounter in release.sh 2016-10-24 05:50:24 -07:00
Michael Taufen
c339c97583 Simple mount test 2016-10-24 05:50:24 -07:00
Michael Taufen
dba917c5b7 Include mount command in Kubelet mounter output 2016-10-24 05:50:24 -07:00
Michael Taufen
f819cada9c Add a bare-bones level of indirection for GCI mounter
This is the bare bones scaffolding from @vishh's PR #34787
2016-10-24 05:50:24 -07:00
Michael Taufen
6fdb20480f Bundle GCI mounter w/ node tests and plumb --mounter-path through test args to the Kubelet for node tests 2016-10-24 05:50:24 -07:00
Kubernetes Submit Queue
33ebe1f18b Merge pull request #34905 from ingvagabund/client-to-clientset
Automatic merge from submit-queue

Replace client with clientset

Replace client with clientset in some places

Fixes: #34637
2016-10-24 05:38:43 -07:00
deads2k
fd65bc8fff prevent panic if resourceversion checked early 2016-10-24 08:25:11 -04:00
Kubernetes Submit Queue
c615e094b8 Merge pull request #34988 from mwielgus/cm-fed-apiserver
Automatic merge from submit-queue

Add configmaps to federation apiserver

cc: @quinton-hoole @nikhiljindal
2016-10-24 04:12:41 -07:00
Kubernetes Submit Queue
2ac72013e0 Merge pull request #35411 from gmarek/slice
Automatic merge from submit-queue

Change a type of collection of strategies for NodePreparer
2016-10-24 03:32:02 -07:00
Marcin Wielgus
545cfb1a6f Add configmaps to federation apiserver 2016-10-24 12:09:28 +02:00
gmarek
aeba0f1dc4 Change a type of collection of strategies for NodePreparer 2016-10-24 11:47:36 +02:00
Kubernetes Submit Queue
40b66e178b Merge pull request #35184 from gmarek/density
Automatic merge from submit-queue

Use TestNodePreparer in Density test

Depends on #35129
2016-10-24 02:26:46 -07:00
Kubernetes Submit Queue
ffdfe9fa9b Merge pull request #35119 from errordeveloper/tidy-up-kubeadm
Automatic merge from submit-queue

Start tidying kubeadm up

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

This PR addresses https://github.com/kubernetes/kubernetes/pull/33262#discussion_r80337511.

**Release note**:
```release-note
NONE
```
2016-10-24 02:26:36 -07:00
gmarek
4b21b71612 Use TestNodePreparer in Density test 2016-10-24 10:19:27 +02:00
Kubernetes Submit Queue
3c84164bdf Merge pull request #33347 from justinsb/fix_32900
Automatic merge from submit-queue

bootstrap: Start hostNetwork pods even if network plugin not ready
2016-10-24 01:14:06 -07:00
Random-Liu
0655ae56bb Add pod log garbage collection unit test. 2016-10-24 00:03:34 -07:00
Random Liu
e87fa5e0ff * Refactor kuberuntime unit test
* Add gc unit test
* Fix init container unit test
2016-10-24 00:03:34 -07:00
Kubernetes Submit Queue
37dc74fa7c Merge pull request #34858 from Random-Liu/symlink-docker-log
Automatic merge from submit-queue

CRI: Symlink docker logs to CRI defined log path.

This PR symlink docker logs to the CRI defined log path.

I manually test myself, and it works. We still need some more unit test and a node e2e test.

@resouer is working on a node e2e test https://github.com/kubernetes/kubernetes/issues/34661.
For the unit test, the current `MakeFakePodSandbox` and `MakeFakeContainer` is not enough for unit test, because I need to create multiple instances for one container and sandbox to test garbage collection.

I'll send a separate PR to refactor the unit test framework in kuberuntime and finish the unit test.

@yujuhong @feiskyer 
/cc @kubernetes/sig-node
2016-10-23 20:40:44 -07:00
Random-Liu
3922dd6667 Add cri test on containervm. 2016-10-23 19:43:57 -07:00
Random Liu
fad4672e72 Add legacy container log location support. 2016-10-23 19:08:47 -07:00
Random-Liu
121a91eb12 Symlink docker logs to CRI defined log path. 2016-10-23 19:08:47 -07:00
Kubernetes Submit Queue
a7db9bccb5 Merge pull request #35332 from apprenda/kubeadm-unit-tests-pkg-images
Automatic merge from submit-queue

kubeadm: added unit tests for app/images pkg

Added unit tests for kubeadm/app/images package testing functionality of images.go.

This PR is part of the ongoing effort to add tests (#35025)

/cc @pires @jbeda
2016-10-23 16:21:37 -07:00
Kubernetes Submit Queue
fe76a864cf Merge pull request #34760 from bowei/boilerplate
Automatic merge from submit-queue

Add verbose mode to boilerplate

hack/verify-boilerplate.sh -v will now print out why the file does
not match along with a diff if possible.
2016-10-23 14:13:03 -07:00
Jan Chaloupka
4fde09d308 Replace client with clientset in code 2016-10-23 22:00:35 +02:00
Kubernetes Submit Queue
931f0df641 Merge pull request #35263 from mfanjie/fix-fed-e2e
Automatic merge from submit-queue

add required fields to test service

fix #35247
2016-10-23 05:24:36 -07:00
Kubernetes Submit Queue
432bbb5d5a Merge pull request #35246 from bowei/kubedns-logging
Automatic merge from submit-queue

Refactor some functions in kube-dns to reduce surface area

- Moves federation query path out to its own method
- Creates dns/util and moves some trivial methods to that package

This is just moving of code.
2016-10-22 23:15:25 -07:00
Bowei Du
65966995e9 Update linted_packages 2016-10-22 21:40:08 -07:00
Bowei Du
a6550b332e Add verbose mode to boilerplate
hack/verify-boilerplate.sh -v will now print out why the file does
not match along with a diff if possible.

Note: boilerplate.py now has a unit test that is run along with
hack/verify-boilerplate.sh.
2016-10-22 21:40:08 -07:00
Kubernetes Submit Queue
373be74d75 Merge pull request #35384 from mikedanese/disable
Automatic merge from submit-queue

disable bazel build

until we figure out what to do with mac
2016-10-22 18:01:00 -07:00
Kubernetes Submit Queue
1bd46e5a4e Merge pull request #35265 from redhatlinux10/master-patch-optimise-kubeadm-join-args-generation
Automatic merge from submit-queue

enhance join arguments generation logic using template

**What this PR does / why we need it**:
this PR enhances kubeadm join arguments generation logic using template, this makes code more readable and adding arguments more  easier.

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

**Special notes for your reviewer**:

**Release note**:
<!--  Steps to write your release note:
1. Use the release-note-* labels to set the release note state (if you have access) 
2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. 
-->
```release-note
```

Signed-off-by: 欧阳钦华10079130 <ouyang.qinhua@zte.com.cn>
2016-10-22 17:15:59 -07:00
Kubernetes Submit Queue
8b85b9ea47 Merge pull request #35375 from mikedanese/uncompiling
Automatic merge from submit-queue

e2e: delete cleanup main that isn't compiling
2016-10-22 16:26:57 -07:00
Mike Danese
ee15c80de2 disable bazel build 2016-10-22 15:50:06 -07:00
欧阳钦华10079130
8bbeae02d3 enhance join arguments generation logic using template
Signed-off-by: 欧阳钦华10079130 <ouyang.qinhua@zte.com.cn>

change JoinArgsData to joinArgsData, improve template readability

Signed-off-by: redhatlinux10 <ouyang.qinhua@zte.com.cn>

fix extra = type

Signed-off-by: redhatlinux10 <ouyang.qinhua@zte.com.cn>
2016-10-23 06:38:14 +08:00
Kubernetes Submit Queue
081ee2d5ad Merge pull request #34090 from mwielgus/designdoc-rs
Automatic merge from submit-queue

Federated replica set design doc

cc: @quinton-hoole @kubernetes/sig-cluster-federation
2016-10-22 14:55:29 -07:00