Eric Paris
06c1fe4567
Instructions to back-merge release branches into master
...
This allows us to continue on branched like v0.14.1, v0.14.2, and tag on
that branch. But it will merge those tags into master so git describe
picks up the changes.
2015-04-01 14:36:52 -07:00
Eric Paris
eb4568b32a
update instructions to make it clear to get review
2015-04-01 14:36:41 -07:00
Clayton Coleman
dec3209229
Merge pull request #6246 from derekwaynecarr/finalize_fix
...
Fix Namespace Termination
2015-04-01 17:34:56 -04:00
Daniel Smith
dedd4b052a
Remove pods from the assumed pod list when they are deleted
2015-04-01 14:34:15 -07:00
Dawn Chen
ab1a8b1e7c
Merge pull request #6298 from roberthbailey/kubelet-config
...
Remove salt configuration that matches the default settings in the Kubelet.
2015-04-01 14:31:31 -07:00
Alex Robinson
2db427a34a
Merge pull request #6293 from kargakis/delete-short-msg
...
Update delete short usage message
2015-04-01 14:20:14 -07:00
Robert Bailey
22d9c67cb7
Merge pull request #6190 from liggitt/client_cert_auth
...
Add client cert authentication
2015-04-01 14:11:29 -07:00
Robert Bailey
96a0a0d618
Merge pull request #6309 from GoogleCloudPlatform/revert-6243-kubelet-ssl
...
Revert "Configure the kubelet to use HTTPS"
2015-04-01 14:09:37 -07:00
Dawn Chen
96b0f0a170
Small cleanup on api/types.go
2015-04-01 14:04:17 -07:00
Derek Carr
2af9b54147
Merge pull request #6259 from zmerlynn/fix_cloud_provider
...
Eliminate grains.cloud_provider (in preference to grains.cloud) from SaltStack
2015-04-01 17:04:05 -04:00
Robert Bailey
32a1c052dc
Revert "Configure the kubelet to use HTTPS"
2015-04-01 13:59:31 -07:00
derekwaynecarr
dbe4d42934
Update design doc for limit range change
2015-04-01 16:54:21 -04:00
derekwaynecarr
c2b670513c
Introduce concept of a default limit
2015-04-01 16:31:25 -04:00
Vish Kannan
d010b2a34e
Merge pull request #5560 from erictune/secrets_doc
...
Secrets doc
2015-04-01 13:24:19 -07:00
Brian Grant
7450da41f1
Merge pull request #6094 from ddysher/remove-reachability
...
Remove Reachable Condition
2015-04-01 13:16:47 -07:00
goltermann
a0e78df2d3
Update issues.md
...
Updating priority definitions - open for discussion if there are other opinions.
2015-04-01 13:00:37 -07:00
Zach Loafman
ba22494e5f
Merge pull request #6305 from jlowdermilk/remove-unused-vars
...
Remove unused variables from build scripts
2015-04-01 12:58:44 -07:00
Zach Loafman
8078a6ac3d
Merge pull request #6221 from ArtfulCoder/etcd_pod
...
Run etcd 2.0.5 in a pod
2015-04-01 12:54:46 -07:00
Zach Loafman
04026efa17
Merge pull request #6303 from roberthbailey/liveness-sh
...
Remove liveness.sh.
2015-04-01 12:45:59 -07:00
Jeff Lowdermilk
45639d9e2d
Remove unused variables from build scripts
2015-04-01 12:28:31 -07:00
Robert Bailey
40ebed845f
Remove salt configuration that matches the default settings in
...
the Kubelet.
2015-04-01 12:13:40 -07:00
Robert Bailey
836fb4ac0b
Remove liveness.sh.
2015-04-01 11:56:39 -07:00
Abhishek Shah
8e3a41b52c
Run etcd 2.0.5 in a pod
2015-04-01 11:38:21 -07:00
Deyuan Deng
6bb9701489
Remove Reachable Condition
2015-04-01 13:56:43 -04:00
Jordan Liggitt
c797a91e36
Add client cert authentication
2015-04-01 13:42:26 -04:00
Eric Tune
92b6f49b3c
Merge pull request #6243 from roberthbailey/kubelet-ssl
...
Configure the kubelet to use HTTPS
2015-04-01 10:33:15 -07:00
Tim Hockin
005da75f4a
Make the build faster - call 'go install' once
2015-04-01 10:10:27 -07:00
Zach Loafman
f7f133784f
Merge pull request #6268 from jlowdermilk/e2e-gcr
...
Pull e2e images from gcr.io
2015-04-01 10:01:57 -07:00
Jeff Lowdermilk
cfc04f41b8
Updates for gcloud changes (alpha, kubeconfig)
2015-04-01 09:27:06 -07:00
Jeff Lowdermilk
2d8e93f8b4
e2e images pulled from gcr.io
2015-04-01 09:18:03 -07:00
Jeff Lowdermilk
506887515d
Rename google-containers to google_containers in image names
2015-04-01 09:16:48 -07:00
Robert Bailey
dd9ec46cc0
Fix test-cmd to work with the kubelet listening on HTTPS.
2015-04-01 09:09:29 -07:00
Robert Bailey
58bc792e68
Configure the master to connect to the kubelet using HTTPS.
2015-04-01 09:09:29 -07:00
Robert Bailey
d0f48b68d8
Configure the Kubelet to listen on HTTPS. If no certificates are
...
provided on the command line, generate self-signed certs.
2015-04-01 09:09:29 -07:00
Victor Marmol
fb1a8219d4
Merge pull request #6296 from yujuhong/timeout
...
Increase the timeouts in integration test
2015-04-01 08:56:08 -07:00
Zach Loafman
66d37b56fd
Merge pull request #6297 from pmorie/fix-6294
...
Fix issue 6294: networking e2e should set args, not command
2015-04-01 08:51:48 -07:00
Paul Morie
0335e350c7
Fix issue 6294: networking e2e should set args, not command
2015-04-01 11:40:23 -04:00
Yu-Ju Hong
4d28ad36ca
Increase the timeouts in integration test
...
There has been test flakes on Shippable caused by timeout waiting for pods to
be running. Increase the timeouts to alleviate the problem.
2015-04-01 08:34:14 -07:00
Zach Loafman
b581320bf7
Eliminate grains.cloud_provider (in preference to grains.cloud) from SaltStack
...
This variable can be entirely derived from grains.cloud, and it
simplifies the configuration somewhat. (Or someone convince me I'm
wrong. I'm happy to be wrong here.)
2015-04-01 08:32:32 -07:00
derekwaynecarr
b745f51c65
Client must specifiy a resource version on finalize
2015-04-01 11:16:45 -04:00
kargakis
3c09d4d383
Update delete short usage message
2015-04-01 17:14:13 +02:00
Derek Carr
762c449043
Merge pull request #6262 from zmerlynn/rm_master_ip
...
rm Salt grains.master_ip
2015-04-01 11:10:48 -04:00
gmarek
b9babb56b0
Merge pull request #6283 from AntonioMeireles/fix_typo
...
Fix typo in spelling in cluster/vagrant/util.sh.
2015-04-01 13:59:30 +02:00
António Meireles
7680c2f771
fix typo in spelling.
...
Signed-off-by: António Meireles <antonio.meireles@reformi.st>
2015-04-01 10:43:52 +01:00
Filip Grzadkowski
151b2efa20
Merge pull request #6274 from wojtek-t/dont_run_density
...
Don't run Density test in e2e runs until #6059 is fixed
2015-04-01 10:49:20 +02:00
Wojciech Tyczynski
c5597efc0c
Don't run Density test in e2e runs until #6059 is fixed
2015-04-01 09:23:09 +02:00
Piotr Szczesniak
81683441b9
Merge pull request #6156 from gmarek/retry_loop
...
Add a retry loop to UpdateStatus in NodeController
2015-04-01 09:16:11 +02:00
Zach Loafman
0806e3bde0
rm Salt grains.master_ip
...
This appears in the Salt documentation, is set by Vagrant, but has no
consumers. Remove vestigial references.
2015-03-31 17:31:47 -07:00
Victor Marmol
2de37624e8
Merge pull request #6252 from krousey/string_format_cleanup
...
Fixing a lot of string formatting issues
2015-03-31 16:57:36 -07:00
Zach Loafman
7094badf94
Merge pull request #6258 from zmerlynn/fix_gke_util
...
Fix gke/util.sh
2015-03-31 16:51:03 -07:00
