Commit Graph

38510 Commits

Author SHA1 Message Date
Kubernetes Submit Queue
175954fb12 Merge pull request #35090 from YuPengZTE/devConntrack
Automatic merge from submit-queue

In error, the first letter should be lowcase

**What this PR does / why we need it**:
Fix the typo of the first letter in error

**Special notes for your reviewer**:
Reference here: https://github.com/golang/go/wiki/CodeReviewComments#error-strings

Signed-off-by: YuPengZTE yu.peng36@zte.com.cn
2016-11-03 02:47:11 -07:00
Kubernetes Submit Queue
606a2dd020 Merge pull request #36090 from wojtek-t/fix_migration_collisions
Automatic merge from submit-queue

Fix collisions between different etcds during migration.

Ref #20504
2016-11-03 02:47:03 -07:00
Kubernetes Submit Queue
e817594648 Merge pull request #35731 from janetkuo/statefulset-v1beta1
Automatic merge from submit-queue

Move Statefulset (previously PetSet) to v1beta1

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

**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**: depends on #35663 (PetSet rename)
cc @erictune @foxish @kubernetes/sig-apps 

**Release note**:

``` release-note
v1beta1/StatefulSet replaces v1alpha1/PetSet.
```
2016-11-03 02:46:57 -07:00
Jan Safranek
8876ff8901 Fix typo in local-up-cluster
Use curly braces instead of round ones for bash variable expansion. The
script complains about unknown ROOT_CA_FILE when running with
KUBE_ENABLE_CLUSTER_DNS=true.
2016-11-03 10:28:22 +01:00
Kubernetes Submit Queue
8c67d08e3a Merge pull request #36125 from kubernetes/typofixgodepdoc
Automatic merge from submit-queue

Fix typo in docs/devel/godep.md
2016-11-03 02:09:05 -07:00
Kubernetes Submit Queue
5bca864d20 Merge pull request #36119 from rmmh/godep-restore
Automatic merge from submit-queue

Retry "godep restore" once in verify-dockerized.sh

This should fix #36110. The current flake rate is 0.5%, so with the
unrealistic assumption of uncorrelated flakes, a single retry will bring
it down to <0.01% flake rate.
2016-11-03 02:08:58 -07:00
Kubernetes Submit Queue
d34c02f11a Merge pull request #36093 from thockin/scary-warning-again
Automatic merge from submit-queue

Remove a few versioned-warnings that snuck in

Some pending PRs still have this in them.
2016-11-03 02:08:38 -07:00
Kubernetes Submit Queue
695cbde84f Merge pull request #36089 from mikedanese/fix-mac
Automatic merge from submit-queue

fix verify-bazel.sh on mac and windows

mac bash doesn't like |& because mac bash is really old. the formating of wc
is also slightly different then on linux.


```console
$ # on linux
$ echo -n | wc -l
0
$ # on mac
$ echo -n | wc -l
       0
```
2016-11-03 02:08:30 -07:00
Kubernetes Submit Queue
c6028b547c Merge pull request #36097 from foxish/fix-e2e-petset
Automatic merge from submit-queue

Moving annotation to the PodTemplateSpec

**What this PR does / why we need it**: Fixes broken tests.

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

**Special notes for your reviewer**: 
Tested locally.

```release-note
NONE
```

cc @kubernetes/sig-apps
2016-11-03 02:08:23 -07:00
Kubernetes Submit Queue
2f84a7c8d2 Merge pull request #35594 from madhusudancs/federation-kubefed-init-00
Automatic merge from submit-queue

[Federation][init] Implement `kubefed init` command that performs federation control plane bootstrap.

Please review only the last commit here. This is based on PR #35593 which will be reviewed independently.

I am intentionally not including the unit tests in this PR to better distribute and parallelize reviews. This PR is already big.

I will add a release note separately for this entire feature, so please don't worry too much about the release note here in the PR.

Design Doc: PR #34484

cc @kubernetes/sig-cluster-federation @quinton-hoole @nikhiljindal
2016-11-03 02:08:14 -07:00
gmarek
3971553298 Scheduler Reduce function can use nodeNameToNodeInfo map 2016-11-03 10:07:05 +01:00
Saad Ali
7a49b0eb77 Merge pull request #36139 from saad-ali/fixGoDeps6
Move godeps to version v74 instead of v73
2016-11-03 01:04:31 -07:00
saadali
62ee8b9d49 Move godeps to version v74 instead of v73 2016-11-03 00:43:06 -07:00
Saad Ali
a6bea3d79b Merge pull request #36138 from saad-ali/fixGoDeps5
Ensure verify-godep passes godep to godep-save
2016-11-02 23:52:43 -07:00
saadali
9e9a66ed22 Ensure verify-godep passes godep to godep-save 2016-11-02 23:49:30 -07:00
Saad Ali
63afad0d4e Merge pull request #36132 from saad-ali/fixGoDeps4
Fix godep to v73 in verify-godeps
2016-11-02 21:51:13 -07:00
saadali
87636fdd78 Fix godep to v73 in verify-godeps 2016-11-02 21:08:26 -07:00
Saad Ali
b8a5e7a81d Merge pull request #36131 from kubernetes/revert-36124-fixGoDeps2
Revert "Add missing vendor files to make godeps happy"
2016-11-02 20:56:44 -07:00
Saad Ali
d41b3b0929 Revert "Add missing vendor files to make godeps happy" 2016-11-02 20:56:06 -07:00
Madhusudan.C.S
b8109eae5b [Federation][init-02] Stop passing command factory to the init command.
Init command completely relies on the host factory, so it is unnecessary
to pass the default command factory to the init command.
2016-11-02 19:28:17 -07:00
Madhusudan.C.S
331ef53b69 [Federation][init-01] Add unit tests for kubefed init's certificate generator. 2016-11-02 19:27:39 -07:00
Saad Ali
3fe2de05ac Merge pull request #36124 from saad-ali/fixGoDeps2
Add missing vendor files to make godeps happy
2016-11-02 19:27:33 -07:00
Saad Ali
fd80fd2e88 Fix typo in docs/devel/godep.md 2016-11-02 19:07:35 -07:00
saadali
e9afbd5cdf Add missing vendor files to make godeps happy 2016-11-02 18:55:10 -07:00
Ryan Hitchman
bfae674093 Retry "godep restore" once in verify-dockerized.sh
This should fix #36110. The current flake rate is 0.5%, so with the
unrealistic assumption of uncorrelated flakes, a single retry will bring
it down to <0.01% flake rate.
2016-11-02 17:14:08 -07:00
Saad Ali
d7b6245ab0 Merge pull request #36114 from saad-ali/fixGoDeps
Hard code godep version to v74
2016-11-02 16:54:57 -07:00
saadali
683ea197be Hard code godep version to v74
See issue #36111
2016-11-02 16:33:53 -07:00
Ryan Hitchman
57a152ca40 Disable the test-owners verify step until the merge conflicts are resolved.
Fixes #35850.

GitHub's merging doesn't support .gitattributes-- I verified this with
support. There may be a workaround with line padding or making the bot
do merges on its own, which is beneficial for custom merge conflict
resolution in general.
2016-11-02 15:39:06 -07:00
Vishnu Kannan
40fc804831 Enable containerized storage plugins mounter on GCI
This reverts commit 765f7b9406.
2016-11-02 15:18:09 -07:00
Vishnu Kannan
414e4ae549 Revert "Adding a root filesystem override for kubelet mounter"
This reverts commit e861a5761d.
2016-11-02 15:18:09 -07:00
Vishnu Kannan
e5c61922f8 In gci mounter script, expose /var/lib/kubelet only and add more debugging logs.
Added a retry for rkt gc just to be safe.

Signed-off-by: Vishnu Kannan <vishnuk@google.com>
2016-11-02 15:18:09 -07:00
Vishnu Kannan
1ecc12f724 [Kubelet] Do not use custom mounter script for bind mounts, ext* and tmpfs mounts
Signed-off-by: Vishnu Kannan <vishnuk@google.com>
2016-11-02 15:18:08 -07:00
Janet Kuo
c25455e8b3 (Auto-gen) Run hack/update-all & update-bazel & update linted packages 2016-11-02 15:16:41 -07:00
Janet Kuo
2a43ddc3ec Remove 'stateful set is alpha' comment in types.go 2016-11-02 15:16:23 -07:00
Janet Kuo
c15b9470f5 Replace apps/v1alpha1 with apps/v1beta1 and manually remove generated apps/v1alpha1 files
Manually remove generated apps/v1alpha1 types, protobuf, and api-reference doc files
Manually remove apps/v1alpha1 folder from 1.5 generated client
2016-11-02 15:16:23 -07:00
foxish
bbf3ac7324 Moving annotation to the right spot. 2016-11-02 14:53:45 -07:00
Kubernetes Submit Queue
7747f5eefd Merge pull request #36083 from dgoodwin/join-etc-kubernetes
Automatic merge from submit-queue

kubeadm: Fix preflight check failure on node join.

We recently improved this to tolerate existence of things like
/etc/kubernetes/manifests/ as an empty dir, but forgot to do so for the
join pre-flight checks where it is also failing.

Instead ensure only the sub-directories and files we need are available.

CC @luxas @kubernetes/sig-cluster-lifecycle
2016-11-02 14:49:00 -07:00
Kubernetes Submit Queue
9a7ad2e20d Merge pull request #35592 from madhusudancs/federation-kubefed-04
Automatic merge from submit-queue

[Federation][(Un)join-01] Refactor common functions and structs into a util package.

Please review only the last commit here. This is based on PR #35495 which will be reviewed independently.

Design Doc: PR #34484

cc @kubernetes/sig-cluster-federation @quinton-hoole @nikhiljindal
2016-11-02 14:48:46 -07:00
Saad Ali
9347bd0dd8 Merge pull request #36028 from david-mcmahon/fix-sync
Remove kube::build::build_image_built() check.
2016-11-02 14:39:32 -07:00
Tim Hockin
43d3824a9a Remove a few versioned-warnings that snuck in 2016-11-02 14:21:40 -07:00
Mik Vyatskov
3b6353bdc8 Fixed kibana image and controller to work through proxy 2016-11-02 22:06:22 +01:00
Wojciech Tyczynski
5b0389948f Fix collisions between different etcds during migration. 2016-11-02 21:48:26 +01:00
Kubernetes Submit Queue
d28f7031a1 Merge pull request #35494 from madhusudancs/federation-kubefed-02
Automatic merge from submit-queue

[Federation][unjoin-00] Implement `kubefed unjoin` command.

Please review only the last commit here. This is based on PR #35493 which will be reviewed independently.

I will add a release note separately for this entire feature, so please don't worry too much about the release note here in the PR.

Design Doc: PR #34484

cc @kubernetes/sig-cluster-federation @quinton-hoole @nikhiljindal
2016-11-02 13:36:43 -07:00
Madhusudan.C.S
4a9377027d [Federation][init] Implement kubefed init command that performs federation control plane bootstrap. 2016-11-02 13:36:41 -07:00
Madhusudan.C.S
9a0fc0c4f5 [Federation][(Un)join-01] Refactor common functions and structs into a util package. 2016-11-02 13:36:09 -07:00
Mike Danese
93f737eae6 fix verify-bazel.sh on mac and windows
mac bash doesn't like |& because mac bash is really old. the formating of wc
is also sligthly different then on linux

```
$ # on linux
$ echo -n | wc -l
0
$ # on mac
$ echo -n | wc -l
       0
```
2016-11-02 13:14:00 -07:00
Kubernetes Submit Queue
5db7596cdc Merge pull request #35903 from smarterclayton/test_node
Automatic merge from submit-queue

Add a test that emulates large N node behavior against master
2016-11-02 12:53:49 -07:00
Madhusudan.C.S
3c692ebd77 [Federation] Implement the kubefed command.
Also:
1. Add it to the client build targets list.
2. Register `kubefed join` and `kubefed unjoin` commands.
2016-11-02 12:48:20 -07:00
Kubernetes Submit Queue
539165d899 Merge pull request #36075 from rmmh/root-gitattributes
Automatic merge from submit-queue

Move .gitattributes annotation to the root, so GitHub will respect them.

This should fix the merge conflicts by letting GitHub use the simpler line-by-line algorithm for this file. Having .gitattributes in a sub-directory would work for local merging, but would show conflicts on the web UI.
2016-11-02 12:13:54 -07:00
Kubernetes Submit Queue
09a42622d4 Merge pull request #35896 from wojtek-t/target_version
Automatic merge from submit-queue

Expose etcd version.

Ref #20504

This PRs makes use of the following two env variables
- ETCD_IMAGE (if set) allows to use a custom etcd image.
- ETCD_VERSION (if set) allows you to use custom version of etcd. The main purpose of using it may be rollback of etcd v3 API, where we need 3.0.* image, but are rolling back to 2.3.7.
2016-11-02 12:13:46 -07:00