github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity
3,934 Commits 42 Branches 7,905 Tags 1.3 GiB
373cf77ae1
Commit Graph

3934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brendan Burns
373cf77ae1 Adjust the regexp so that we can handle extra sub versions. 2014-12-02 23:00:01 -08:00
bgrant0607
5c31fedfc8 Merge pull request #2507 from MikeJeffrey/docs 
Update to readme.md
 2014-12-02 14:54:09 -08:00
Brendan Burns
6ec5da9f6a Merge pull request #2706 from vishh/monitoring_e2e 
Adding an e2e test for monitoring.
 2014-12-02 14:00:18 -08:00
Brendan Burns
572f280a99 Merge pull request #2723 from erictune/cleanup1 
Fix link.
 2014-12-02 13:58:12 -08:00
Eric Tune
bd2541ac02 Fix link. 2014-12-02 13:55:36 -08:00
Tim Hockin
f4b031d025 Merge pull request #2514 from thockin/label-ns 
Add label key namespacing
 2014-12-02 13:38:46 -08:00
MikeJeffrey
7c9698f1be Updated readme.md 2014-12-02 13:20:48 -08:00
Brendan Burns
346dbc6de7 Merge pull request #2716 from zulily/fix-gce-provision-with-gcp-logging 
Fix GCE scopes when using GCP Logging
 2014-12-02 12:40:56 -08:00
Jeff Lowdermilk
b30633b8c8 Merge pull request #2718 from brendandburns/fix 
Add some backward compatability for GKE.
 2014-12-02 11:59:48 -08:00
Brendan Burns
bf9d4a483d Merge pull request #2717 from erictune/event_e2e_flake 
Fix e2e failure of events test.
 2014-12-02 11:33:48 -08:00
Brendan Burns
b07515c5ea Add some backward compatability for GKE. 2014-12-02 11:32:45 -08:00
Eric Tune
a7718054a8 Fix e2e failure of events test. 2014-12-02 11:20:23 -08:00
Daniel Smith
d927031aec Merge pull request #2705 from brendandburns/fix 
Fix a logic error in the events e2e test.
 2014-12-02 10:49:26 -08:00
Steve Reed
d229c5ba51 Proper appending of logging.write scope to array 2014-12-02 10:29:10 -08:00
Eric Tune
43e66f4fe2 Merge pull request #2713 from komljen/master 
Remove empty lines when file is generated from jinja template
 2014-12-02 10:03:21 -08:00
Eric Tune
860d845d2c Merge pull request #2588 from lavalamp/fix4 
Relax search criteria to find both pod & bound pod events
 2014-12-02 09:40:32 -08:00
Eric Tune
e2c704de11 Merge pull request #2709 from mindscratch/master 
Update exec health check message logged
 2014-12-02 09:20:43 -08:00
Alen Komljen
d83d269c27 Remove empty lines when file is generated from jinja template 2014-12-02 15:00:58 +01:00
Craig Wickesser
1c02137f48 Update exec health check message logged 
Update message logged after performing exec health check per #2708.
 2014-12-02 07:15:02 -05:00
Vishnu Kannan
090eb966f2 Adding an e2e test for monitoring. 2014-12-02 06:54:59 +00:00
Brendan Burns
92e8ebcb55 Fix a logic error in the events e2e test. 2014-12-01 22:40:00 -08:00
Brendan Burns
993ef88eec Merge pull request #2689 from brendandburns/standalone 
Refactor kubelet, standalone k8s and integration test to all use the same code.
 2014-12-01 21:53:41 -08:00
Daniel Smith
3b2fa9618d Relax search criteria to find both pod & bound pod events 2014-12-01 17:19:42 -08:00
Joe Beda
7ee75893e1 Merge pull request #2698 from brendandburns/release 
Release 0.6.0
 2014-12-01 16:31:38 -08:00
Brendan Burns
20a0d79bf4 Kubernetes version v0.6.0 2014-12-01 16:26:48 -08:00
Brendan Burns
85fbcdb981 Kubernetes version v0.6.0-dev 2014-12-01 16:26:48 -08:00
Brendan Burns
d47b510104 Refactor kubelet, standalone k8s and integration test to all use the same code. 2014-12-01 15:37:21 -08:00
Brendan Burns
6b009f06cd Merge pull request #2635 from thockin/public-ip 
Enable public IPs even in not createExternal...
 2014-12-01 14:56:22 -08:00
Joe Beda
484388479c Merge pull request #2692 from jameskyle/develop 
Support remote docker hosts on OS X.
 2014-12-01 13:41:03 -08:00
Tim Hockin
89875ef09d Loosen DNS 952 for labels 2014-12-01 12:30:43 -08:00
Tim Hockin
c857dc1196 Add namespacing for label keys 2014-12-01 12:30:43 -08:00
Tim Hockin
d5a6a54391 clean up error message on labels validation errs 2014-12-01 12:30:43 -08:00
Brendan Burns
b9b7c47da3 Merge pull request #2620 from jbeda/insecure-registry-fix 
For GCE, allow insecure registries anywhere in 10.0.0.0/8.
 2014-12-01 12:13:12 -08:00
James Kyle
361c8dbae5 Support remote docker hosts on OS X. 
This commit brings two main changes, notably:

Two new options that can be set as environment variables

- DOCKER_OPTS: any arbitrary set of docker options. Example: --tlsverify
- DOCKER_NATIVE: This forces the use of the native docker available.
                 This is most useful if you're on OS X and do not want
                 to use boot2docker.

Now uses 'docker cp' instead of tar piping to transfer files. This
currently must be done by copying the binaries off of the docker volume
and into a local filesystem (/tmp) before a docker cp is done. This
workaround will no longer be necessary after bug fix
https://github.com/docker/docker/pull/8509 makes it into stable.

This was necessary because the tar | tar method was creating corrupted
archives on OS X even with the < /dev/null workaround.
 2014-12-01 11:47:16 -08:00
Joe Beda
f8505cd286 For GCE, allow insecure registries anywhere in 10.0.0.0/8. 2014-12-01 11:36:08 -08:00
Joe Beda
00477c3813 Merge pull request #2601 from hallucynogenyc/patch-1 
Updated instructions for locally running kubernetes
 2014-12-01 10:28:45 -08:00
Joe Beda
0ef920b4f4 Merge pull request #2648 from komljen/master 
Remove unused nsinit salt state
 2014-12-01 10:28:16 -08:00
Joe Beda
e728864cf4 Merge pull request #2650 from seano314/patch-1 
Updating links
 2014-12-01 10:27:58 -08:00
Joe Beda
447688795c Merge pull request #2658 from satnam6502/fluentd-es-image 
Make output of td-agent quieter
 2014-12-01 10:27:49 -08:00
Joe Beda
dcd711ab2f Merge pull request #2670 from andrewmichaelsmith/patch-3 
Change nginx bind port so it doesn't conflict
 2014-12-01 10:27:38 -08:00
Eric Tune
632e5d0592 Merge pull request #2690 from bgrant0607/docfix 
Document that the resource model has not yet been implemented.
 2014-12-01 10:14:38 -08:00
Brendan Burns
50cf0c1b23 Merge pull request #2668 from meirf/set-initial-udp-proxy-timeout 
Set initial timeout upon UDP proxy connection creation
 2014-12-01 10:14:23 -08:00
Brendan Burns
b61168835d Merge pull request #2666 from mattmoor/master 
add another registry URL
 2014-12-01 10:12:31 -08:00
Brian Grant
b3db2e4d14 Document that the resource model has not yet been implemented. 2014-12-01 18:07:25 +00:00
bgrant0607
58df7dd263 Merge pull request #2671 from andrewmichaelsmith/patch-4 
Fix label yml
 2014-12-01 09:26:45 -08:00
Clayton Coleman
fec9cdb7c9 Merge pull request #2660 from VojtechVitek/accessor_labels_annotations 
Add Labels and Annotations to MetadataAccessor
 2014-12-01 12:23:22 -05:00
Vojtech Vitek (V-Teq)
28f5d51a5f Add Labels and Annotations to MetadataAccessor 2014-12-01 16:36:24 +01:00
Vojtech Vitek (V-Teq)
508724b1f8 meta_test should not depend on runtime.TypeMeta 2014-12-01 16:36:21 +01:00
Andrew Smith
1c2cea9c10 Fix label yml 
I was getting: invalid value 'map[]': selector does not match template with the -
 2014-11-30 15:26:47 +00:00
Andrew Smith
5282be9a86 Change nginx bind port so it doesn't conflict 
Currently if you follow this guide when it comes to starting nginx you get this error:

    Error starting userland proxy: listen tcp 0.0.0.0:8080

Because Kubernetes is already listening on :8080, so you can't bind nginx to :8080, so I've changed it to :8081
 2014-11-30 11:14:24 +00:00