Commit Graph

17103 Commits

Author SHA1 Message Date
Abhi Shah
04600aa5dd Merge pull request #11439 from jfchevrette/source-local-cluster-env
Allow a local /cluster/env.sh to be sourced if present
2015-09-03 16:35:42 -07:00
Abhi Shah
c9f2d3151b Merge pull request #13155 from derekwaynecarr/enforce_limits
Map cpu limits to cpu-quota in docker run
2015-09-03 16:28:04 -07:00
Abhi Shah
217e1d0d87 Merge pull request #13514 from kargakis/queryparams-handle-pointers
queryparams: Handle pointer fields in structs
2015-09-03 16:26:54 -07:00
Abhi Shah
cdfc37dd8f Merge pull request #13531 from quinton-hoole/2015-09-02-dedup-e2e-sh
Remove redundant filter from e2e-gce-parallel test job.
2015-09-03 16:16:56 -07:00
Quinton Hoole
ea6238ddc3 Remove redundant filter from e2e-gce-parallel test job. 2015-09-03 15:54:12 -07:00
Abhi Shah
9b24100c22 Merge pull request #13561 from yuvipanda/patch-1
Update kube2dns usage flags
2015-09-03 15:49:26 -07:00
Abhi Shah
b8179eae24 Merge pull request #13467 from simonswine/feature_enhanced_vpc_detection
Enhanced detection of VPC for cloudprovider AWS
2015-09-03 15:47:28 -07:00
Abhi Shah
d923e61dda Merge pull request #13397 from yujuhong/housekeeping
kubelet: define the housekeeping period
2015-09-03 15:46:29 -07:00
Abhi Shah
a1d5e84385 Merge pull request #13274 from mikedanese/kube-ui-v2
bump kube-ui addon version to v2
2015-09-03 15:42:56 -07:00
Abhi Shah
7dd85cb51b Merge pull request #13490 from feihujiang/changeVariablesToEnvionmentVariablesWhenDescribeContainers
Change variables to environment variables when describe containers
2015-09-03 15:39:24 -07:00
Abhi Shah
34476cd758 Merge pull request #13510 from Huawei-PaaS/fix_hostnet_in_dns
Fix a typo `hostNet` to `hostNetwork`in DNS
2015-09-03 15:36:40 -07:00
Abhi Shah
49523500c3 Merge pull request #13566 from mesosphere/reconcile-all-pods
MESOS: task reconciliation must look at NamespaceAll, not NamespaceDefault
2015-09-03 15:35:17 -07:00
k8s-merge-robot
d1c7a5f04e Merge pull request #13362 from mesosphere/proxy-runtime
Auto commit by PR queue bot
2015-09-03 15:26:56 -07:00
Abhi Shah
9e59ceaa06 Merge pull request #13549 from mesosphere/incremental-pod-updates
MESOS: Switch to incremental pod config notification
2015-09-03 14:24:38 -07:00
Dr. Stefan Schimanski
216865b80a Switch to incremental pod config notification
This fixes https://github.com/mesosphere/kubernetes-mesos/issues/463, i.e.
https://github.com/kubernetes/kubernetes/pull/13003 which broke contrib/mesos.
2015-09-03 22:49:02 +02:00
Abhi Shah
d5358f0f7e Merge pull request #13537 from stevekuznetsov/skuznets/typo
fixed error typo
2015-09-03 13:11:44 -07:00
Abhi Shah
380d7d9591 Merge pull request #13564 from a-robinson/beta
Switch from `gcloud beta container` to just `gcloud container`.
2015-09-03 13:09:25 -07:00
k8s-merge-robot
5d8a6049be Merge pull request #12848 from wojtek-t/private_watch_cache
Auto commit by PR queue bot
2015-09-03 13:06:18 -07:00
Abhi Shah
cbaf11f632 Merge pull request #13534 from quinton-hoole/2015-09-02-increases-pr-builder-nodes
Make PR builder and e2e-gce-parallel e2e runs use the same node count
2015-09-03 12:14:43 -07:00
k8s-merge-robot
857b6ba5a8 Merge pull request #12603 from markturansky/expand_vol_spec
Auto commit by PR queue bot
2015-09-03 12:00:49 -07:00
Quinton Hoole
e76e0477f2 Make PR builder and e2e-gce-parallel e2e runs use the same number of nodes. 2015-09-03 11:48:52 -07:00
Alex Robinson
edf692622c Switch from gcloud beta container to just gcloud container. 2015-09-03 18:19:25 +00:00
Abhi Shah
473c51593a Merge pull request #13502 from jszczepkowski/e2e-clustersize
e2e test function waitForClusterSize waits for not-ready nodes to go out.
2015-09-03 11:15:54 -07:00
Abhi Shah
9b70b9d839 Merge pull request #13506 from feihujiang/fixUpperCaseLetterInKubectlExamples
Fixes upper case letters in kubectl examples
2015-09-03 11:15:30 -07:00
Abhi Shah
228517e634 Merge pull request #13536 from brendandburns/util
Add Forever, syntactic sugar on Until
2015-09-03 11:12:34 -07:00
James DeFelice
d1589b9571 task reconciliation must look at NamespaceAll, not NamespaceDefault 2015-09-03 18:01:45 +00:00
derekwaynecarr
aff9ee5a40 Enable CFS quota in vagrant setup 2015-09-03 13:44:28 -04:00
derekwaynecarr
5dc74e8dbf Add support for CFS quota in kubelet 2015-09-03 13:44:28 -04:00
Yuvi Panda
e35d06fd17 Update kube2dns usage flags
Update some of the commandline flags for kube2sky
2015-09-03 18:57:45 +02:00
kargakis
f9bca7bc7d handle structs 2015-09-03 15:49:24 +02:00
kargakis
6c32e071f4 Dont output nil; test nil & omitempty 2015-09-03 15:32:19 +02:00
Steve Kuznetsov
0a07a46100 fixed error typo 2015-09-03 09:28:02 -04:00
markturansky
0e7f73ad67 expand volume.Spec to include full Volume and PV 2015-09-03 08:57:32 -04:00
kargakis
edfaa480cf queryparams: Handle pointer fields in structs 2015-09-03 13:45:31 +02:00
Brendan Burns
b6f2f396ba Merge branch 'markturansky-fix_expapi_desc' 2015-09-02 21:36:56 -07:00
Brendan Burns
a064c5d933 Merge branch 'fix_expapi_desc' of https://github.com/markturansky/kubernetes into markturansky-fix_expapi_desc 2015-09-02 21:36:40 -07:00
Brendan Burns
d1e1615967 Merge pull request #13546 from brendandburns/fix
Fix the travis build
2015-09-02 21:31:51 -07:00
Brendan Burns
960d6e5a5e Fix the travis build 2015-09-02 21:25:05 -07:00
feihujiang
0427711c42 Fixes upper case letters in kubectl examples 2015-09-03 12:00:21 +08:00
markturansky
8f9444025f removed expapi descriptions from internal types 2015-09-02 22:57:30 -04:00
k8s-merge-robot
9c4802420b Merge pull request #8632 from jimmidyson/logging-kube-metadata
Auto commit by PR queue bot
2015-09-02 19:08:34 -07:00
k8s-merge-robot
80f2d89a79 Merge pull request #13087 from ZJU-SEL/specify-garbage-collection
Auto commit by PR queue bot
2015-09-02 17:08:54 -07:00
Abhi Shah
657622631f Merge pull request #13487 from caesarxuchao/swagger-for-expapi
Genereate types_swagger_doc_generated.go for expapi
2015-09-02 16:56:55 -07:00
Brendan Burns
5048464445 Add Forever, syntactic sugar on Until 2015-09-02 16:49:05 -07:00
Brendan Burns
aafbd26dfb Merge pull request #13533 from brendandburns/fix
Fix the build.
2015-09-02 16:14:33 -07:00
Brendan Burns
395bbc4b1b Fix the build. 2015-09-02 15:45:44 -07:00
Abhi Shah
d6d6bd825d Merge pull request #13529 from eparis/submit-queue-whitelist-link
Fix the link to the submit-queue whitelist
2015-09-02 15:17:26 -07:00
Abhi Shah
13784bf9ca Merge pull request #13047 from JanetKuo/kubectl-label-bash-completion
Enable kubectl label resource type bash completion
2015-09-02 15:16:54 -07:00
Abhi Shah
642ebb4994 Merge pull request #13099 from JanetKuo/kubectl-expose-deprecate-create-external-load-balancer
Deprecated kubectl flag "create-external-load-balancer"
2015-09-02 15:16:08 -07:00
Abhi Shah
b6aac3633d Merge pull request #13415 from JanetKuo/kubectl-rolling-bash-completion
Enable kubectl rolling-update rc name bash completion
2015-09-02 15:14:21 -07:00