Clayton Coleman
880ecef6fe
Move locks on watch to allow testing blocking
2015-01-07 14:38:38 -05:00
Clayton Coleman
31fc19efe9
Watching on invalid label/field selectors should error
2015-01-07 14:38:38 -05:00
Joe Beda
c8244cd1b3
Merge pull request #3276 from zmerlynn/fix_common_sh_break
...
Commit f1fed3b
broke gcs::release in this function, breaking the build.
2015-01-07 11:14:34 -08:00
Zach Loafman
c3858ab322
Commit f1fed3b
broke gcs::release in this function, breaking
...
the build.
2015-01-07 11:10:08 -08:00
Clayton Coleman
41e7b2515b
Merge pull request #3273 from smarterclayton/fix_master_conflict
...
Fix inflight merge conflict by adapting rollingupdate to #2861
2015-01-07 14:05:47 -05:00
Clayton Coleman
e0f0b9c588
Fix inflight merge conflict by adapting rollingupdate to #2861
...
ClientConfig changed right as rollingupdate was introduced.
2015-01-07 13:51:43 -05:00
Clayton Coleman
585d2c8cbd
Merge pull request #2861 from deads2k/deads-add-clicfg-types
...
add kubeconfig types
2015-01-07 13:35:50 -05:00
bgrant0607
6e24273937
Merge pull request #3061 from jlowdermilk/rollingupdate
...
Add a rollingupdate lib and command to kubectl
2015-01-07 10:33:39 -08:00
Brendan Burns
005ca49d02
Merge pull request #3254 from pires/hazelcast-example
...
Add an example of running Cloud Native Hazelcast on k8s.
2015-01-07 10:20:06 -08:00
deads2k
0e688dc271
add kubeconfig file
2015-01-07 13:09:10 -05:00
Zach Loafman
fd9d2df6e1
Merge pull request #3238 from zmerlynn/gcs_bucket
...
Add script to push CI artifacts to gs://kubernetes-release/ci
2015-01-07 10:08:43 -08:00
Brendan Burns
3d8289258a
Merge pull request #3106 from brendandburns/simple
...
Add a script suitable for wget https://get.k8s.io | sh installation
2015-01-07 10:05:26 -08:00
deads2k
12ecd0fa49
bump(imdario/mergo):6633656539c1639d9d78127b7d47c622b5d7b6dc
2015-01-07 13:00:39 -05:00
Tim Hockin
512e262dc8
Merge pull request #3264 from brendandburns/race
...
Add a lock around the other docker pull.
2015-01-07 09:54:47 -08:00
Tim Hockin
b7120f27f0
Merge pull request #3265 from rjnagal/cleanup
...
Fix few vet errors.
2015-01-07 09:21:03 -08:00
Tim Hockin
051db1de99
Merge pull request #2637 from erictune/service_env_var_2
...
Added e2e test: checks service env vars created.
2015-01-07 08:26:07 -08:00
Tim Hockin
ed477a9202
Merge pull request #3245 from satnam6502/es-dns
...
Use DNS for Elasticsearch
2015-01-07 08:25:49 -08:00
Clayton Coleman
cdd14a4db3
Merge pull request #3252 from jbeda/simple-clean
...
Make 'make clean' work with Docker not installed.
2015-01-07 10:55:16 -05:00
Paulo Pires
cd946abaf0
Updated discovery source code example.
2015-01-07 12:04:59 +00:00
Paulo Pires
2c6211e692
Fixed typos.
2015-01-07 09:25:47 +00:00
Rohit Jnagal
62ecd5f3ff
Fix few vet errors.
...
There are quite a few 'composite literal uses unkeyed fields' errors that I have kept out of this patch.
And there's a couple where vet just seems confused. These are the easiest ones.
2015-01-07 08:40:16 +00:00
Brendan Burns
7c69570663
Add a lock around the other docker pull.
...
Fixes e2e (I hope), certainly passes e2e in my client.
2015-01-07 00:17:57 -08:00
Brendan Burns
4c57ec0f56
Merge pull request #3262 from brendandburns/race
...
Revert "Avoid race between image pull and garbage collect"
2015-01-06 23:24:46 -08:00
Brendan Burns
733e12e19b
Revert "Avoid race between image pull and garbage collect"
...
This reverts commit 6f14e2e210
.
2015-01-06 23:23:23 -08:00
Brendan Burns
e84b4d03a4
Merge pull request #3183 from anguslees/pull-lock
...
Avoid race between image pull and garbage collect
2015-01-06 21:23:29 -08:00
Eric Tune
441445fae4
Added e2e test: checks service env vars created.
2015-01-06 20:50:58 -08:00
Jeff Lowdermlk
0ab39df66b
Add a rollingupdate lib and command to kubectl
...
Also decouple conditions from client for testability.
2015-01-06 17:29:05 -08:00
Tim Hockin
ded3ef2827
Merge pull request #1185 from lavalamp/numeric
...
Numeric type for resources
2015-01-06 17:05:08 -08:00
Eric Tune
f11f0de455
Merge pull request #3251 from dchen1107/cleanup
...
Surfacing events for pods created by config files.
2015-01-06 16:29:38 -08:00
Daniel Smith
cd58e49c78
remove 'i' and nasty rounding; test
2015-01-06 16:13:17 -08:00
Dawn Chen
e3c019128e
Add EventSource to api to have both Component and Host information.
2015-01-06 16:08:20 -08:00
Dawn Chen
2b91c1417c
Create selfLink for pods from config files and indicate hostname as part of event source.
2015-01-06 16:08:20 -08:00
Brendan Burns
3a4d5fd6a2
Merge pull request #3256 from dchen1107/clean
...
Remove dependency of podex from travis config
2015-01-06 15:58:33 -08:00
Dawn Chen
239f25c30a
Remove dependency of podex from travis config
2015-01-06 15:42:12 -08:00
Daniel Smith
2d2df5593c
Add examples & clarify comments further
2015-01-06 15:18:22 -08:00
Brendan Burns
1091744a5f
Address comments.
2015-01-06 15:02:32 -08:00
Paulo Pires
4d45512069
Add an example of running Cloud Native Hazelcast on k8s.
2015-01-06 22:25:41 +00:00
Eric Tune
58abb40f6c
Merge pull request #860 from smarterclayton/isolate_kubelet_from_etcd
...
Proposal: Isolate kubelet from etcd
2015-01-06 13:28:46 -08:00
Daniel Smith
4b61dc84cb
Merge pull request #3223 from liggitt/default_conversion
...
Make default conversion behavior available to conversion funcs
2015-01-06 13:22:25 -08:00
Satnam Singh
b56e0ece9e
Merge pull request #3241 from thockin/dns_for_files
...
Enable DNS for pods from files
2015-01-06 13:11:09 -08:00
Tim Hockin
1ec3457fc9
Beef up validation tests
2015-01-06 13:02:42 -08:00
Tim Hockin
8b42534f77
Fix kubelet config tests
2015-01-06 13:02:41 -08:00
Tim Hockin
6e8f5fea8e
Fix validation for BoundPods to allow defaults
...
Thunking to Manifest makes a copy of the input, which is not useful for
defaulting.
2015-01-06 13:02:41 -08:00
Tim Hockin
33fcef6b42
Convert DNSPolicy wrt ContainerManifest
2015-01-06 13:02:40 -08:00
Eric Tune
ee2f63a877
Merge pull request #3221 from thockin/integ
...
Reduce verbosity on integration tests
2015-01-06 12:50:38 -08:00
Daniel Smith
937d88d829
Merge pull request #3240 from brendandburns/tap
...
Fix the service proxy to re-poll on watch closure no matter what.
2015-01-06 11:59:11 -08:00
Eric Tune
2c25ca229f
Merge pull request #3242 from thockin/name_is_required
...
Never set pod.Name in kubelet config code
2015-01-06 11:45:04 -08:00
Brendan Burns
0f60d7bca3
Reset the resourceVersion so that we poll again for non-timeout errors.
2015-01-06 11:45:03 -08:00
Eric Tune
823d878b30
Merge pull request #3246 from zmerlynn/newline_printable
...
Fix newlines in TAP stdout/stderr output
2015-01-06 11:41:08 -08:00
Joe Beda
4b94829cf2
Make 'make clean' work with Docker not installed.
...
Fixes #1959 .
2015-01-06 11:36:35 -08:00