Commit Graph

30257 Commits

Author SHA1 Message Date
k8s-merge-robot
98c432a943 Merge pull request #25841 from ojarjur/ojarjur/registry-mirror
Automatic merge from submit-queue

GCE: Enable using gcr.io as a Docker registry mirror.

```release-note
Use gcr.io as a Docker registry mirror when setting up a cluster in GCE.
```
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

This only affects clusters running under GCE.
2016-06-06 14:50:05 -07:00
Clayton Coleman
e1dc3ef933
Remove unused deep_copies 2016-06-06 17:18:22 -04:00
Clayton Coleman
460726c67d
Use inline assignment on string alias deep copies 2016-06-06 17:18:22 -04:00
Clayton Coleman
0181ac61da
DeepCopy should only generate types in k8s.io/kubernetes
Also make generation more selective (require opt in) to prevent lots of
unnecessary generated deep copies.
2016-06-06 17:18:22 -04:00
Clayton Coleman
653ddbb01e
Tolerate YAML and JSON numbers
Both YAML and JSON can contain numbers
2016-06-06 17:14:50 -04:00
Clayton Coleman
2ed3246631
Resource quantity must support leading and trailing whitespace
For backwards compatibility reasons, we must continue to support leading
or trailing whitespace on Quantity values when deserialized from JSON.
2016-06-06 16:53:42 -04:00
k8s-merge-robot
5c41b93d8b Merge pull request #26719 from pwittrock/kubectl-owners
Automatic merge from submit-queue

Add pwittrock to the kubectl OWNERS file



[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-06 13:46:13 -07:00
Brendan Burns
94b24351da Add a custom main instead of the standard test main, to reduce stack spew. 2016-06-06 13:40:09 -07:00
k8s-merge-robot
1de4b05442 Merge pull request #25490 from rootfs/rbd-defaults
Automatic merge from submit-queue

correction on rbd volume object and defaults

- add `omitempty` to `RBDPool RadosUser Keyring SecretRef ReadOnly`
- move defaults from `pkg/volume/rbd/rbd.go` to `pkg/api/v1/defaults.go`

addressing #18885
2016-06-06 13:02:22 -07:00
k8s-merge-robot
dfe5de3bcb Merge pull request #25731 from Pensu/master
Automatic merge from submit-queue

Adding version.Info in apiserver.go

Fixes #17176
2016-06-06 12:06:32 -07:00
Madhusudan.C.S
7355b3f1ca Prefix scheme/protocol to federation API server URL. 2016-06-06 11:56:27 -07:00
Tim St. Clair
bdff676425 Only build essential targets for node e2e
Also clean up a log message
2016-06-06 11:28:39 -07:00
Girish Kalele
42d70294c2 Fix Kube DNS addon staging for Container VMs 2016-06-06 11:15:23 -07:00
k8s-merge-robot
015bc3d60d Merge pull request #26811 from vishh/26809
Automatic merge from submit-queue

Mark runtime conformance tests as flaky and not run them in jenkins CI.

For #26809

@pwittrock As discussed offline, marking runtime tests as flaky for now. I'm not sure if those tests are required. Testing docker in every Kubernetes PR is un-necessary. 
These tests can be run periodically in a separate CI. AFAIK, these tests don't seem to exercise any kube features.
2016-06-06 11:14:44 -07:00
Dawn Chen
3acf04dded Merge pull request #26851 from zmerlynn/container-v1-3-v20160604
Bump GCE debian image to container-v1-3-v20160604
2016-06-06 11:04:46 -07:00
Huamin Chen
4b4048a084 correction on rbd volume object and defaults
Signed-off-by: Huamin Chen <hchen@redhat.com>
2016-06-06 17:27:47 +00:00
k8s-merge-robot
b6b079b1e9 Merge pull request #26812 from spxtr/redirect
Automatic merge from submit-queue

Upload build-log.txt if it exists.

Companion to https://github.com/kubernetes/test-infra/pull/112.
2016-06-06 10:22:53 -07:00
k8s-merge-robot
2cc0f2f040 Merge pull request #25280 from timothysc/http2_clients
Automatic merge from submit-queue

Option to enable http2 on client connections.

Addresses #21081

Enables http2 connection by default.  

before:
``` 
Active Internet connections (servers and established)
Proto Recv-Q Send-Q Local Address           Foreign Address         State       PID/Program name    
tcp        0      0 127.0.0.1:10248         0.0.0.0:*               LISTEN      21868/kubelet       
tcp        0      0 127.0.0.1:10249         0.0.0.0:*               LISTEN      21924/kube-proxy    
tcp        0      0 0.0.0.0:22              0.0.0.0:*               LISTEN      754/sshd            
tcp        0      0 192.2.5.12:47080        192.2.5.11:443          ESTABLISHED 21924/kube-proxy    
tcp        0      0 192.2.5.12:47082        192.2.5.11:443          ESTABLISHED 21924/kube-proxy    
tcp        0      0 192.2.5.12:55776        169.254.169.254:80      ESTABLISHED 21868/kubelet       
tcp        0    304 192.2.5.12:22           192.2.5.10:49978        ESTABLISHED 22287/sshd: root [p 
tcp        0      0 192.2.5.12:34568        192.2.5.11:2379         ESTABLISHED 3029/flanneld       
tcp        0      0 192.2.5.12:55774        169.254.169.254:80      ESTABLISHED 21868/kubelet       
tcp        0      0 192.2.5.12:47086        192.2.5.11:443          ESTABLISHED 21924/kube-proxy    
tcp        0      0 192.2.5.12:47102        192.2.5.11:443          ESTABLISHED 21868/kubelet       
tcp        0      0 192.2.5.12:47108        192.2.5.11:443          ESTABLISHED 21868/kubelet       
tcp        0      0 192.2.5.12:55772        169.254.169.254:80      ESTABLISHED 21868/kubelet       
tcp        0      0 192.2.5.12:47104        192.2.5.11:443          ESTABLISHED 21868/kubelet       
tcp        0      0 192.2.5.12:34718        192.2.5.11:2379         ESTABLISHED 3029/flanneld       
tcp        0      0 192.2.5.12:47110        192.2.5.11:443          ESTABLISHED 21868/kubelet       
tcp        0      0 192.2.5.12:47106        192.2.5.11:443          ESTABLISHED 21868/kubelet       
tcp        0      0 192.2.5.12:47084        192.2.5.11:443          ESTABLISHED 21924/kube-proxy    
tcp6       0      0 :::4194                 :::*                    LISTEN      21868/kubelet       
tcp6       0      0 :::10250                :::*                    LISTEN      21868/kubelet       
tcp6       0      0 :::10255                :::*                    LISTEN      21868/kubelet       
tcp6       0      0 :::22                   :::*                    LISTEN      754/sshd            
tcp6       0      0 192.2.5.12:10255        192.2.5.15:41570        ESTABLISHED 21868/kubelet       
udp        0      0 0.0.0.0:8472            0.0.0.0:*                           -                   
udp        0      0 0.0.0.0:22824           0.0.0.0:*                           600/dhclient        
udp        0      0 0.0.0.0:68              0.0.0.0:*                           600/dhclient        
udp6       0      0 :::4195                 :::*                                600/dhclient 
```

after
```
Active Internet connections (servers and established)
Proto Recv-Q Send-Q Local Address           Foreign Address         State       PID/Program name    
tcp        0      0 127.0.0.1:10248         0.0.0.0:*               LISTEN      16962/kubelet       
tcp        0      0 127.0.0.1:10249         0.0.0.0:*               LISTEN      17024/kube-proxy    
tcp        0      0 0.0.0.0:22              0.0.0.0:*               LISTEN      754/sshd            
tcp        0      0 192.2.5.12:47046        192.2.5.11:443          ESTABLISHED 17024/kube-proxy    
tcp        0      0 192.2.5.12:47052        192.2.5.11:443          ESTABLISHED 16962/kubelet       
tcp        0      0 192.2.5.12:34568        192.2.5.11:2379         ESTABLISHED 3029/flanneld       
tcp        0      0 192.2.5.12:55720        169.254.169.254:80      ESTABLISHED 16962/kubelet       
tcp        0      0 192.2.5.12:55724        169.254.169.254:80      ESTABLISHED 16962/kubelet       
tcp        0      0 192.2.5.12:34718        192.2.5.11:2379         ESTABLISHED 3029/flanneld       
tcp        0      0 192.2.5.12:55726        169.254.169.254:80      ESTABLISHED 16962/kubelet       
tcp        0    304 192.2.5.12:22           192.2.5.10:49938        ESTABLISHED 17653/sshd: root [p 
tcp6       0      0 :::4194                 :::*                    LISTEN      16962/kubelet       
tcp6       0      0 :::10250                :::*                    LISTEN      16962/kubelet       
tcp6       0      0 :::10255                :::*                    LISTEN      16962/kubelet       
tcp6       0      0 :::22                   :::*                    LISTEN      754/sshd            
tcp6       0      0 192.2.5.12:10255        192.2.5.15:41472        ESTABLISHED 16962/kubelet       
udp        0      0 0.0.0.0:8472            0.0.0.0:*                           -                   
udp        0      0 0.0.0.0:22824           0.0.0.0:*                           600/dhclient        
udp        0      0 0.0.0.0:68              0.0.0.0:*                           600/dhclient        
udp6       0      0 :::4195                 :::*                                600/dhclient
```

/cc @jeremyeder
2016-06-06 10:22:49 -07:00
k8s-merge-robot
fd2dee88c6 Merge pull request #26893 from mwielgus/ca-test-2
Automatic merge from submit-queue

Cluster autoscaling e2e tests cleanup

cc: @piosz @jszczepkowski
2016-06-06 08:54:56 -07:00
Marcin Wielgus
2b30eda8e2 Cluster autoscaling e2e tests cleanup 2016-06-06 16:53:09 +02:00
k8s-merge-robot
6ecfb4c8fa Merge pull request #26881 from jszczepkowski/kac-tests-cleanup
Automatic merge from submit-queue

Fixed cleaun-up after cluster autoscaling e2e tests.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

Fixed cleaun-up after cluster autoscaling e2e tests.
2016-06-06 05:59:24 -07:00
k8s-merge-robot
9c7dd2a2d6 Merge pull request #26878 from mwielgus/scale-down-2
Automatic merge from submit-queue

Increase cluster size by 2 in scale down e2e test to bypass Heapster nanny issues

cc: @piosz @fgrzadkowski
2016-06-06 02:44:22 -07:00
Jerzy Szczepkowski
3506280df6 Fixed cleaun-up after cluster autoscaling e2e tests.
Fixed cleaun-up after cluster autoscaling e2e tests.
2016-06-06 11:34:04 +02:00
mfanjie
6dde087f69 change clientset of service controller to versioned one 2016-06-06 17:04:26 +08:00
k8s-merge-robot
fc11ca60db Merge pull request #25454 from gouyang/add_local_util_tool
Automatic merge from submit-queue

Add local/util.sh
2016-06-06 01:51:20 -07:00
Wojciech Tyczynski
394db3b407 Fix traces 2016-06-06 10:49:46 +02:00
Peeyush Gupta
1a9f7e9a0c Adding version.Info in apiserver.go 2016-06-06 14:15:24 +05:30
Marcin Wielgus
95eaaeb883 Increase cluster size by 2 in scale down test to bypass Heapster nanny issue 2016-06-06 10:37:11 +02:00
Guohua Ouyang
0970bbf799 Add local/util.sh
Fix #25452
2016-06-06 14:45:06 +08:00
k8s-merge-robot
6460b34128 Merge pull request #25214 from yifan-gu/replace_resetfailed
Automatic merge from submit-queue

Cleanup systemd related shell out calls with API calls

Replace `systemctl --version` and `systemctl reset-failed` with API calls.
Also bumped go-systemd, which is necessary for the change.

cc @euank @philip @kubernetes/sig-node
2016-06-05 22:28:13 -07:00
Yifan Gu
a16f015a18 Godeps: Bump go-systemd, add coreos/pkg/dlopen. 2016-06-06 05:27:08 +00:00
Yifan Gu
3699b70b00 rkt: Refactor the systemd interface.
Replace shell out calls with dbus API calls.
Remove unused 'Reload()'.
2016-06-06 05:27:08 +00:00
mfanjie
c2dbce68f1 extract public function for build cluster config so that other controller can reuse 2016-06-06 10:36:35 +08:00
David Oppenheimer
68097515d8 Merge pull request #26638 from mikedanese/death_to_podmaster
remove podmaster from high availability example configs
2016-06-05 14:04:59 -07:00
k8s-merge-robot
56af9acd6f Merge pull request #26684 from AdoHe/kubectl_ingress
Automatic merge from submit-queue

kubectl get ingress output remove rules

fixes #22837 
@bprashanth ptal.

Now the output is:
```
[tony@localhost kubernetes]$ kubectl get ingress
NAME      RULE      BACKEND   ADDRESS   AGE
test      -                             5s
[tony@localhost kubernetes]$ kubectl get ingress --output=wide
NAME      RULE      BACKEND   ADDRESS   AGE
test      -                             9s
[tony@localhost kubernetes]$ kubectl describe ingress test
Name:			test
Namespace:		default
Address:		
Default backend:	default-http-backend:80 (<none>)
Rules:
  Host		Path	Backends
  ----		----	--------
  foo.bar.com	
    		/foo 	s1:80 (<none>)
    		/bar 	s2:80 (<none>)
  zoo.bar.com	
    		/foo 	s1:80 (<none>)
    		/bar 	s2:80 (<none>)
Annotations:
No events.
```
The `get` output is more clean.
2016-06-05 00:24:58 -07:00
Zach Loafman
20408cad17 Bump GCE debian image to container-v1-3-v20160604
Includes Docker 1.11.2

Wait for enough results from
http://kubekins.dls.corp.google.com/job/kubernetes-e2e-gce-container-vm/
before merging.

c.f. https://github.com/kubernetes/test-infra/pull/116
2016-06-04 20:46:46 -07:00
AdoHe
9d28bab847 make kubectl get ingress output more consistency 2016-06-04 22:43:51 -04:00
k8s-merge-robot
411696d5ef Merge pull request #25381 from apcera/allow_security_context_aws
Automatic merge from submit-queue

AWS kube-up: Remove SecurityContextDeny admission controller (to mirror GCE)

This PR allows the user to tune the ADMISSION_CONTROL options for AWS environments (much like local-up-cluser.sh). The main impetus is to allow users to exclude the SecurityContextDeny admission controller which causes e2e AWS based tests to fail with `pod.Spec.SecurityContext.SELinuxOptions is forbidden`.

Now AWS e2e tests are happy and can actually go green.
2016-06-04 17:53:43 -07:00
k8s-merge-robot
1c860c9a7e Merge pull request #26849 from olegshaldybin/add-list-options
Automatic merge from submit-queue

Add ListOptions to RBAC group

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

Otherwise clientset complains about unregistered kind when ListOptions
are passed.
2016-06-04 16:32:57 -07:00
Josh Ellithorpe
07f8d025c8
Remove SecurityContextDeny from aws configurations 2016-06-04 15:52:10 -07:00
k8s-merge-robot
421c16addd Merge pull request #25894 from brendandburns/thirdparty-watch
Automatic merge from submit-queue

Fix third party

Fixes https://github.com/kubernetes/kubernetes/issues/25421
Fixes https://github.com/kubernetes/kubernetes/issues/25422

@AdoHe @sjenning @caesarxuchao @lavalamp 

@kubernetes/sig-api-machinery 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-04 15:42:41 -07:00
k8s-merge-robot
6c5f5c5e36 Merge pull request #26571 from pwittrock/node-e2e-godeps
Automatic merge from submit-queue

Node e2e use vendored testing packages.


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-04 14:54:25 -07:00
k8s-merge-robot
9bf1ce42f8 Merge pull request #26843 from AdoHe/describe_ingress
Automatic merge from submit-queue

update ingress describe output

refer #26684 for more detail. @bprashanth ptal.
2016-06-04 13:27:46 -07:00
Oleg Shaldybin
ba3c7d33cd Add {List,Delete,Export}Options to RBAC group
Otherwise clientset complains about unregistered kind when options
are passed.
2016-06-04 12:54:18 -07:00
k8s-merge-robot
e0707b137f Merge pull request #26827 from Random-Liu/re-enable-node-problem-detector
Automatic merge from submit-queue

Re-enable node problem detector by default

Re-enable node problem detector started in gce cluster by default.

For now, in the master node, the node problem detector will be started and do nothing (see https://github.com/kubernetes/node-problem-detector/pull/13).

But in fact, in my test cluster, the master has no extra cpu to run the node problem detector, so node problem detector is started on all nodes except master, which is what we want but not expected...

@dchen1107 
/cc @kubernetes/sig-node 
/cc @andyzheng0831 for the gci script change.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-04 12:33:58 -07:00
k8s-merge-robot
a2d79d0ef6 Merge pull request #26825 from timstclair/node-e2e-pull
Automatic merge from submit-queue

Fix node e2e image pulling retry logic
2016-06-04 11:36:41 -07:00
Paul Morie
6415c2d288 Wrap more comments in pkg/volume 2016-06-04 14:14:00 -04:00
k8s-merge-robot
74aaa14390 Merge pull request #26796 from nikhiljindal/publicAddress
Automatic merge from submit-queue

Fixing logic to generate ExternalHost in genericapiserver

@ncdc pointed it out (https://kubernetes.slack.com/archives/sig-api-machinery/p1464974528000139) that lines 305 and 306 dont match. We should be using ReadWritePort instead of ServiceReadWritePort in line 306.

https://github.com/kubernetes/kubernetes/pull/20626 seems to be the culprit PR.
2016-06-04 10:48:55 -07:00
k8s-merge-robot
95e2535682 Merge pull request #26793 from fabianofranz/expose_show_labels_in_printers
Automatic merge from submit-queue

Expose printer utils that append labels

So that it can be reused downstream. @smarterclayton 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-04 09:59:39 -07:00
k8s-merge-robot
b91af0fab9 Merge pull request #26785 from a-robinson/es-master
Automatic merge from submit-queue

Don't run fluentd-es on GCI masters

It isn't run on containervm masters. It can't do anything on the master because the master doesn't have kube-proxy running to enable fluentd to talk to the elasticsearch service.

@andyzheng0831
2016-06-04 08:22:18 -07:00