Commit Graph

3040 Commits

Author SHA1 Message Date
Robert Bailey
2f65d2e617 Merge pull request #24666 from smarterclayton/munge_upstream
mungedocs should not assume upstream remote
2016-05-06 13:37:35 -07:00
Robert Bailey
828b4f8240 Merge pull request #24825 from kubernetes/revert-23157-fix-tags
Revert "Always use long format in git tag."
2016-05-06 13:34:32 -07:00
k8s-merge-robot
a64ef4d3df Merge pull request #25042 from wonderfly/trusty_beta_to_1_2
Automatic merge from submit-queue

Update e2e-runner.sh so it can fetch multiple types of Trusty images

Trusty beta images now work with k8s 1.2.

@spxtr, @andyzheng0831 Can you review this?
2016-05-06 04:51:57 -07:00
k8s-merge-robot
346ddc52c2 Merge pull request #24748 from Random-Liu/cleanup-with-new-engine-api
Automatic merge from submit-queue

Kubelet: Cleanup with new engine api

Finish step 2 of #23563

This PR:
1) Cleanup go-dockerclient reference in the code.
2) Bump up the engine-api version.
3) Cleanup the code with new engine-api.

Fixes #24076.
Fixes #23809.

/cc @yujuhong
2016-05-06 03:16:53 -07:00
Kevin
82ba4f077e implement inter pod topological affinity and anti-affinity 2016-05-06 06:46:23 +00:00
Wojciech Tyczynski
28a8a23471 Merge pull request #25240 from thockin/fix-codecgen-sort
Fix codecgen sort
2016-05-06 08:28:51 +02:00
k8s-merge-robot
9a1b2540b0 Merge pull request #24739 from zmerlynn/1000nodes
Automatic merge from submit-queue

Jenkins: Clean up even if we can't bring cluster up

We're gathering all the cluster logs, go ahead and clean up the
resources.
2016-05-05 23:16:41 -07:00
Tim Hockin
24f9beb1ff remove DBG and old code 2016-05-05 20:11:16 -07:00
Tim Hockin
457b27d25f Fix codecgen sort 2016-05-05 20:10:38 -07:00
k8s-merge-robot
ab36e0e35e Merge pull request #24710 from smarterclayton/store_proto_in_etcd
Automatic merge from submit-queue

Allow etcd to store protobuf objects

Split storage serialization from client negotiation, and allow API server to take flag controlling serialization.

TODO:

* [x] API server still doesn't start - range allocation object doesn't seem to round trip correctly to etcd
* [ ] Verify that third party resources are ignoring protobuf (add a test)
* [ ] Add integration tests that verify storage is correctly protobuf
* [ ] Add a global default for which storage format to prefer?
2016-05-05 19:00:20 -07:00
k8s-merge-robot
ba7dc5e6e6 Merge pull request #25118 from ixdy/dockerized-e2e
Automatic merge from submit-queue

Map secret files into dockerized e2e

Rather than copying the GCE and AWS private keys/credentials to each Jenkins VM, we can put them in credentials and map them through.

This is one half of the change; if the relevant environment variables are set, we'll mount the files in.

cc @fejta @rmmh @apelisse
2016-05-05 16:52:05 -07:00
Clayton Coleman
e0ebcf4216
Split the storage and negotiation parts of Codecs
The codec factory should support two distinct interfaces - negotiating
for a serializer with a client, vs reading or writing data to a storage
form (etcd, disk, etc). Make the EncodeForVersion and DecodeToVersion
methods only take Encoder and Decoder, and slight refactoring elsewhere.

In the storage factory, use a content type to control what serializer to
pick, and use the universal deserializer. This ensures that storage can
read JSON (which might be from older objects) while only writing
protobuf. Add exceptions for those resources that may not be able to
write to protobuf (specifically third party resources, but potentially
others in the future).
2016-05-05 12:08:23 -04:00
Piotr Szczesniak
caa96f4cf3 Merge pull request #25133 from jayunit100/c2fix
flake fix for cassandra:cassandra
2016-05-05 10:00:00 +02:00
jay vyas
7a824aaf49 Cassandra de-flake 2016-05-04 21:11:56 -04:00
k8s-merge-robot
83c121e921 Merge pull request #25108 from lavalamp/master
Automatic merge from submit-queue

Fix verify codecgen

Fixes #25103.
2016-05-04 14:44:16 -07:00
Daniel Smith
8ac89346db Fix codecgen
* Make verify call update
* Make update's topological sort not confused about the "io" package
2016-05-04 13:01:43 -07:00
Jeff Grafton
6a0c152476 Map secret files into dockerized e2e 2016-05-04 12:29:04 -07:00
k8s-merge-robot
bacb12a112 Merge pull request #25001 from gmarek/jenkins
Automatic merge from submit-queue

Default KUBEMARK_TEST_ARGS
2016-05-04 10:16:40 -07:00
k8s-merge-robot
1642083e60 Merge pull request #24645 from jlowdermilk/rolling-update
Automatic merge from submit-queue

kubectl rolling-update support for same image

Fixes #23497.

Enables `kubectl rolling-update --image` to the same image, adding a `--image-pull-policy` flag to remove ambiguity. This allows rolling-update to behave as an "update and/or restart" (https://github.com/kubernetes/kubernetes/issues/23497#issuecomment-212349730), or as a forced update when the same tag can mean multiple versions (e.g. `:latest`). cc @janetkuo @nikhiljindal
2016-05-04 07:24:22 -07:00
k8s-merge-robot
43b644ea6f Merge pull request #24998 from spxtr/remove-test-history
Automatic merge from submit-queue

Move test-history code into the test-infra repository.

~~Waiting on https://github.com/kubernetes/test-infra/pull/3~~ ready to go
2016-05-03 17:41:24 -07:00
k8s-merge-robot
cfd7a99fe3 Merge pull request #25046 from dlorenc/boilerplate
Automatic merge from submit-queue

Add several arguments to boilerplate.py

This commit makes the root directory and boilerplate content directory configurable.

The defaults have remained the same, so no behavior changes should be expected.

cc @eparis 
ref https://github.com/kubernetes/minikube/pull/37
2016-05-03 11:26:29 -07:00
k8s-merge-robot
f29d597d02 Merge pull request #25052 from ixdy/build-image-name-in-docker
Automatic merge from submit-queue

Use HOSTNAME in Docker build image tag hash

Fixes #24661 by including `$HOSTNAME` when generating the build image tag hash.

When running the verification checks under Docker, the `$KUBE_ROOT` will be identical across builds, so tags will collide unless we add additional uniqueness. By default, the hostname inside a Docker container is its ID, which should be unique enough for us.

I also deleted a misleading error message from the same check.

@kubernetes/sig-testing
2016-05-03 02:00:52 -07:00
dlorenc
bc9877be3e Make flags hyphenated instead of using underscores. 2016-05-02 21:45:09 -07:00
dlorenc
e1c5791631 Add several arguments to boilerplate.py
This commit makes the root directory, boilerplate content directory and
the directories to skip configurable.

The defaults have remained the same, so no behavior changes should be expected.
2016-05-02 21:45:04 -07:00
Jeff Grafton
83ac3ea0c9 Make comment explain why we need sudo
Also make the check more correct and quieter.
2016-05-02 16:25:03 -07:00
Jeff Grafton
0f041382ee Use HOSTNAME in Docker build image tag hash
Additionally, use REPO_DIR in update-generated-protobuf, since this
should be more unique (when set).
2016-05-02 16:03:27 -07:00
Joe Finney
3da5c69307 Move test history into the test-infra repo. 2016-05-02 15:31:00 -07:00
Daniel Wang
f355222060 e2e-runner.sh: Ability to fetch multiple types of Trusty images 2016-05-02 15:20:19 -07:00
Joe Finney
60d50d7253 Update Jenkins README to point to test-infra. 2016-05-02 13:43:35 -07:00
Joe Finney
df832d15ce Remove Jenkins Job Builder scripts and configs. 2016-05-02 13:43:35 -07:00
k8s-merge-robot
708c1a5c95 Merge pull request #24636 from ixdy/dockerized-e2e
Automatic merge from submit-queue

Run Kubemark builds inside Docker

Since Docker-in-Docker is tricky to get right (esp. wrt volume mounts), I'm only enabling it when necessary for a build (e.g. for kubemark).

cc @spxtr @fejta @wojtek-t
2016-05-02 13:16:18 -07:00
k8s-merge-robot
f500194d92 Merge pull request #23673 from metral/multiple-resources
Automatic merge from submit-queue

allow kubectl subcmds to process multiple resources

~~autoscale, expose & patch~~ Many kubectl subcommands were limited to processing one resource at a time.

This PR allows those subcommands to process multiple resources.

This PR is in reference to https://github.com/kubernetes/kubernetes/pull/23116#issuecomment-202360784 by @deads2k
2016-05-02 07:09:44 -07:00
k8s-merge-robot
c6157a2356 Merge pull request #24266 from spxtr/1.6.1
Automatic merge from submit-queue

Up to go 1.6.2 for build and test.

~~1.6.1 contains some security fixes. 1.6.2 should be out soon.~~ 1.6.2 is out :D

Images aren't pushed yet.
2016-05-02 05:23:16 -07:00
k8s-merge-robot
66730c53c5 Merge pull request #24445 from vishh/framework-node-e2e
Automatic merge from submit-queue

Framework support for node e2e.

This should let us port existing e2e tests to the node e2e suite, if the tests are node specific.
2016-05-02 02:17:48 -07:00
k8s-merge-robot
8fba6de835 Merge pull request #24117 from XiaoningDing/federation-client
Automatic merge from submit-queue

Federation client for cluster

generate v1alpha1 and unversioned client for federation/clusters

#23653, requires #23847, #23998

@nikhiljindal @quinton-hoole @caesarxuchao
2016-05-02 01:41:08 -07:00
Mike Metral
999c8e211e allow kubectl subcmds to process multiple resources
- use resource.Visit() to recursively process resources, as well as, aggregate
errors where possible
2016-05-01 20:27:37 -07:00
gmarek
07f1b2f4c5 Default KUBEMARK_TEST_ARGS 2016-04-30 01:33:10 +02:00
Vishnu kannan
fa476b8044 Framework support for node e2e.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-04-29 15:37:35 -07:00
Random-Liu
3876972d3f Clean up go-dockerclient reference. 2016-04-29 13:32:19 -07:00
Joe Finney
4c298678af Remove metadata-cache. 2016-04-29 11:50:55 -07:00
k8s-merge-robot
11298d02e0 Merge pull request #24455 from hongchaodeng/fl
Automatic merge from submit-queue

Provide flags to use etcd3 backed storage

ref: #24405

What's in this PR?
- Add a new flag "storage-backend" to choose "etcd2" or "etcd3". By default (i.e. empty), it's "etcd2".
- Take out etcd config code into a standalone package and let it create etcd2 or etcd3 storage backend given user input.
2016-04-29 08:49:04 -07:00
k8s-merge-robot
f1fca6fd9d Merge pull request #24969 from gmarek/jenkins
Automatic merge from submit-queue

Fix zone in kubemark-100
2016-04-29 03:08:34 -07:00
gmarek
f53ba39a7a Fix zone in kubemark-100 2016-04-29 10:43:11 +02:00
k8s-merge-robot
b16fb60c87 Merge pull request #24956 from fejta/own
Automatic merge from submit-queue

Create OWNERS for jenkins data

Assigne jenkins changes to more precise owners.
2016-04-28 23:17:59 -07:00
Erick Fejta
d8456690c0 Create OWNERS for jenkins data 2016-04-28 18:03:11 -07:00
jianhuiz
d169fa6864 generate v1alpha and unversioned clientset for federation/clusters 2016-04-28 16:27:22 -07:00
k8s-merge-robot
5fc5967059 Merge pull request #24941 from gmarek/jenkins
Automatic merge from submit-queue

Move kubemark-100 to us-central
2016-04-28 12:33:29 -07:00
Jeff Grafton
03934a9081 Enable docker-in-docker and run Kubemark tests in dockerized-e2e. 2016-04-28 11:53:49 -07:00
Jeff Grafton
0db145c15d Support docker-in-docker in containerized e2e when needed. 2016-04-28 11:52:47 -07:00
gmarek
89c39bc3eb Move kubemark-100 to us-central 2016-04-28 20:11:28 +02:00