Commit Graph

7183 Commits

Author SHA1 Message Date
Piotr Szczesniak
b813ebadee Revert "GCE tokens behavior to new format" 2015-09-04 10:26:19 +02:00
Piotr Szczesniak
57e35b794f Merge pull request #13445 from hurf/ru_out
Make -o option working for rolling-update
2015-09-04 09:11:28 +02:00
Piotr Szczesniak
30d7f0e101 Merge pull request #13449 from ihmccreery/tokens
GCE tokens behavior to new format
2015-09-04 09:11:09 +02:00
Piotr Szczesniak
b7ac895fc2 Merge pull request #13474 from ivant/fix-scope-matching
Recognize cloud-platform scope on GCP
2015-09-04 09:10:07 +02:00
Piotr Szczesniak
b2cfb8cb8e Merge pull request #13486 from JanetKuo/kubectl-rolling-generateName
Fix the bug that rolling-update throws error when using generateName
2015-09-04 09:07:45 +02:00
Piotr Szczesniak
6698257239 Merge pull request #13523 from roofmonkey/experimental-api-fixes
Experimental api fixes
2015-09-04 09:07:14 +02:00
Piotr Szczesniak
14f4d3ad0e Merge pull request #13425 from jszczepkowski/hpa-kind
Fixed kind to resource convertion in scale client.
2015-09-04 09:04:00 +02:00
Piotr Szczesniak
fcbf63f3f3 Merge pull request #13509 from wojtek-t/refactor_etcd_delete_test
Refactor registry etcd delete tests
2015-09-04 09:03:26 +02:00
Timothy St. Clair
2b7e758c3c Fixes the experimental api, which appeared to be completely broken.
Fix for rebase with nikhiljindal/deploymentController
2015-09-03 21:56:45 -05:00
Abhi Shah
0758a298db Merge pull request #13366 from feihujiang/printValidContainersNames
Print valid container names when the command not specify the container
2015-09-03 16:36:27 -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
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
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
d5358f0f7e Merge pull request #13537 from stevekuznetsov/skuznets/typo
fixed error typo
2015-09-03 13:11:44 -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
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
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
derekwaynecarr
5dc74e8dbf Add support for CFS quota in kubelet 2015-09-03 13:44:28 -04: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
hurf
65bfd3541f Make -o option working for rolling-update
Use simple message to show the result. If -o is specified, print
updated rc.
2015-09-03 20:29:58 +08:00
kargakis
edfaa480cf queryparams: Handle pointer fields in structs 2015-09-03 13:45:31 +02:00
Wojciech Tyczynski
97b4a64e2c Refactor registry etcd delete tests 2015-09-03 09:05:17 +02: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
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
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
395bbc4b1b Fix the build. 2015-09-02 15:45:44 -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
Nikhil Jindal
aeeffbd665 Merge pull request #13419 from nikhiljindal/deploymentController
Adding support for deployments to client library
2015-09-02 14:26:50 -07:00
Isaac Hollander McCreery
d3398e2aed GCE tokens behavior to new format 2015-09-02 14:13:51 -07:00
k8s-merge-robot
e8cda9dc92 Merge pull request #13310 from markturansky/volume_config
Auto commit by PR queue bot
2015-09-02 14:05:30 -07:00
Abhi Shah
1b0cf281e5 Merge pull request #13000 from brendandburns/schema-api-2
Add support for dynamic APIs
2015-09-02 13:53:28 -07:00
Janet Kuo
c9beb5b39c Fix the bug that rolling-update throws error when using generateName 2015-09-02 13:30:14 -07:00
Abhi Shah
efdcd9f8e8 Merge pull request #13519 from ironcladlou/test-fix
Refactor test to use new fake reactors
2015-09-02 11:41:18 -07:00
Brendan Burns
eb58220e7e Merge branch 'master' of https://github.com/GoogleCloudPlatform/kubernetes 2015-09-02 10:48:38 -07:00
Dan Mace
347b9334e2 Refactor test to use new fake reactors
Fix a test compilation error by refactoring the test code to use
the latest fake reactor framework.
2015-09-02 13:45:32 -04:00
Brendan Burns
2df5010834 Merge branch 'sdminonne-container_sidecar' 2015-09-02 10:42:08 -07:00
Brendan Burns
3e407aebb2 Diable a broken unit test 2015-09-02 10:39:17 -07:00
Chao Xu
530a9a0238 cover expapi when genereate types_swagger_doc_generated.go 2015-09-02 10:01:40 -07:00
Abhi Shah
067e76b509 Merge pull request #13348 from thockin/kubelet-masq-rule
Don't name 'eth0' in MASQUERADE rule
2015-09-02 09:54:31 -07:00