github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
11,852 Commits
32 Branches
881 Tags
633 MiB
Commit Graph

11852 Commits (4318ca5a8b2ae2e180da356bfb0e1543e6d05593)

Author SHA1 Message Date
Tim Hockin 4318ca5a8b Rename 'portal IP' to 'cluster IP' most everywhere 
This covers obvious transforms, but not --portal_net, $PORTAL_NET and
similar.
 2015-05-28 16:10:44 -07:00
Tim Hockin 46686616d4 Merge pull request #8967 from GoogleCloudPlatform/revert-8944-go-restful_update 
Revert "Update go-restful to get stable sorting in spec"
 2015-05-28 16:04:32 -07:00
Tim Hockin 4a7071e7f7 Revert "Update go-restful to get stable sorting in spec" 2015-05-28 16:04:11 -07:00
Tim Hockin d639005422 Merge pull request #8965 from thockin/fix-build 
Fix undetected merge conflict
 2015-05-28 16:01:07 -07:00
Tim Hockin b17e343afc Fix undetected merge conflict 2015-05-28 16:00:10 -07:00
Tim Hockin d355154181 Merge pull request #8556 from kargakis/label-parsing-fix 
label: Invalidate empty or invalid value labels
 2015-05-28 15:54:14 -07:00
Tim Hockin 32bb3ae8f1 Merge pull request #7775 from simon3z/cloud-provider-id 
api: add the ProviderID attribute to NodeSpec
 2015-05-28 15:54:00 -07:00
Tim Hockin 081ab3abac Merge pull request #8853 from caesarxuchao/HostToNodeName 
update PodSpec.Host to PodSpec.NodeName
 2015-05-28 15:50:12 -07:00
Tim Hockin e0fe9bb4d6 Merge pull request #8959 from lavalamp/networkTimeout 
Network timeout
 2015-05-28 15:49:57 -07:00
Tim Hockin 2c20c3664c Merge pull request #8902 from brendandburns/fix 
Turn off certificate checking for Mavericks, as the curl is borked.
 2015-05-28 15:32:50 -07:00
Tim Hockin df4c591943 Merge pull request #8893 from jeffmendoza/patch-2 
Wordpress Example: clarify GCE zone
 2015-05-28 15:31:00 -07:00
Tim Hockin 4ac239499b Merge pull request #8904 from justinsb/fix_8903 
GCE kube-up; write the marker only after we have uploaded the file
 2015-05-28 15:30:47 -07:00
Tim Hockin 2cadd4c86e Merge pull request #8906 from justinsb/aws_volume_fixes 
Fix AWS volumes
 2015-05-28 15:30:33 -07:00
Tim Hockin ba07e5d472 Merge pull request #8920 from whitmo/bundle-version-update 
Update kubernetes version to 0.17.1 in bundle
 2015-05-28 15:30:14 -07:00
Tim Hockin 8f1bc2ad77 Merge pull request #8922 from pmorie/mt-comment 
Add comments in mt.go
 2015-05-28 15:30:00 -07:00
Tim Hockin 72c2e3b8a1 Merge pull request #8944 from krousey/go-restful_update 
Update go-restful to get stable sorting in spec
 2015-05-28 15:29:43 -07:00
Tim Hockin 0dab399b6a Merge pull request #8948 from jlowdermilk/proxy-help 
update/fix kubectl proxy example in help string
 2015-05-28 15:29:11 -07:00
Tim Hockin 3274bd0674 Merge pull request #8952 from rjnagal/rc 
Updated broken ordering of prerequisites.
 2015-05-28 15:28:54 -07:00
Daniel Smith c8f03fc354 fix timeout for networking test 2015-05-28 15:01:59 -07:00
Daniel Smith 0e49e1535f split into old/new networking test 2015-05-28 15:01:59 -07:00
Daniel Smith d683548fd6 Revert "Revert "Revert "Revert "Fix networking test"""" 
This reverts commit 30ffe0325c.
 2015-05-28 15:01:59 -07:00
Tim Hockin 44ed7a69c2 Merge pull request #8950 from caesarxuchao/azure-getting-started-guides 
let azure getting started guides point to examples/
 2015-05-28 15:01:54 -07:00
Tim Hockin 3e08cfb9f5 Merge pull request #8924 from erickhan/master 
Update roadmap.md
 2015-05-28 15:01:39 -07:00
Tim Hockin e456e8d63e Merge pull request #8921 from wojtek-t/update_instructions 
Update instructions on auto-generating conversions.
 2015-05-28 15:01:24 -07:00
Tim Hockin 1087c12e63 Merge pull request #8909 from wojtek-t/fix_example_selflinks 
Fix selfLinks in test examples to v1beta3
 2015-05-28 15:01:02 -07:00
Tim Hockin 6fbaefdced Merge pull request #8897 from pweil-/reduce-merge-logging 
reduce merge logging
 2015-05-28 15:00:45 -07:00
Tim Hockin eabc65149e Merge pull request #8896 from lavalamp/e2e-timeout 
Give up waiting for failed pods + print status
 2015-05-28 15:00:19 -07:00
Tim Hockin 3830c068b9 Merge pull request #8883 from yujuhong/kubelet_unittest2 
Kubelet: clean up more unit tests
 2015-05-28 15:00:02 -07:00
Tim Hockin 32859c3954 Merge pull request #8778 from kargakis/show-pod-number 
Show pods number when describing services
 2015-05-28 14:59:02 -07:00
Tim Hockin ccafaaf8ef Merge pull request #8729 from justinsb/gce_up_csv 
Pass arg lists to gcloud as comma-separated single arg
 2015-05-28 14:58:43 -07:00
Tim Hockin f8d0060d6e Merge pull request #8388 from pmorie/third-party-tests 
Run tests for third-party code
 2015-05-28 14:58:26 -07:00
Tim Hockin e88249e78e Merge pull request #8273 from krousey/cluser_skydns 
Updating some SkyDNS templates to v1beta3
 2015-05-28 14:58:03 -07:00
Tim Hockin 1a45e4006e Merge pull request #8747 from brendandburns/e2e 
Add a test for PreStop hooks.
 2015-05-28 14:55:40 -07:00
Tim Hockin 6d5ccf75dd Merge pull request #8939 from bcbroussard/describe-nodeport 
Update NodePort in kubectl describe service
 2015-05-28 14:52:47 -07:00
Tim Hockin 8da79e1dd5 Merge pull request #8612 from bcbroussard/v1beta3-rc 
Update replication controller pages to v1beta3 in web ui
 2015-05-28 14:51:31 -07:00
Tim Hockin f53b4a1104 Merge pull request #8611 from bcbroussard/v1beta3-services 
Update service pages to v1beta3 in web ui
 2015-05-28 14:50:57 -07:00
Tim Hockin 8886557da6 Merge pull request #8926 from thockin/remove-debug 
Remove debug print
 2015-05-28 14:50:17 -07:00
Tim Hockin e3a6900376 Merge pull request #8930 from thockin/fix-dollars 
Use $$() in pod commandlines to get $()
 2015-05-28 14:50:02 -07:00
Rohit Jnagal a796fb0187 Updated broken ordering of prerequisites. 2015-05-28 21:15:17 +00:00
Chao Xu 9c1153322e update PodSpec.Host to PodSpec.NodeName in /pkg/api/types.go and /pkg/api/v1beta3/types.go 2015-05-28 14:10:06 -07:00
Jeff Lowdermilk 75314718eb update/fix kubectl proxy example in help string 2015-05-28 13:59:39 -07:00
Kris Rousey 05eaaa99e1 Update go-restful to get stable sorting in spec 2015-05-28 13:40:23 -07:00
Chao Xu 6a38836496 let azure getting started guides point to examples/ 2015-05-28 13:19:22 -07:00
Chao Xu 0378894f44 Merge pull request #8895 from jeffmendoza/patch-3 
201 walkthrough: remove term "API object"
 2015-05-28 13:03:40 -07:00
BC Broussard 581f4613c8 Fix NodePort in kubectl describe service 2015-05-28 12:09:31 -07:00
Tim Hockin e524d52248 Use $$() in pod commandlines to get $() 2015-05-28 10:53:22 -07:00
Tim Hockin f015a21026 Merge pull request #8927 from GoogleCloudPlatform/revert-8822-fifo_rc 
Revert "Wake up rcs when pods get DeletionFinalStateUnknown tombstones"
 2015-05-28 10:24:51 -07:00
Tim Hockin b69fad211e Revert "Wake up rcs when pods get DeletionFinalStateUnknown tombstones" 2015-05-28 10:23:55 -07:00
BC Broussard f8762ccd12 Update replication controllers for v1beta3 api 2015-05-28 10:18:03 -07:00
Tim Hockin c6ca865e1a Remove debug print 2015-05-28 10:12:37 -07:00