github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,173 Commits 1 Branch 31 Tags
72beb65ee57fa4339b8a288cbdf2ba8559db13b2
Commit Graph

12721 Commits

Author SHA1 Message Date
k8s-merge-robot
613bbbb131 Merge pull request #26667 from mml/skip-local-data 
Automatic merge from submit-queue

Stop 'kubectl drain' deleting pods with local storage.

Kubectl drain will not continue if there are pods with local storage unless
forced with --delete-local-data.

Fixes #23972
 2016-06-08 17:10:58 -07:00
k8s-merge-robot
54b352ae3a Merge pull request #26907 from smarterclayton/tolerate_quantity 
Automatic merge from submit-queue

Resource quantity must support leading and trailing whitespace in JSON for back-compat

For backwards compatibility reasons, we must continue to support leading or trailing whitespace on Quantity values when deserialized from JSON.  We must also support numbers serialized into yaml (`cpu: 1`) and JSON (`"cpu": 1`)

Fixes #26898
 2016-06-08 16:16:41 -07:00
k8s-merge-robot
85b67f2f00 Merge pull request #26874 from wojtek-t/fix_retry_after 
Automatic merge from submit-queue

Fix Retry-After in clients

Fix #26871
 2016-06-08 15:21:53 -07:00
Matt Liggett
d09af4a1d6 Stop 'drain' deleting pods with local storage. 
Unless forced with --delete-local-data.  Also a refactoring of the
kubectl drain logic that selects/rejects pods and produces error/warning
messages.
 2016-06-08 14:59:03 -07:00
k8s-merge-robot
e5784c41d4 Merge pull request #26829 from lukaszo/order 
Automatic merge from submit-queue

Custom sort function for InitContainersStatuses

Order in init containers matters. Statues shoudln't be sorted by name.
 2016-06-08 13:37:11 -07:00
k8s-merge-robot
99c8d10a28 Merge pull request #26803 from derekwaynecarr/fix_26319 
Automatic merge from submit-queue

Move quota usage testing for loadbalancers into unit tests

Fixes https://github.com/kubernetes/kubernetes/issues/26319

* moved testing for node port and load balancer usage in quota to unit tests
* remove node port and node port -> loadbalancer service testing out of e2e
 * covered already in replenishment_controller_test scenario

Given the time it takes to even allocate a load balancer, it seems better to test that outside of this test case to avoid unnecessary flakes.

/cc @bprashanth
 2016-06-08 12:51:53 -07:00
k8s-merge-robot
66149c50fd Merge pull request #26792 from janetkuo/deployment-version-skewed-test-fail 
Automatic merge from submit-queue

Avoid comparing pod-template-hash when getting a deployment's new/old RSes

Will need to cherry pick to 1.2 also. 

Ref #26724 #26797 @kubernetes/deployment @ihmccreery 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
 2016-06-08 12:03:31 -07:00
k8s-merge-robot
e7102b4fd9 Merge pull request #26880 from wojtek-t/better_traces 
Automatic merge from submit-queue

Fix traces

Ref #26185
 2016-06-08 08:06:18 -07:00
Łukasz Oleś
2b46aea495 Custom sort function for InitContainersStatuses 
Order in init container statuses should be the same as defined in pod.
Statues shoudln't be sorted by name.
 2016-06-07 23:57:23 +02:00
Wojciech Tyczynski
528713bcc2 Fix Retry-After in clients 2016-06-07 21:04:44 +02:00
derekwaynecarr
7a5412a259 Move quota usage testing for loadbalancers into unit tests 2016-06-07 12:54:11 -04:00
Janet Kuo
c3d905776e Avoid comparing pod-template-hash when getting a deployment's new/old RSes 2016-06-06 17:09:35 -07:00
Clayton Coleman
e1dc3ef933 Remove unused 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
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
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
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
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
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
AdoHe
9d28bab847 make kubectl get ingress output more consistency 2016-06-04 22:43:51 -04: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
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
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
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
8e091e254f Merge pull request #26666 from euank/fix-wrong-err 
Automatic merge from submit-queue

rkt: Wrap exec errors as utilexec.ExitError

This is needed by the exec prober to distinguish error types and exit
codes correctly. Without this, the exec prober used for liveness probes
doesn't identify errors correctly and restarts aren't triggered. Fixes #26456

An alternative, and preferable solution would be to use utilexec
everywhere, but that change is much more involved and should come at a
later date. Unfortunately, until that change is made, writing tests for
this is quite difficult.

cc @yifan-gu @sjpotter
 2016-06-04 05:11:16 -07:00
k8s-merge-robot
22d405477b Merge pull request #26568 from derekwaynecarr/kubectl_qos 
Automatic merge from submit-queue

Update kubectl describe pod to use pod level qos

Fixes https://github.com/kubernetes/kubernetes/issues/26374

/cc @vishh
 2016-06-04 02:40:47 -07:00
AdoHe
ab743708fe update ingress describe output 2016-06-04 04:58:37 -04:00
k8s-merge-robot
707cc2bbb8 Merge pull request #26493 from caesarxuchao/fix-gc-flake 
Automatic merge from submit-queue

Fixes 25890 flake. Let GC convert ListOptions to v1 before passing it to the dynamic client

GC's ListWatcher directly passed the api.ListOptions to the dynamic client, but the parameter codec of dynamic client converts the options to queries based on the tags in the struct, which are not present in api.ListOptions, so the queries are not sent to the server. As a result, the Watch request was sent without a resourceVersion, causing missed events. Flake #25890 is caused by the missed deletion events.

This PR converts the api.ListOptions to v1.ListOptions before the GC passes it to the dynamic codec. The flaky test has successfully passed 79 times ([log](https://00e9e64bacd064560a027fbee9c5a373a1614f3a56e652ae40-apidata.googleusercontent.com/download/storage/v1_internal/b/kubernetes-jenkins/o/pr-logs%2Fpull%2F25923%2Fkubernetes-pull-test-unit-integration%2F28364%2Fbuild-log.txt?qk=AD5uMEv72OjSUqDyk5i-ZLurcmM4i7gket1c7WaqR7yuIYz7WhPYT7ewVBafijV0ymnPTYqxRYt1kp6S9YQv7chPwC-3UtrKetKfhYnvAFrPGXAIBxHytTmpFohRAYgsARN1B6j1f9vyK5lM-8jyzRGhCK3sCRsAPnbDBWIWFlbH4b1n3vUET3P71QamHrF5itYyaqRU5pMZV3Cwwr81X8q7h5hCzm3Ip78RpMzfjEqTG0RcM2TLGccUrlkWVBLh4hn0NFpUIkzVFugFA5ooJffo-0AdJnO3mGWEOnXNVFWftJbK8cKnTns0DISrYFOyH_PlOe_YHCxgIXIT-dW8G-nbqoUjn5SBqunr36rcpaYCIwe2va4W_AcLCT43xiEAezRER_U9AuIqi_22KMd6SuHTyljhmWFPvPk8-gpjthLWXhcE7LPO5dV41hnZHnbI4n_9eI1nSVm7q9XdSvX1sWKV1GCwn8oj017AnxVvl9bScultko_0dTC747UqJ6UTFakLuFcHFe-F5Tz7ItDWlBVPoXeC7gTpyuicFKLsdqGlW9F5X6kIwNrBRj9uRsS-QuzSER-fVkQCn4dUTcokttRH_0bYvyfr9oqiDXmywMgOp-L0sKayk8JOVynh2q0Tju9sdkvFr0PxoAjhofomfIC1SZ_JkOzwAT1TUW8dLjPHluMct34xW_-qna1AmkoxM4bZQLhllap96NTC-0IdtzeKDrTul8p7u3WXSJjjEMSijibTNMlnkB0AluT1_RNO94OnzuFv4YlcV24FPhJzchhbyKREkOb_wzgcnSbRwGHjIcfRgkX-IzoXHVBcMYFUrPmsXrnRcfad4XwjkUOgvivkURW2_EwnzgrLDh-IKek51_0FpT1MnFCSG0gQbVSs_iMVPr6UXNAw62LGbKVtl3ZMXyapEpcO8azNbn6Wvd550R704JXxYlU)).

@lavalamp @krousey @smarterclayton
 2016-06-04 01:52:31 -07:00
k8s-merge-robot
48d87a0c57 Merge pull request #26393 from bprashanth/dns 
Automatic merge from submit-queue

Fix srv record lookup

Took longer than expected for unrelated reasons. This is intentionally a pretty dumb fix.
Fixes https://github.com/kubernetes/kubernetes/issues/26116
 2016-06-04 01:00:15 -07:00
k8s-merge-robot
bd2bc25308 Merge pull request #25865 from jsafrane/devel/pv-convert-from-12 
Automatic merge from submit-queue

volume controller: Convert PersistentVolumes from Kubernetes 1.2

In Kubernetes 1.2 we used template PersistentVolume for provisioning. When a claim for dynamic volume was detected, Kubernetes did:

- create template PV for the claim with dummy pointer to storage asset
- allocate storage asset such as AWS EBS
- fill real pointer to the created storage asset to the template PV

In refactored volume provisioner, Kubernetes allocates the storage asset first and then creates a Kubernetes PV instance already with the correct pointer to the storage asset.

To support seamles upgrade from 1.2 to 1.3 we need to remove these unprovisioned template PVs. The new controller does not use them, it will see PVC for dynamic provisioning and create real PV instead.

See https://github.com/pmorie/pv-haxxz/pull/3 for pseudocode.
 2016-06-03 23:27:13 -07:00
k8s-merge-robot
14f2763724 Merge pull request #26777 from jsafrane/fix-attach-errors 
Automatic merge from submit-queue

Fix GCE attacher/detacher to ignore return value of failed calls.

The plugin should ignore any return value if err is set. Found when writing unit tests in #26615 - my dummy `DiskIsAttached` returned `false, errors.New('fake error')` and the volume was **not** detached although the log message `"Error checking if PD (%q) is already attached to current node (%q). Will continue and try detach anyway."` suggested otherwise 

@saad-ali, PTAL
@kubernetes/sig-storage
 2016-06-03 22:34:56 -07:00
Prashanth Balasubramanian
2439930592 Fix srv record lookup 2016-06-03 20:41:08 -07:00
k8s-merge-robot
4877153727 Merge pull request #26772 from jsafrane/flake-controller-cache-empty 
Automatic merge from submit-queue

Wait for all volumes/claims to get synced in unit test.

Controller.HasSynced() returns true when all initial claims/volumes were sent
to appropriate goroutines, not when the goroutine has actually processed them.

Fixes #26712
 2016-06-03 17:05:22 -07:00
k8s-merge-robot
9dc06e85fb Merge pull request #26807 from pmorie/wrap-volumes 
Automatic merge from submit-queue

Wrap comments in pkg/volume

Supercedes #25300, line wrap some huge comments in `pkg/volume`.
 2016-06-03 15:38:13 -07:00
k8s-merge-robot
c1392ec51a Merge pull request #26747 from freehan/kubenetdir 
Automatic merge from submit-queue

pass NetworkPluginDir to kubenet

to unblock GCI kubenet integration #26379

cc: @andyzheng0831
 2016-06-03 15:38:09 -07:00
Paul Morie
029b97d5a1 Wrap comments in pkg/volume 2016-06-03 16:16:57 -04:00
k8s-merge-robot
a00dbea133 Merge pull request #26758 from mqliang/lookupcache-threadsafe 
Automatic merge from submit-queue

bugfix:lookupcache's Get method can not be called concurrently

ref https://github.com/kubernetes/kubernetes/issues/26376

@lavalamp @therc @mikedanese
 2016-06-03 12:46:13 -07:00
derekwaynecarr
89ff3b2530 Update kubectl describe pod to use pod level qos 2016-06-03 15:32:32 -04:00
Chao Xu
06f49f7ca7 Let the dynamic client take a customized parameter codec for List, Watch, and DeleteCollection. 
Let the gc's ListWatcher use api.ParameterCodec. Fixes 25890.
 2016-06-03 11:22:51 -07:00
nikhiljindal
6e71b4a2dc Fixing externalAddress in genericapiserver 2016-06-03 11:21:29 -07:00
mqliang
9a0ff5a9e8 bugfix:lookupcache's Get method can not be called concurrently 2016-06-04 02:21:25 +08:00
Fabiano Franz
8f62a196fd Expose print utils to append labels 2016-06-03 15:00:50 -03:00
Minhan Xia
e9f8c70eaf pass NetworkPluginDir to kubenet 2016-06-03 10:22:49 -07:00