github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity
4,255 Commits 42 Branches 7,905 Tags 1.3 GiB
f2a5457296
Commit Graph

4255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brendan Burns
f2a5457296 Merge pull request #2952 from satnam6502/colour 
Avoid redeclaration errors for kube-up.sh
 2014-12-15 15:33:33 -08:00
Satnam Singh
c928c43a15 Avoid redeclaration errors for kube-up.sh 2014-12-15 15:23:04 -08:00
bgrant0607
9bc8915eeb Merge pull request #2912 from smarterclayton/small_v1beta3_refactors_2 
More small refactors for v1beta3 -> internal
 2014-12-15 15:16:36 -08:00
Brendan Burns
3add708390 Merge pull request #2950 from zulily/rax-master-ip-loop 
Look up master node IP address in a loop
 2014-12-15 15:05:54 -08:00
Brendan Burns
2c64db5943 Merge pull request #2938 from vishh/exec 
Updated docker version that supports exec to '1.3.0'.
 2014-12-15 14:49:12 -08:00
Joe Beda
cf5eff0cc2 Merge pull request #2925 from mscherer/patch-1 
Fix typo in comment
 2014-12-15 14:42:12 -08:00
Steve Reed
eb0a11717f Look up master node IP address in a loop 2014-12-15 14:38:30 -08:00
Clayton Coleman
d9ad8cfac0 Conversions missing from v1beta1 
They were in v1beta2, not sure how they got removed.
 2014-12-15 16:50:05 -05:00
Clayton Coleman
dadb8431c4 Remove internal PodState in favor of internal PodStatus object 2014-12-15 16:50:05 -05:00
Clayton Coleman
787b5c488a Add PodIP and Image to v1beta3 
Fixes #2900
 2014-12-15 16:50:05 -05:00
Clayton Coleman
1f442d4429 Remove LivenessProbe.Type in v1beta3 2014-12-15 16:50:05 -05:00
bgrant0607
9b40c52c24 Merge pull request #2910 from smarterclayton/small_v1beta3_refactors 
Fix internal -> v1beta3 round trip issues
 2014-12-15 13:21:12 -08:00
Daniel Smith
f1f20f820a Merge pull request #2942 from brendandburns/kubelet 
revert the revert along with fixes to make it pass e2e tests.
 2014-12-15 13:17:52 -08:00
Joe Beda
d6ffede020 Merge pull request #2946 from mbforbes/allGcloud 
Use GCLOUD var consistentl over gcloud in tests.
 2014-12-15 13:11:43 -08:00
Daniel Smith
a2638da2a7 Merge pull request #2899 from derekwaynecarr/update_generic_etcd 
Update generic etcd to enable namespace scoped resources
 2014-12-15 13:10:51 -08:00
Max Forbes
f9108c62c2 Use GCLOUD var consistently. 2014-12-15 13:08:10 -08:00
Joe Beda
056fdbb9b8 Merge pull request #2943 from brendandburns/flags 
Add a log level flag.
 2014-12-15 12:59:08 -08:00
Vishnu Kannan
f4ef05bc20 Updated docker version that supports exec to '1.3.0'. 2014-12-15 20:44:58 +00:00
bgrant0607
e37e25807c Merge pull request #2921 from satnam6502/fluentd-ek-colo 
Fix error in Fluenetd->ES colo pod definition
 2014-12-15 12:19:44 -08:00
Brendan Burns
878d85df0c Add a log level flag. 2014-12-15 12:00:29 -08:00
Joe Beda
203f8a896b Merge pull request #2941 from mbforbes/gceTests 
Improve e2e tests
 2014-12-15 11:55:11 -08:00
Max Forbes
bea37d5b17 Fix up e2e tests. 2014-12-15 11:53:51 -08:00
Brendan Burns
bf1a695be5 Merge pull request #2882 from bgrant0607/bugfix1 
Count only non-dead pods in replicationController current state replicas count
 2014-12-15 11:50:12 -08:00
Brendan Burns
2d1b279311 Merge pull request #2905 from smarterclayton/misc_cleanup 
Small fixes to prepare for v1beta3
 2014-12-15 11:49:29 -08:00
Brendan Burns
af4fb611cf Merge pull request #2913 from smarterclayton/side_by_side_diff 
Add a side-by-side diff option for verbose output
 2014-12-15 11:48:08 -08:00
Brendan Burns
19c88643b8 Merge pull request #2923 from satnam6502/kubelet-log 
Collect Kubelet logs with Fluentd->(Elasticsearch|Cloud Logging)
 2014-12-15 11:46:33 -08:00
Brendan Burns
e5ae689b79 Merge pull request #2937 from jdef/proxy_failfast 
proxy should fail fast if proxier is nil, rather than panic later
 2014-12-15 11:45:27 -08:00
Brendan Burns
68c1ac210b Merge pull request #2940 from deads2k/deads-validate-cluster-broken 
validate-cluster is broken for vagrant
 2014-12-15 11:44:58 -08:00
Brendan Burns
d345dda1e5 Fix the kubelet uses api encode/decode by actually adding PodContainerInfo to v1beta1 2014-12-15 11:38:55 -08:00
Joe Beda
26e5c1d0eb Merge pull request #2928 from rajdeepd/master 
Added test cases for Event Create and Event List
 2014-12-15 11:11:37 -08:00
Joe Beda
c1d10826c0 Merge pull request #2939 from MikeJeffrey/101 
Update docs/README.md: add TOC / doc descriptions.
 2014-12-15 11:07:46 -08:00
deads2k
81e01e5099 validate-cluster is broken 2014-12-15 14:07:38 -05:00
MikeJeffrey
f5a2e2637c Update docs/README.md: add TOC / doc descriptions. 2014-12-15 10:43:17 -08:00
James DeFelice
e27b8f0df7 proxy should fail fast if proxier is nil, rather than panic later 2014-12-15 12:56:35 -05:00
Brendan Burns
f81b6b218e Merge pull request #2936 from deads2k/deads-fix-vagrant 
fix e2e for all providers except gce
 2014-12-15 09:49:20 -08:00
Brendan Burns
a6f967b6e7 Revert "Revert "Add an api object for the kubelet, and a versioned endpoint."" 
This reverts commit dcfcf315e5.
 2014-12-15 09:29:04 -08:00
bgrant0607
1abc3e423c Merge pull request #2796 from jhadvig/stream_logs 
Streaming container logs
 2014-12-15 08:24:10 -08:00
deads2k
fd53795bc9 fix e2e for all providers except gce 2014-12-15 11:04:13 -05:00
derekwaynecarr
92e2c2b302 Updated default function names, keyroot to keyrootfunc 2014-12-15 10:42:13 -05:00
derekwaynecarr
6353612f40 Update generic etcd to enable namespace scoped resources 2014-12-15 10:42:13 -05:00
jhadvig
019ca75fc6 Streaming container logs 2014-12-15 12:12:11 +01:00
Rajdeep Dua
a6fd5601c2 Added test cases for 
* Event Create
* Event List
 2014-12-14 21:41:34 -08:00
mscherer
0dddaa3a42 Fix typo in comment 2014-12-15 01:07:05 +01:00
Satnam Singh
b4fcdd7e47 Collect Kubelet logs with Fluentd->Elasticsearch and Fluentd->Cloud Logging 2014-12-14 01:47:48 -08:00
Satnam Singh
49d5a0e2bd Fix error in Fluenetd->ES colo service 2014-12-14 00:06:06 -08:00
Brendan Burns
5ef34bf523 Merge pull request #2919 from brendandburns/kubelet 
Revert "Add an api object for the kubelet, and a versioned endpoint."
 2014-12-12 22:19:19 -08:00
Brendan Burns
dcfcf315e5 Revert "Add an api object for the kubelet, and a versioned endpoint." 
This reverts commit d4b9979382.
 2014-12-12 21:13:44 -08:00
Daniel Smith
121a291a0c Merge pull request #2915 from satnam6502/robust 
Add missing detect-project to detect-minions
 2014-12-12 18:40:15 -08:00
Clayton Coleman
1edff23935 Merge pull request #2916 from lavalamp/fix3 
Fix taking addr() of map value/key
 2014-12-12 20:12:25 -05:00
Daniel Smith
3868417ec5 Merge pull request #2917 from dchen1107/cleanup 
Make httplog more useful by using glog.*Depth.
 2014-12-12 16:44:10 -08:00