Commit Graph

27653 Commits

Author SHA1 Message Date
k8s-merge-robot
ed87db5040 Merge pull request #23437 from DirectXMan12/bug/cannot-edit-across-gv
Automatic merge from submit-queue

Make kubectl edit not convert GV on edits

Previously, kubectl edit was using a decoder to load in edits that
converted to the internal version.  It would then re-encode this
decoded value to produce a patch.  However, if you were editing
in the object in a GroupVersion that was not the internal version,
this would cause the kubectl edit command to attempt to produce
a patch which changed the GroupVersion, which would fail.

Now, we use a plain deserializer instead, so no conversion or
defaulting occurs when loading in the edited file.

Ref #23378
2016-04-15 16:32:17 -07:00
Joe Finney
009b0f051d Merge pull request #24356 from spxtr/revert-revert
Revert "Revert "Run most GCE, GKE, and Kubemark e2e jobs inside Docker""
2016-04-15 16:02:30 -07:00
k8s-merge-robot
985b5f14e2 Merge pull request #24168 from ixdy/jenkins-daily-maintenance-job
Automatic merge from submit-queue

Rename "gcloud-update" jobs to "daily-maintenace" and add Docker cleanup

I'm guessing Jenkins Job Builder won't delete the old job, and we'll need to do that manually?

@spxtr @fejta
2016-04-15 15:41:03 -07:00
k8s-merge-robot
03f48e730e Merge pull request #22810 from amygdala/cassandra2
Automatic merge from submit-queue

phase 2 of cassandra example overhaul

Here's the next iteration in overhauling this example, towards https://github.com/kubernetes/kubernetes/issues/20961.  This removes the pod adoption part, but doesn't (yet) otherwise change any of the resources used.

It also includes some README cleanup, and removes some explicit specification of labels in the rc yaml.

This PR doesn't yet add any commentary on how we're using the seed provider (re: https://github.com/kubernetes/kubernetes/issues/20961#issuecomment-190405959 etc.).  Maybe we should add that.

Also: LMK if this PR should include any changes to the links out to the docs.

cc @bgrant0607 @johndmulhausen
2016-04-15 15:41:01 -07:00
Phillip Wittrock
d37222d1d9 kubelet e2e test - format command output as string, not byte string. 2016-04-15 15:17:59 -07:00
Huamin Chen
ee9ed4dd7f enhancements to run volume e2e test:
in e2e/volumes.go: give time to allow pod cleanup and volume unmount happen before volume server exit;
skip cinder volume test if not running with openstack provider

comment on why pause before containerized server is stopped in volume e2e tests, fix #24100

updates NFS server image to 0.6, per #22529

fix persistent_volume e2e test: test cleanup doesn't expect client pod; delete PV after test

Signed-off-by: Huamin Chen <hchen@redhat.com>
2016-04-15 22:14:23 +00:00
Joe Finney
93ea0252fd Revert "Revert "Run most GCE, GKE, and Kubemark e2e jobs inside Docker""
This reverts commit b2f8b1962f.
2016-04-15 14:56:48 -07:00
k8s-merge-robot
82458d8f46 Merge pull request #24281 from ixdy/dockerized-e2e
Automatic merge from submit-queue

Set metadata.google.internal IP in dockerized e2e based on /etc/hosts

Support the metadata cacher from #24131 inside dockerized e2e runs.

cc @fejta
2016-04-15 14:48:15 -07:00
Yifan Gu
656d05c5b4 e2e: Fix 'Addon update' to support coreos distro. 2016-04-15 14:29:08 -07:00
k8s-merge-robot
61c0424b27 Merge pull request #24301 from yifan-gu/host_net
Automatic merge from submit-queue

rkt: Fix hostnetwork.

Mount hosts' /etc/hosts, /etc/resolv.conf, set host's hostname
when running the pod in the host's network.

Fix #24235 

cc @kubernetes/sig-node
2016-04-15 13:59:27 -07:00
Jimmy Jones
0521ebad41 Include easy-rsa in container to avoid it being downloaded at runtime 2016-04-15 21:36:54 +01:00
Jeff Grafton
9fa35d0bc6 Set metadata.google.internal IP in dockerized e2e based on /etc/hosts 2016-04-15 12:12:12 -07:00
k8s-merge-robot
75d9b36a2a Merge pull request #24175 from fejta/fast
Automatic merge from submit-queue

Restart job 5m after the previous failure.

If a job flakes at the beginning of it scripts, it will likely sit around doing nothing for 30m blocking the merge queue. Decreasing this to 5m.
2016-04-15 12:04:08 -07:00
k8s-merge-robot
f83c0aef4a Merge pull request #23852 from yifan-gu/previous_log
Automatic merge from submit-queue

rkt: Use rkt pod's uuid as the systemd service file's name.

Previously, the service file's name is 'k8s_${POD_UID}.service',
which means we need to `systemctl daemon-reload` if the we replace
the content of the service file (e.g. pod is restarted).

However this makes the journal in the previous pod get disconnected.

This PR solves the issue by using the unique rkt uuid as the service
file's name. After the change, the service file's name will be:
'k8s_${rkt_uuid}.service'.


Fix #23691
2016-04-15 12:04:06 -07:00
k8s-merge-robot
d34e7c3e74 Merge pull request #24342 from ihmccreery/version-guard-guestbook
Automatic merge from submit-queue

Version-guard Kubectl client Guestbook application test against deployments

Fixes #24159; related to #16040.
2016-04-15 12:04:03 -07:00
Mike Danese
c5cc0c34fb Merge pull request #24277 from ihmccreery/upgrade-timeout
Use a sane timeout for experimental upgrade jobs, and skip v1.1 tests
2016-04-15 11:40:09 -07:00
Isaac Hollander McCreery
a96bb71bc9 Version-guard Kubectl client Guestbook application test against deployments 2016-04-15 10:51:10 -07:00
Mike Danese
066e493789 Merge pull request #24336 from mikedanese/fix-the-build
fix the build
2016-04-15 10:43:30 -07:00
Phillip Wittrock
5155df0287 Don't clean up files on image-based tests since the instance will be deleted anyway and this is flaky on CoreOS. Fixed #24297 2016-04-15 10:32:26 -07:00
Mike Danese
774b6d484d fix the build 2016-04-15 10:18:58 -07:00
Joe Finney
7179296e30
Move cmd/linkcheck to test targets. 2016-04-15 09:55:04 -07:00
Clayton Coleman
f89bde1415 Add watch.Until, a conditional watch mechanism
Also add helpers for collecting the events that happen during a watch
and a helper that makes it easy to start a watch from any object with
ObjectMeta.
2016-04-15 11:49:07 -04:00
Clayton Coleman
0f95b91f96 Move /resetMetrics to DELETE /metrics
Reduces the surface area of the API server slightly and allows
downstream components to have deleteable metrics. After this change
genericapiserver will *not* have metrics unless the caller defines it
(allows different apiserver implementations to make that choice on their
own).
2016-04-15 11:44:17 -04:00
Erick Fejta
f5cc8f772b Restart job 5m after the previous failure. 2016-04-15 07:33:18 -07:00
k8s-merge-robot
ff1da7674d Merge pull request #24268 from wojtek-t/remove_old_conversions_generator
Automatic merge from submit-queue

Remove old conversion generator
2016-04-15 04:25:19 -07:00
k8s-merge-robot
d56ec66e7c Merge pull request #23667 from yifan-gu/config
Automatic merge from submit-queue

rkt: Update the directory path for saving auth config.

Since #23308 is merged, now we have more stable way to determine where to store the auth configs.

cc @yujuhong @sjpotter
2016-04-15 03:22:44 -07:00
Wojciech Tyczynski
89e860e622 Remove old conversion generator 2016-04-15 12:07:57 +02:00
Chakravarthy Nelluri
f53bc4ebe0 Flexvolume: Add support for multiple secrets 2016-04-15 02:40:38 -07:00
Marc Lough
fdf409861a Drain pods created from ReplicaSets 2016-04-15 08:51:40 +01:00
k8s-merge-robot
16e2e87a89 Merge pull request #23605 from mikedanese/pause-kube
Automatic merge from submit-queue

don't ship kube-registry-proxy and pause images in tars.

pause is built into containervm. if it's not on the machine we should just pull
it. nobody that I'm aware of uses kube-registry-proxy and it makes build/deployment
more complicated and slower.
2016-04-15 00:26:20 -07:00
k8s-merge-robot
8f3c623287 Merge pull request #23594 from Clarifai/ecr
Automatic merge from submit-queue

Allow lazy binding in credential providers; don't use it in AWS yet

This is step one for cross-region ECR support and has no visible effects yet.
I'm not crazy about the name LazyProvide. Perhaps the interface method could
remain like that and the package method of the same name could become
LateBind(). I still don't understand why the credential provider has a
DockerConfigEntry that has the same fields but is distinct from
docker.AuthConfiguration. I had to write a converter now that we do that in
more than one place.

In step two, I'll add another intermediate, lazy provider for each AWS region,
whose empty LazyAuthConfiguration will have a refresh time of months or years.
Behind the scenes, it'll use an actual ecrProvider with the usual ~12 hour
credentials, that will get created (and later refreshed) only when kubelet is
attempting to pull an image. If we simply turned ecrProvider directly into a
lazy provider, we would bypass all the caching and get new credentials for
each image pulled.
2016-04-14 23:42:07 -07:00
k8s-merge-robot
ea932c0956 Merge pull request #21224 from Random-Liu/add-unit-test-for-convert-function
Automatic merge from submit-queue

Kubelet: Better-defined Container Waiting state

For issue #20478 and #21125.

This PR corrected logic and add unit test for `ShouldContainerBeRestarted()`, cleaned up `Waiting` state related code and added unit test for `generateAPIPodStatus()`.

Fixes #20478
Fixes #17971

@yujuhong
2016-04-14 23:05:55 -07:00
k8s-merge-robot
2382fec956 Merge pull request #23894 from vishh/oom-score-adj-error
Automatic merge from submit-queue

Do not throw creation errors for containers that fail immediately after being started

Fixes (hopefully) #23607 

cc @dchen1107
2016-04-14 22:29:14 -07:00
Amy Unruh
8846b313dc phase 2 of cassandra example overhaul 2016-04-14 21:55:23 -07:00
Brian Grant
1a7ee1206a Merge pull request #24311 from johndmulhausen/patch-3
Fix for User Guide link
2016-04-14 21:49:30 -07:00
k8s-merge-robot
14d9764b77 Merge pull request #24271 from pwittrock/flaky
Automatic merge from submit-queue

Only output log files if tests fail
2016-04-14 21:42:58 -07:00
k8s-merge-robot
f4473af950 Merge pull request #22897 from nikhiljindal/swaggerObject
Automatic merge from submit-queue

Updating go-restful to generate "type":"object" instead of "type":"any" in swagger-spec (breaks kubectl 1.1)

Updating go-restful to include https://github.com/emicklei/go-restful/pull/270 (replacing type "any" by type "object". Ref https://github.com/swagger-api/swagger-codegen/issues/2347 on why we want to do that)
Ref https://github.com/kubernetes/kubernetes/issues/4700#issuecomment-194719759

First commit generated using:
```
godep restore
go get -u github.com/emicklei/go-restful
godep update github.com/emicklei/go-restful
```

Second commit generated by running 
```
./hack/update-swagger-spec.sh
```

Third commit generated by running:
```
./hack/update-api-reference-docs.sh
```

cc @kubernetes/sig-api-machinery @bgrant0607
2016-04-14 21:05:17 -07:00
Mike Danese
6d24ca487a add labels to kube component static pods 2016-04-14 19:13:18 -07:00
Yifan Gu
dfb6dd010f rkt: Fix hostnetwork.
Mount hosts' /etc/hosts, /etc/resolv.conf, set host's hostname
when running the pod in the host's network.

Besides, do not set the DNS flags when running in host's network.
2016-04-14 18:44:09 -07:00
Yifan Gu
02c0f41c88 kubenet: Load bridge netfilter module in Init().
Also set 'bridge-nf-call-iptables' to true.
2016-04-14 18:43:22 -07:00
Yifan Gu
f64c47ef80 rkt: Use rkt pod's uuid as the systemd service file's name.
Previously, the service file's name is 'k8s_${POD_UID}.service',
which means we need to `systemctl daemon-reload` if the we replace
the content of the service file (e.g. pod is restarted).

However this makes the journal in the previous pod get disconnected.

This PR solves the issue by using the unique rkt uuid as the service
file's name. After the change, the service file's name will be:
'k8s_${rkt_uuid}.service'.
2016-04-14 18:42:44 -07:00
Yifan Gu
e803f55e20 rkt: Update the directory path for saving auth config. 2016-04-14 18:40:14 -07:00
johndmulhausen
cec228ca19 Fix for User Guide link 2016-04-14 18:07:33 -07:00
nikhiljindal
6eae11e166 Updating the schema validation code 2016-04-14 18:07:00 -07:00
nikhiljindal
8bb7c80f9d updating generated api reference docs 2016-04-14 18:06:25 -07:00
nikhiljindal
b30756f428 Updating generated swagger spec 2016-04-14 18:06:24 -07:00
Daniel Smith
6320e41b4f Merge pull request #24303 from mikedanese/fix-the-build
fix the build
2016-04-14 17:22:23 -07:00
Mike Danese
845451c8af fix the build 2016-04-14 17:20:31 -07:00
Rudi C
43d2b572ef Remove dead code in kubelet.go
The only call to this was removed in #20204 by @HaiyangDING

cc @vishh
2016-04-14 20:17:22 -04:00
Random-Liu
d3d98b372b Refactor StartContainer, StopContainer and RemoveContainer. 2016-04-14 17:05:46 -07:00