github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,659 Commits 1 Branch 31 Tags 1,019 MiB
36d46e6464
Commit Graph

1308 Commits

Author SHA1 Message Date
James DeFelice
eb22c8c14c handle nil *api.Node in procurement and added TODO for a better long term fix 2016-02-09 23:33:17 +00:00
derekwaynecarr
106693d9b3 Refactor namespace controller to use workers, do more delete collection calls 2016-02-09 16:39:13 -05:00
mqliang
b5e99be81c implement kubectl get/describe for ReplicaSet 2016-02-09 13:56:21 +08:00
James DeFelice
3affc4492c add replicaset controller to k8sm controller manager 2016-02-08 22:15:50 +00:00
k8s-merge-robot
c78f3a68fd Merge pull request #20783 from mesosphere/jdef_fix_scheduler_clientset_impl 
Auto commit by PR queue bot
 2016-02-08 05:42:16 -08:00
James DeFelice
22d3cb9ea9 scheduler API integration fixes: 
- fix unreported event problems
- add support for APIQPS and APIBurst
- eliminate authPath in favor of kubeconfig
- further refactor deps on autogenerated client API
 2016-02-07 22:43:01 +00:00
Jan Chaloupka
4389b3f0d6 Rewritte util.* -> wait.* wherever reasonable 2016-02-07 12:02:20 +01:00
k8s-merge-robot
6c5540baae Merge pull request #20232 from mml/daemonset-warn 
Auto commit by PR queue bot
 2016-02-05 23:12:51 -08:00
Mike Danese
b1743a6887 this is a manual reversion of #20702 
I can't revert with github which says "Sorry, this pull request couldn’t be
reverted automatically. It may have already been reverted, or the content may
have changed since it was merged."

Reverts commit: 0c191e787b
 2016-02-05 16:34:02 -08:00
Daniel Smith
f973af25fa Merge pull request #20747 from caesarxuchao/internalclientset 
rename release_1_2 to internalclientset
 2016-02-05 15:49:08 -08:00
Daniel Smith
9441721fee Merge pull request #19689 from AdoHe/kubectl_label_display 
kubectl add show-labels flag to make it more readable
 2016-02-05 14:08:37 -08:00
Chao Xu
184440f8ef rename release_1_2 to internalclientset 2016-02-05 14:02:28 -08:00
Jan Safranek
76b6449715 Retry recycle or delete operation on failure. 
Recycle controller tries to recycle or delete a PV several times.
It stores count of failed attempts and timestamp of the last attempt in
annotations of the PV.

By default, the controller tries to recycle/delete a PV 3 times in
10 minutes interval. These values are configurable by
kube-controller-manager --pv-recycler-maximum-retry=X --pvclaimbinder-sync-period=Y
arguments.
 2016-02-05 17:02:13 +01:00
Paul Weil
03261146b0 api 2016-02-05 08:45:50 -05:00
gmarek
0c191e787b Split controller flags between controllers 2016-02-05 12:17:51 +01:00
k8s-merge-robot
c09b67f60f Merge pull request #20591 from caesarxuchao/legacy-to-core 
Auto commit by PR queue bot
 2016-02-04 17:37:12 -08:00
James DeFelice
321a10a2d5 mount teamcity git workspace if running in TC 2016-02-05 00:44:26 +00:00
Chao Xu
1b047f8e67 rename legacy to core 2016-02-04 14:26:56 -08:00
AdoHe
714d12cf72 kubectl add show-labels flag to make it more readable 2016-02-04 02:08:44 -05:00
k8s-merge-robot
16aa40cc33 Merge pull request #20035 from janetkuo/record-command 
Auto commit by PR queue bot
 2016-02-03 20:19:08 -08:00
k8s-merge-robot
65ebe19164 Merge pull request #20584 from caesarxuchao/release_1_2 
Auto commit by PR queue bot
 2016-02-03 19:46:27 -08:00
k8s-merge-robot
d4da1ee3ce Merge pull request #19835 from janetkuo/kubectl-rollout 
Auto commit by PR queue bot
 2016-02-03 17:39:04 -08:00
Chao Xu
f9f5736b01 grep sed 2016-02-03 13:06:07 -08:00
Janet Kuo
5088d0e147 Record kubectl commands 2016-02-03 10:19:05 -08:00
k8s-merge-robot
843c11e06a Merge pull request #20452 from caesarxuchao/replace-client-kubelet 
Auto commit by PR queue bot
 2016-02-02 23:46:58 -08:00
Chao Xu
cddd7b56a4 replace client with clientset in kubelet and other places 2016-02-02 20:28:45 -08:00
Chao Xu
fe7887f1ec replace the client with clientset in controllers 2016-02-02 20:28:45 -08:00
Janet Kuo
442c75045a Add kubectl rollout undo 2016-02-02 14:20:01 -08:00
k8s-merge-robot
cfa3f037fd Merge pull request #20087 from kargakis/rollout-pause-resume 
Auto commit by PR queue bot
 2016-02-02 12:03:44 -08:00
Matt Liggett
f2d5375bc0 Stop deleting DaemonSet pods during drain. 
We do this because they will be recreated immediately by the
DaemonSet Controller.  In addition, we also require a specific flag
(--ignore-daemonsets) when there are DaemonSet pods on the node.
 2016-02-02 11:13:29 -08:00
k8s-merge-robot
ac24a68801 Merge pull request #20094 from mesosphere/jdef_mesos_026_godeps 
Auto commit by PR queue bot
 2016-02-02 03:19:25 -08:00
Michail Kargakis
21c2b836ed kubectl: add rollout pause/resume subcommands 2016-02-02 10:33:55 +01:00
k8s-merge-robot
17a5058e83 Merge pull request #19893 from janetkuo/kubectl-rollout-history 
Auto commit by PR queue bot
 2016-02-02 01:13:15 -08:00
Janet Kuo
8fb86a3d3b Add kubectl rollout history 2016-02-01 15:32:43 -08:00
harry
1032067ff9 Replace runtime reference by pkg 2016-02-01 21:06:44 +08:00
k8s-merge-robot
3af79b09ca Merge pull request #20387 from mesosphere/jdef_frameworkid_storage 
Auto commit by PR queue bot
 2016-01-31 22:23:09 -08:00
James DeFelice
e01b5560ca swappable storage backends for frameworkID 2016-02-01 06:03:25 +00:00
Chao Xu
c72d234bbf replacing handwritten client in several controllers 2016-01-31 15:42:02 -08:00
k8s-merge-robot
2ab16bda17 Merge pull request #19882 from janetkuo/kubectl-rollout-command 
Auto commit by PR queue bot
 2016-01-30 16:52:55 -08:00
k8s-merge-robot
deef16d2b3 Merge pull request #19354 from jimmidyson/system-container-fix 
Auto commit by PR queue bot
 2016-01-29 19:13:43 -08:00
James DeFelice
35565e47a7 send TASK_LOST when apiserver returns pod-not-found 2016-01-29 21:40:17 +00:00
Fabio Yeon
eb2c2d1af4 Merge pull request #20111 from fabioy/fix-tmp-tests 
Add temp directory creation method for tests.
 2016-01-29 09:51:12 -08:00
Jimmi Dyson
1c289943f5 Ensure kubelet pid is not moved to system container 2016-01-29 09:30:20 +00:00
k8s-merge-robot
d3fdc61ff7 Merge pull request #19696 from mesosphere/jdef_mesos_pod_discovery 
Auto commit by PR queue bot
 2016-01-28 01:15:40 -08:00
Fabio Yeon
7205a160ac Remove all instances of "/tmp" from unit tests and replace with a common 
tmp directory creator. Exception is documented.
 2016-01-27 16:11:22 -08:00
James DeFelice
70a5cc462b updated cluster/mesos/docker and contrib/mesos for mesos-0.26 compat 2016-01-27 17:13:07 +00:00
Clayton Coleman
38c7eded99 Prepare for content-type negotiation 
Combine the fields that will be used for content transformation
(content-type, codec, and group version) into a single struct in client,
and then pass that struct into the rest client and request. Set the
content-type when sending requests to the server, and accept the content
type as primary.

Will form the foundation for content-negotiation via the client.
 2016-01-26 17:44:30 -05:00
k8s-merge-robot
2286bd3a38 Merge pull request #19961 from mamikonyana/newrepo 
Auto commit by PR queue bot
 2016-01-25 19:51:23 -08:00
James DeFelice
1748f028d5 experimental support for task discovery-info generation 2016-01-25 16:25:03 +00:00
k8s-merge-robot
d3b869ae14 Merge pull request #17922 from smarterclayton/split_codec 
Auto commit by PR queue bot
 2016-01-25 06:30:39 -08:00
k8s-merge-robot
cc1eeeb7ca Merge pull request #19959 from mesosphere/jdef_fix_k8s_19954_scheduler_integration_test 
Auto commit by PR queue bot
 2016-01-25 06:05:54 -08:00
Clayton Coleman
4a6935b31f Remaining codec change refactors 2016-01-22 13:27:27 -05:00
Clayton Coleman
33085c0cf2 Update tests to handle codec changes 2016-01-22 13:27:26 -05:00
Arsen Mamikonyan
8b5e9e2885 Change repository references to https://github.com/kubernetes/kubernetes 2016-01-22 10:23:14 -05:00
James DeFelice
0b50f6c513 store and return deep copies of pod objects to avoid data races 2016-01-21 22:52:02 +00:00
Alex Mohr
6b1830841e Merge pull request #19877 from mesosphere/jdef_fix_k8sm_735_scheduler_event_broadcaster_config 
MESOS: conformance fix: scheduler name should match api.DefaultSchedulerName
 2016-01-21 14:15:56 -08:00
Alex Mohr
8f0ab67819 Merge pull request #19241 from mesosphere/karlkfi-docker-cluster 
Extract keygen image
 2016-01-21 10:29:39 -08:00
James DeFelice
227ac385e9 use the default scheduler name from the API when generating events; also start logging events to Infof 2016-01-21 16:57:15 +00:00
k8s-merge-robot
b02285cd0c Merge pull request #19632 from mesosphere/jdef_unified_pod_watch 
Auto commit by PR queue bot
 2016-01-20 16:26:49 -08:00
Janet Kuo
183b7f4d6d Add kubectl rollout 2016-01-20 16:17:42 -08:00
James DeFelice
b2013cb1ba replace pod-observer and check-for-lost-pod polling with a single pod watcher and task registry 2016-01-20 18:53:34 +00:00
Mike Danese
1162cfd3b1 kubelet: move most of kubelet server configuration to a config object. 
This is part of migrating kubelet configuration to the componentconfig api
group and is preliminary to retrofitting client configuration and
implementing full fledged API group mechinary.

Signed-off-by: Mike Danese <mikedanese@google.com>
 2016-01-15 15:31:59 -08:00
k8s-merge-robot
2655e1f767 Merge pull request #19361 from tombenner/add_current_context 
Auto commit by PR queue bot
 2016-01-14 01:09:12 -08:00
k8s-merge-robot
c059dfdb9b Merge pull request #18712 from pmorie/config-kubectl 
Auto commit by PR queue bot
 2016-01-13 13:51:29 -08:00
David Oppenheimer
8ac484793d Comment out calls to httptest.Server.Close() to work around 
https://github.com/golang/go/issues/12262 . See #19254 for
more details. This change should be reverted when we upgrade
to Go 1.6.
 2016-01-11 23:02:11 -08:00
Tom Benner
52739bc82b Add kubectl config current-context 2016-01-11 21:54:24 -08:00
k8s-merge-robot
dd81bf9f9d Merge pull request #19412 from mesosphere/jdef_sync_controllermanager 
Auto commit by PR queue bot
 2016-01-11 00:16:27 -08:00
James DeFelice
7feb664087 fix #19186 2016-01-10 14:51:20 +00:00
k8s-merge-robot
ce9b117a19 Merge pull request #16698 from mml/issue3885 
Auto commit by PR queue bot
 2016-01-09 13:38:41 -08:00
James DeFelice
7ee5ef06d2 resync the k8s controller manager with the k8sm variant 2016-01-08 16:53:59 +00:00
Clayton Coleman
2326e2bae3 Split controller manager options from init 
Make defaults and flags clearly distinct from initialization code.
 2016-01-06 22:39:14 -05:00
k8s-merge-robot
ab6edd8170 Merge pull request #19093 from smarterclayton/split_proxy_and_scheduler 
Auto commit by PR queue bot
 2016-01-06 19:26:41 -08:00
k8s-merge-robot
e1cb14cce1 Merge pull request #19092 from smarterclayton/split_api_server 
Auto commit by PR queue bot
 2016-01-06 19:09:38 -08:00
Clayton Coleman
715b77cbcd Split proxy and scheduler arguments 
Keep options and flags distinct from initialization
 2016-01-06 21:34:31 -05:00
Clayton Coleman
791d160b42 Split the Kubelet flag options and struct 
Reduces the size of the app/server.go file and ensures that the flags
and their defaults are clearly separated.
 2016-01-06 21:23:06 -05:00
Clayton Coleman
c0c707d92d Split apiserver flags and initialization 
Make it easier to keep defaults and flags clearly identified.
 2016-01-06 21:14:30 -05:00
Matt Liggett
c6e9ad066e Initial node drain implementation for #3885. 
It cordons (marks unschedulable) the given node, and then deletes every
pod on it, optionally using a grace period.  It will not delete pods
managed by neither a ReplicationController nor a DaemonSet without the
use of --force.

Also add cordon/uncordon, which just toggle node schedulability.
 2016-01-06 17:28:18 -08:00
k8s-merge-robot
a11d1bdc90 Merge pull request #19303 from mesosphere/jdef-expose-conntrack-flags-to-framework 
Auto commit by PR queue bot
 2016-01-06 16:21:18 -08:00
k8s-merge-robot
2a1e51cb5a Merge pull request #18906 from MikeSpreitzer/issue/18721 
Auto commit by PR queue bot
 2016-01-06 14:09:36 -08:00
James DeFelice
58407ca8a2 avoid updating nf_conntrack-related settings, by default, when running k8s on mesos 2016-01-06 21:57:25 +00:00
Mike Spreitzer
b35aec769b Issue #18721: introduce longer period for lost pod polling 2016-01-06 13:58:29 -05:00
Paul Morie
9c18067e60 Add kubectl support for ConfigMap 2016-01-06 09:03:39 -05:00
Karl Isenberg
acef0404e5 Simplify docker run execution in a way that still handles SIGINT & SIGTERM 2016-01-05 17:55:52 -08:00
James DeFelice
5ae56ce554 disable conntrack behavior mods that are possibly causing smoke tests to bomb 2016-01-05 02:06:18 +00:00
k8s-merge-robot
cd097e3f86 Merge pull request #19088 from smarterclayton/separate_service_account 
Auto commit by PR queue bot
 2016-01-04 08:38:24 -08:00
k8s-merge-robot
356487c951 Merge pull request #18101 from brendandburns/kubectl6 
Auto commit by PR queue bot
 2015-12-29 12:43:42 -08:00
Dr. Stefan Schimanski
7a2c33e323 contrib/mesos/scheduler: make debug handler for kubelet configurable 2015-12-29 14:39:59 +01:00
Clayton Coleman
9dad7e624c Split the serviceaccount package into two parts 
Public utility methods and JWT parsing, and controller specific logic.
Also remove the coupling between ServiceAccountTokenGetter and the
authenticator class.
 2015-12-26 21:28:12 -05:00
Chao Xu
2b5b708b70 Refactor the API registration and installation 2015-12-23 22:44:25 -08:00
Brendan Burns
4123a61df7 Add the client side bits of kubectl export 2015-12-22 10:41:59 -08:00
Dr. Stefan Schimanski
5ebc1f0d79 contrib/mesos/kubelet: don't disable debug handler by default 2015-12-21 14:31:28 +01:00
Timothy St. Clair
c505a5d49d Updating kubernetes proper to use latest etcd client library 2015-12-16 15:56:35 -06:00
k8s-merge-robot
5a579a2555 Merge pull request #16028 from derekwaynecarr/make_cmd 
Auto commit by PR queue bot
 2015-12-16 08:41:59 -08:00
k8s-merge-robot
e309583ff1 Merge pull request #18473 from smarterclayton/change_runtime_object 
Auto commit by PR queue bot
 2015-12-16 04:24:22 -08:00
k8s-merge-robot
0be54ae771 Merge pull request #18507 from feihujiang/supportRemoveFlagForKubectlRun 
Auto commit by PR queue bot
 2015-12-16 01:19:26 -08:00
Clayton Coleman
8f203a28f1 Change runtime.Object signature 2015-12-15 13:36:25 -05:00
Sergiusz Urbaniak
1fd3bc087b pod_task: use annotations rather than labels for roles 
Roles support in Kubernetes-Mesos was done using pod labels. This
commits moves this to pod annotations. Pod label yaml files don't
support '*' characters, furthermore roles are consumed by the scheduler
only and are not meant for querying/filtering.
 2015-12-15 12:45:54 +01:00
k8s-merge-robot
b02417bb9b Merge pull request #18348 from mesosphere/sur-652-conformance-tests 
Auto commit by PR queue bot
 2015-12-15 02:02:50 -08:00
derekwaynecarr
5e0948586c Add kubectl create [SUBCOMMAND] pattern 2015-12-14 13:43:45 -05:00
Sergiusz Urbaniak
7bf86d61ee mesos/docs: update docs for roles support 
The scheduler documentation was updated to:

1. Reflect the `--mesos-framework-roles` and `--mesos-default-pod-roles`
configuration options.

2. Reflect pod roles configuration via annotations rather than labels.

3. The section describing more than two roles was modified to describe
only two roles because that is what is currently supported in Mesos.
 2015-12-14 16:49:19 +01:00
Sergiusz Urbaniak
67e98fcfa8 executor, scheduler: make default pod roles configurable 
Currently if a pod is being scheduled with no meta.RolesKey label
attached to it, per convention the first configured mesos (framework)
role is being used.

This is quite limiting and also lets e2e tests fail. This commit
introduces a new configuration option "--mesos-default-pod-roles" defaulting to
"*" which defines the default pod roles in case the meta.RolesKey pod
label is missing.
 2015-12-14 15:18:39 +01:00
Wojciech Tyczynski
960808bf08 Switch to versioned ListOptions in client. 2015-12-14 14:26:09 +01:00
feihujiang
9ab06cfa62 Support remove flag for kubectl run command 2015-12-14 16:16:43 +08:00
k8s-merge-robot
1c4d2624f8 Merge pull request #17917 from mesosphere/jdef_fix_downward_api_compat 
Auto commit by PR queue bot
 2015-12-13 06:55:22 -08:00
James DeFelice
26593f1a6a use WithoutCancel interface w/ Pop(nil) 2015-12-12 15:33:48 +00:00
k8s-merge-robot
4f67b0b211 Merge pull request #18349 from mesosphere/sttts-workaround-kube-ui-condition-order-assumption 
Auto commit by PR queue bot
 2015-12-12 02:26:49 -08:00
k8s-merge-robot
5ff88a4eb6 Merge pull request #18575 from jay-lau/master 
Auto commit by PR queue bot
 2015-12-11 17:11:40 -08:00
k8s-merge-robot
a1f6cc3f63 Merge pull request #18574 from jay-lau/master 
Auto commit by PR queue bot
 2015-12-11 17:11:38 -08:00
Jeff Lowdermilk
c103825ef4 Merge pull request #14537 from markturansky/pv_provisioner 
PersistentVolume Provisioner Controller
 2015-12-11 13:09:33 -08:00
Jeff Lowdermilk
e53acfe19c Merge pull request #17111 from munnerz/multi-rolling-update 
Allow rolling-update of a single container in multi-container pods
 2015-12-11 13:08:13 -08:00
markturansky
4fc1bf1f23 Added PersistentVolumeController 2015-12-11 10:33:30 -05:00
k8s-merge-robot
d3243b8778 Merge pull request #18383 from timothysc/tools_removal 
Auto commit by PR queue bot
 2015-12-11 07:17:14 -08:00
Jay Lau
69439149ed Correct typo for two parameters in mesos scheduler. 2015-12-11 10:02:27 -05:00
Jay Lau
85a9303bd6 Removed code confilict symbols from mesos scheduler document. 2015-12-11 22:32:52 +08:00
James DeFelice
af95e3fe0e - forward updated labels/annotations for downward API compat 
- refactor queue.Pod construction to take functional options, privatize Pod fields
- refactor DelayFIFO and HistoricalFIFO to offer consistent, more useful Pop() funcs
- refactor pod update processing changes; long term we should somehow combine with the special pod config source that we are using for mirror pods
- task launch timer cleanup
 2015-12-11 13:15:06 +00:00
k8s-merge-robot
940f5d4447 Merge pull request #18434 from mesosphere/sur-680-kubelet-events 
Auto commit by PR queue bot
 2015-12-10 02:35:24 -08:00
Sergiusz Urbaniak
9176e93ba8 service: initialize EventClient 
Kubelet events are not being tracked. This commit fixes it by
initializing the event client.

fixes https://github.com/mesosphere/kubernetes-mesos/issues/680
 2015-12-09 20:43:11 +01:00
Timothy St. Clair
413d8d18fe Futher storage isolation and removal of the tools interface. 2015-12-09 11:04:14 -06:00
Wojciech Tyczynski
a915b8b29a Merge pull request #18080 from wojtek-t/list_options_in_listwatch 
Pass ListOptions to List in ListWatch.
 2015-12-09 14:27:51 +01:00
k8s-merge-robot
f3298531d1 Merge pull request #18355 from mesosphere/sttts-document-etcd-default 
Auto commit by PR queue bot
 2015-12-09 03:37:19 -08:00
Dr. Stefan Schimanski
9522e0ef12 contrib/mesos/scheduler: create nodes with ready condition 
The current kube-ui version (compare https://github.com/kubernetes/kube-ui/pull/37/files#r46950087)
assumes that the first node condition is the Ready condition. This PR works
around this by enforcing the Ready condition to be the first one.

A parallel PR against kube-ui is on the way.
 2015-12-08 22:29:52 +01:00
Dr. Stefan Schimanski
47a541aa1e Document package default for etcd persistence 2015-12-08 21:50:19 +01:00
deads2k
2ee3dfe415 update testapi to eliminate redundant fields 2015-12-07 15:54:26 -05:00
Wojciech Tyczynski
b0fcb5adef Pass ListOptions to List in ListWatch. 2015-12-07 11:53:53 +01:00
k8s-merge-robot
db11f1b6c6 Merge pull request #17133 from derekwaynecarr/quota_controller_improvements 
Auto commit by PR queue bot
 2015-12-06 12:24:00 -08:00
Random-Liu
3cbdf79f8c Change original PodStatus to APIPodStatus, and start using kubelet internal PodStatus in dockertools 2015-12-04 17:37:39 -08:00
James Munnelly
61306c2a0f Allow rolling-update of a single container in multi-container pods 
Accept codec as parameter to CreateNewControllerFromCurrentController function. Add tests for performing a rolling update on a container in a multi-container pod.
 2015-12-04 18:38:55 +00:00
derekwaynecarr
55d4f70f8e Resource quota observes deletes faster 2015-12-03 17:35:05 -05:00
k8s-merge-robot
ec93aabfbe Merge pull request #17779 from fabianofranz/bump_cobra_pflag 
Auto commit by PR queue bot
 2015-12-03 04:42:17 -08:00
Wojciech Tyczynski
6dcb689d4e Simplify List() signature in clients. 2015-12-03 09:54:07 +01:00
James DeFelice
02a11f7a2e Merge pull request #53 from mesosphere/jdef_fix_executor_state_locks 
MESOS: avoid mutex locking around blocking calls in kubelet-executor
Conflicts:
	contrib/mesos/pkg/executor/service/service.go
 2015-12-02 22:45:52 +00:00
k8s-merge-robot
8a8639d7af Merge pull request #17863 from wojtek-t/only_list_options_in_watch 
Auto commit by PR queue bot
 2015-12-02 06:28:28 -08:00
k8s-merge-robot
cd76ca9527 Merge pull request #18017 from mesosphere/sur-k8sm-656-panic 
Auto commit by PR queue bot
 2015-12-02 06:17:48 -08:00
Sergiusz Urbaniak
91cbd5ff46 node: replace node lookup via node list watch with node store 
Fixes https://github.com/mesosphere/kubernetes-mesos/issues/656
 2015-12-02 14:12:56 +01:00
Dr. Stefan Schimanski
271eeb008b Merge pull request #52 from mesosphere/sttts-task-lost-during-kubelet-pod-launch 
MESOS: scheduler: handle lost task status updates during kubelet pod launch
 2015-12-02 13:50:28 +01:00
Dr. Stefan Schimanski
d2c86c847c Merge pull request #51 from mesosphere/sttts-tasks-killed-by-master 
MESOS: scheduler: handle terminal tasks killed by the master
 2015-12-02 12:02:50 +01:00
k8s-merge-robot
ac68536d44 Merge pull request #17832 from wojtek-t/list_options_in_list 
Auto commit by PR queue bot
 2015-12-02 02:34:17 -08:00
k8s-merge-robot
643cb7a1c7 Merge pull request #17891 from zhengguoyong/consistent_kubelet_package 
Auto commit by PR queue bot
 2015-12-01 08:37:01 -08:00
Wojciech Tyczynski
8343c8ce6c Pass ListOptions to List() methods. 2015-12-01 15:00:36 +01:00
k8s-merge-robot
7644d34759 Merge pull request #15775 from mesosphere/sur-k8sm-482-resource-roles 
Auto commit by PR queue bot
 2015-12-01 05:36:52 -08:00
Wojciech Tyczynski
d2dfc912e6 Simplify Watch() signature in clients. 2015-12-01 14:19:26 +01:00
k8s-merge-robot
0d7d8793ea Merge pull request #17842 from mesosphere/sttts-docker-it 
Auto commit by PR queue bot
 2015-11-30 11:18:02 -08:00
deads2k
1ac6d8afd3 update reaper, scaler, describer for GroupKind 2015-11-30 09:22:39 -05:00
Dr. Stefan Schimanski
e7203816f1 contrib/mesos/ci: name FETCH_HEAD as CONFORMANCE_BRANCH 2015-11-30 12:30:20 +01:00
zhengguoyong
bff8334db9 Consistent import kubelet app package name 2015-11-28 08:51:39 +08:00
Dr. Stefan Schimanski
2302caf970 contrib/mesos/ci: clone conformance branch into subdir 
In order to properly shutdown the docker-compose cluster, after the conformance
test it is necessary to have the original version again. Running the conformance
tests from a clone in subdir with the right branch given by CONFORMANCE_BRANCH
is much easier.
 2015-11-27 15:08:39 +01:00
Dr. Stefan Schimanski
ede8de7aba contrib/mesos/ci: call kube-down.sh from correct dir 2015-11-27 15:08:39 +01:00
Dr. Stefan Schimanski
5d69b46fc3 contrib/mesos/ci: call kube-down.sh first to stop dangling containers 2015-11-27 12:56:42 +01:00
k8s-merge-robot
6850c6d6fd Merge pull request #17835 from mesosphere/sttts-conformance-branch 
Auto commit by PR queue bot
 2015-11-27 01:14:56 -08:00
Dr. Stefan Schimanski
5e6d35897d contrib/mesos/ci: add CONFORMANCE_BRANCH override 2015-11-27 09:30:54 +01:00