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

8304 Commits (aa29f84d0c9f26cee542b3535d3056b2e5fa38e9)

Author SHA1 Message Date
gmarek aa29f84d0c Merge pull request #6142 from ddysher/fix-doc 
Fix docs
 2015-03-30 10:14:20 +02:00
gmarek f02c64d620 Merge pull request #6144 from you-n-g/master 
remove cmd arg from ClientMapperForCommand
 2015-03-30 10:07:39 +02:00
Deyuan Deng f35dc54d62 Fix docs 2015-03-28 23:42:54 -04:00
Zach Loafman 8a7a127352 Merge pull request #6137 from GoogleCloudPlatform/revert-4442-docker_etcd 
Revert "Running etcd 2.0.5 in a pod on master"
 2015-03-28 07:39:47 -07:00
Zach Loafman 848134fdfa Revert "Running etcd 2.0.5 in a pod on master" 2015-03-28 07:36:39 -07:00
Victor Marmol b9499b8c5b Merge pull request #6126 from ghodss/reduce-some-kubectl-spacing 
Reduce some tab spacing in kubectl
 2015-03-27 18:34:36 -07:00
Dawn Chen 179fe870cc Merge pull request #4442 from ArtfulCoder/docker_etcd 
Running etcd 2.0.5 in a pod on master
 2015-03-27 18:33:25 -07:00
Dawn Chen 296fafa955 Merge pull request #6129 from yujuhong/container_status 
Kubelet: allow docker to examine terminated container
 2015-03-27 18:18:18 -07:00
Sam Ghods f8d8b09a0a Reduce some tab spacing in kubectl 2015-03-27 18:05:20 -07:00
Yu-Ju Hong 3ad0e22cdd Kubelet: allow docker to examine terminated container 
Removing the if statement so that docker can continue returning the status of
terminated containers.
 2015-03-27 18:04:50 -07:00
Daniel Smith 525bbfd175 Merge pull request #6103 from zmerlynn/remove_gce_node_names 
Remove the --machines SaltStack configuration on GCE
 2015-03-27 17:55:16 -07:00
Victor Marmol 3bc933645b Merge pull request #6083 from jlowdermilk/fix-log 
Fix kubectl log for single-container pods
 2015-03-27 17:51:33 -07:00
Abhishek Shah 7750f35e7c Running etcd 2.0.5 in a pod on master 2015-03-27 17:50:10 -07:00
Victor Marmol 76b5b79106 Merge pull request #6127 from yujuhong/sethost 
Kubelet: set host field in the pending pod status
 2015-03-27 17:37:14 -07:00
Yu-Ju Hong 372c5c9f3a Kubelet: set host field in the pending pod status 
Otherwise, the apiserver would reject the update.
 2015-03-27 17:26:47 -07:00
Jeff Lowdermilk 320df1d2ad Merge pull request #6116 from satnam6502/fluentd-es 
Update Salt config use gcr.io Fluentd to ES image
 2015-03-27 16:30:05 -07:00
Zach Loafman e91b77cbec Merge pull request #6104 from eparis/tag-version 
make mark-new-release.sh do branching and tell you exactly what to do ne...
 2015-03-27 16:17:45 -07:00
Satnam Singh ce1e73fccc Update Salt config use gcr.io Fluentd to ES image 2015-03-27 16:09:37 -07:00
Eric Paris cbefaf5d65 output current_branch name instead of HEAD in help messages 2015-03-27 19:03:42 -04:00
Daniel Smith 04e49240b5 Merge pull request #6114 from GoogleCloudPlatform/revert-6048-proxy 
Revert "Updating proxy to return 301 to add a "/" at the end for #4958"
 2015-03-27 15:59:55 -07:00
Daniel Smith 93a82c30d9 Revert "Updating proxy to return 301 to add a "/" at the end for #4958" 2015-03-27 15:59:40 -07:00
Robert Bailey db189c0d4d Merge pull request #6111 from mbessolov/master 
Fixed a typo in networking.md
 2015-03-27 15:56:09 -07:00
Eric Paris 2b941f4954 anchor version regex 
Also create a GIT_MINOR variable for a touch of readability....
 2015-03-27 18:54:36 -04:00
Daniel Smith d137e7b62d Merge pull request #6048 from nikhiljindal/proxy 
Updating proxy to return 301 to add a "/" at the end for #4958
 2015-03-27 15:49:10 -07:00
Michael Bessolov db51edb767 Update networking.md 
Fixed a typo.
 2015-03-27 15:40:39 -07:00
Robert Bailey 7ee3268931 Merge pull request #6032 from jayunit100/e2e-utils-2 
E2E utils (correcting test regression)
 2015-03-27 15:40:34 -07:00
Eric Paris 3919a38ad6 make mark-new-release.sh do branching and tell you exactly what to do next 
We keep getting tags and branches wonky.  This will land

v0.14.0 as an ancestor of master
v0.14.1 will NOT be an ancestor of master

I can do the later, it only a touch of git gymnastics, not really hard, but
we only occasionably do that today. (0.13.1 is an ancestor of master,
but 0.13.2 is not)
 2015-03-27 17:01:56 -05:00
Zach Loafman 68ccb97907 Remove the --machines SaltStack configuration on GCE 
Per https://github.com/GoogleCloudPlatform/kubernetes/issues/6072#issuecomment-87074456, this is no longer necessary.
We now no longer need a static node list. Woo!
 2015-03-27 14:44:19 -07:00
Brian Grant f0da47b2dd Merge pull request #5763 from smarterclayton/get_input_parameters_versioned 
Expose versioned query parameters and make watch an operation on List
 2015-03-27 14:35:23 -07:00
Brian Grant 6dd8f73266 Merge pull request #5919 from sdminonne/labels_req 
Adding method  to labels.Selector to add Requirement
 2015-03-27 14:30:09 -07:00
nikhiljindal 2fff606a6f Updating proxy to return 301 to add a / at the end 2015-03-27 14:29:18 -07:00
Brian Grant c9ad322ba9 Merge pull request #5831 from smarterclayton/add_more_errors 
Add more specific error handling and handle generic errors more effectively
 2015-03-27 14:17:11 -07:00
Brian Grant a765236653 Merge pull request #5939 from thockin/plural_endpoints_31_endpt_subsets 
Implement multi-port endpoints
 2015-03-27 14:15:15 -07:00
Clayton Coleman aa44d29d10 Updated documentation and adjusted field names 2015-03-27 17:08:59 -04:00
Zach Loafman 1bf0cbeac6 Merge pull request #6093 from brendandburns/docs 
Revert the revert of the update to docs and scripts for GCE.
 2015-03-27 14:00:01 -07:00
Brendan Burns 6fd376a04f Fix the scripts to optionally skip prompts and also return successfully no matter what. 2015-03-27 13:53:26 -07:00
Brendan Burns 1aa2b97792 Revert "Revert "Update gce starting guide to use get.k8s.io"" 
This reverts commit b369f2b48f.
 2015-03-27 13:46:28 -07:00
Tim Hockin 8ae203825b Implement multi-port endpoints 
Instead of endpoints being a flat list, it is now a list of "subsets"
where each is a struct of {Addresses, Ports}.  To generate the list of
endpoints you need to take union of the Cartesian products of the
subsets.  This is compact in the vast majority of cases, yet still
represents named ports and corner cases (e.g. each pod has a different
port number).

This also stores subsets in a deterministic order (sorted by hash) to
avoid spurious updates and comparison problems.

This is a fully compatible change - old objects and clients will
keepworking as long as they don't need the new functionality.

This is the prep for multi-port Services, which will add API to produce
endpoints in this new structure.
 2015-03-27 12:36:32 -07:00
Jeff Lowdermilk 243de3a472 Fix kubectl log for single-container pods 2015-03-27 12:26:00 -07:00
Satnam Singh 37689038d2 Merge pull request #6071 from lavalamp/fix2 
Update network tester files to v1beta3
 2015-03-27 12:22:49 -07:00
Clayton Coleman 870da687d0 Add more extensive tests to apiserver for variations in version 
Formalize v1beta1 and v1beta3 style APIs in our test cases.
 2015-03-27 15:03:58 -04:00
Clayton Coleman eb0eff69fe Move watch to being a resthandler resource and expose it on LIST 
GET /pods?watch=true&resourceVersion=10

will now function equivalent to GET /watch/pods.
 2015-03-27 15:03:58 -04:00
Clayton Coleman 1618c39a46 Convert List query parameters via object conversion 
Convert url.Values -> an object, with appropriate versioning. ListOptions
should also expose parameter names to swagger.
 2015-03-27 15:03:57 -04:00
Zach Loafman a2801a5a18 Merge pull request #6066 from mattmoor/master 
Move the 'private' (authenticated) image...
 2015-03-27 11:54:23 -07:00
Brian Grant 70e0fad28c Merge pull request #5951 from dchen1107/docker 
Add node components version to API
 2015-03-27 11:30:44 -07:00
Daniel Smith a060c541e9 Update network tester files to v1beta3 2015-03-27 11:09:33 -07:00
Dawn Chen 87db1c9007 Rename DockerVerstion to ContainerRuntimeVersion for rocket support 2015-03-27 11:04:48 -07:00
Dawn Chen 086bb1ac09 Add node components version to API 2015-03-27 11:04:47 -07:00
Brendan Burns 3eda80b3c5 Merge pull request #5985 from lyda/aws-fixes 
Template doesn't work with VPCs
 2015-03-27 09:58:51 -07:00
Jeff Lowdermilk 803086c2c6 Merge pull request #6034 from thockin/target_port_flag 
Alias --container-port to --target-port in kubectl
 2015-03-27 09:56:33 -07:00