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

8326 Commits (d5ce931f0b381b7073a4b60d28edd11b37cefa51)

Author SHA1 Message Date
Victor Marmol d5ce931f0b Merge pull request #6069 from simon3z/kubelet-reboot-logic 
node: move the reboot detection logic to kubelet
 2015-03-30 08:45:37 -07:00
Victor Marmol ff03b721fe Merge pull request #6160 from justinsb/aws_dont_list_until_ready 
Don't list AWS instances until they are actually ready
 2015-03-30 08:34:54 -07:00
Victor Marmol a922bf9d2c Merge pull request #6157 from AntonioMeireles/drop_remaining_cadvisor_refs 
remove remaining references to containerized cadvisor.
 2015-03-30 08:06:53 -07:00
Justin Santa Barbara 63f63aa9de Don't list AWS instances until they are actually ready 2015-03-30 08:06:18 -07:00
Victor Marmol 3490e67ff9 Merge pull request #6117 from brendandburns/api3 
Add params for the proxy when installing the API, this fixes some swagger validation errors.
 2015-03-30 08:02:27 -07:00
Victor Marmol b9214d4fcf Merge pull request #6122 from satnam6502/fluentd-gcp 
Update Salt config to use gcr.io Fluentd to Cloud Logging agent
 2015-03-30 08:02:12 -07:00
Victor Marmol b63794cba8 Merge pull request #6130 from eparis/tag-version 
Do not allow minor release which is not a decendant of the release branc...
 2015-03-30 08:02:01 -07:00
Victor Marmol 7823014807 Merge pull request #6143 from brendandburns/e2e2 
Pick up the latest updates to go-restful.
 2015-03-30 08:01:48 -07:00
Victor Marmol 0c75f26a74 Merge pull request #6148 from zmerlynn/brctl_complaint 
Fix "brctl: invalid command" message appearing in startup logs
 2015-03-30 08:01:30 -07:00
Victor Marmol 58bc479e81 Merge pull request #6149 from ghodss/update-gce-quickstart 
Update GCE getting started guide to include gcloud preview
 2015-03-30 08:01:16 -07:00
António Meireles 0b793a6c74 remove remaining references to containerized cadvisor. 
since GoogleCloudPlatform/kubernetes#5308 got merged cadvisor facilities are
built-in in kubelet, so time to update the 'screenshots'...

Signed-off-by: António Meireles <antonio.meireles@reformi.st>
 2015-03-30 15:27:23 +01:00
Federico Simoncelli fe2d1f6762 node: move the reboot detection logic to kubelet 
Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
 2015-03-30 09:33:07 -04:00
Federico Simoncelli 604e0ad328 kubelet: move getNodeReference logic into a function 
Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
 2015-03-30 09:33:00 -04:00
gmarek 7bbf526a1f Merge pull request #6141 from zmerlynn/master_by_name 
GCE node salt: Use the master FQDN, not the master IP
 2015-03-30 10:15:56 +02:00
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
Sam Ghods ef77349306 Update GCE getting started guide to include gcloud preview 2015-03-29 18:37:01 -07:00
Zach Loafman b3636bba34 Fix "brctl: invalid command" message appearing in startup logs 
We were actually failing to call brctl in configure-vm.sh. I finally
tracked it down to the attempt to delete the docker0 bridge. This
particular package was getting installed later by Salt anyways, so
all this PR is doing is moving the package install up from Salt to
bash.

Also adds some minor logging.
 2015-03-29 18:30:33 -07:00
Brendan Burns f826bf6b46 Pick up the latest updates to go-restful. 2015-03-28 22:05:33 -07:00
Deyuan Deng f35dc54d62 Fix docs 2015-03-28 23:42:54 -04:00
Zach Loafman 708553f0bb GCE node salt: Use the master FQDN, not the master IP 
This will allow us to upgrade the master by full re-provision, without
even bothering to reserve the IP.
 2015-03-28 13:44:45 -07: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
Brendan Burns ee0d71aac6 Fix up parameter handling. Also handle type mapping between Go and JSON 2015-03-27 21:43:16 -07:00
Brendan Burns d70d2d20cd Add params for the proxy when installing the API. 2015-03-27 21:43:16 -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
Eric Paris 329f9a0e99 Do not allow minor release which is not a decendant of the release branch 
This does some git magic to make sure you do not tag a branch with
v0.13.3 unless that branch is a decendant of the release-0.13 branch
upstream.

Don't allow v0.13.4 if v0.13.3 doesn't exit

Don't allow v0.13.3 if v0.13.3 already exits
 2015-03-27 21:24:10 -04: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
Satnam Singh 666e2b69ac Update Salt config to use gcr.io Fluentd to Cloud Logging agent 2015-03-27 16:39:12 -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