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

4757 Commits (e87d735304ec16680015f534789e480fb393ba9c)

Author SHA1 Message Date
Daniel Smith 4a6ab7fd36 Merge pull request #7597 from eparis/copyright 
Use generic copyright holder name in license boilerplate
 2015-05-01 17:01:39 -07:00
Brendan Burns 508eb309f8 Merge remote-tracking branch 'upstream/release-0.16' into merge-release-0.16-to-master 2015-05-01 16:55:34 -07:00
Brendan Burns 28d727a0c8 Kubernetes version v0.16.1-dev 2015-05-01 16:33:53 -07:00
Brendan Burns b933dda536 Kubernetes version v0.16.1 2015-05-01 16:33:40 -07:00
Victor Marmol c5a86387a4 Merge pull request #7657 from yujuhong/docker_runtime 
Removes RunPod in the Runtime interface
 2015-05-01 16:09:44 -07:00
Prashanth Balasubramanian 20de8c93b7 Fix rollingupdate --image 
(cherry picked from commit c8ea0c27e9)

Conflicts:
	docs/kubectl.md
	pkg/kubectl/cmd/rollingupdate.go
 2015-05-01 15:28:23 -07:00
Yu-Ju Hong ae1b24f07f Merge pull request #7652 from vmarmol/runtime-switch 
Kubelet: Add container runtime option.
 2015-05-01 14:50:30 -07:00
Eric Paris 6b3a6e6b98 Make copyright ownership statement generic 
Instead of saying "Google Inc." (which is not always correct) say "The
Kubernetes Authors", which is generic.
 2015-05-01 17:49:56 -04:00
Yu-Ju Hong 4fe3366b04 Removes RunPod in the Runtime interface 
SyncPod subsumes RunPod, so the latter is no longer needed.
After this change, DockerManager implements the Runtime interface.
 2015-05-01 14:47:04 -07:00
Victor Marmol d9d61c3511 Kubelet: Add container runtime option. 2015-05-01 14:26:54 -07:00
Victor Marmol e3fc039eaa Merge pull request #7611 from yifan-gu/rkt_syncPod 
kubelet/rkt: Add SyncPod() to rkt.
 2015-05-01 14:26:11 -07:00
Clayton Coleman 1a8845af61 Merge pull request #7490 from smarterclayton/alter_list 
Do not automatically decode runtime.RawExtension
 2015-05-01 16:48:26 -04:00
Yifan Gu 1b77615deb kubelet/rkt: Add SyncPod() to rkt. 2015-05-01 13:02:05 -07:00
Yu-Ju Hong ee473edd45 Merge pull request #7610 from vmarmol/runtime-syncpod 
Add SyncPod() to DockerManager and use it in Kubelet
 2015-05-01 12:22:39 -07:00
Quinton Hoole c68723e7f9 Merge pull request #7628 from bprashanth/rc_ttl 
Update expiration timeout based on observed latencies
 2015-05-01 11:42:22 -07:00
Victor Marmol 3b9eba2c1b Add SyncPod() to DockerManager and use in Kubelet. 
This allows us to abstract away the logic of syncing a pod by the
runtime. It will allow other runtimes to perform their own sync as well.
 2015-05-01 11:03:08 -07:00
Victor Marmol bb8ee5b0db Add lifecycle tests from kubelet_test to lifecycle. 2015-05-01 11:02:10 -07:00
Victor Marmol 7a737892f5 Extract out interface for GetPods(). 
This will remove the circular import with dockertools for
DockerManager. Eventually, this will be Runtime.
 2015-05-01 11:02:10 -07:00
Vish Kannan cadfde0bd1 Merge pull request #7277 from guenter/cgroup-parent 
Add --cgroup_parent flag to Kubelet to set the parent cgroup for pods
 2015-05-01 10:24:58 -07:00
Jeff Lowdermilk ec9942e995 Merge pull request #7540 from bprashanth/rollingupdate 
Fix rolling update --image
 2015-05-01 10:07:46 -07:00
Alex Robinson eab6020e16 Merge pull request #7609 from brendandburns/lb 
Truncate GCE load balancer names to 63 chars
 2015-05-01 09:52:49 -07:00
Yu-Ju Hong f74fab4e56 Merge pull request #7603 from vmarmol/runtime-syncpod-api 
Add SyncPod() and remove Kill/Run InContainer().
 2015-05-01 09:41:50 -07:00
Prashanth Balasubramanian a8fdf3d78b Update expiration timeout based on observed latencies 2015-05-01 08:53:51 -07:00
Victor Marmol 6316b485ad Add SyncPod() and remove Kill/Run InContainer(). 
SyncPod allows us to abstract away how a pod is started and updated. It
also simplifies what the runtime has to implement.
 2015-05-01 00:32:29 -07:00
Yifan Gu 3751ecc766 kubelet/container: Move ShouldContainerBeRestarted() to runtime. 2015-04-30 22:55:25 -07:00
Yifan Gu 428652bdc7 kubelet/rkt: Add KillPod() and GetPodStatus() for rkt. 2015-04-30 18:32:32 -07:00
Victor Marmol 03b5c32576 Merge pull request #7553 from yifan-gu/rkt_runner 
kubelet/rkt: Add RunInContainer()/ExecInContainer()/PortForward().
 2015-04-30 18:31:08 -07:00
Yifan Gu 9ce568a142 kubelet/rkt: Add GetPods() for rkt. 2015-04-30 18:00:18 -07:00
Brendan Burns 40549dc083 Truncate GCE load balancer names to 63 chars 2015-04-30 17:54:11 -07:00
Yifan Gu 1636fd2e1c kubelet/rkt: Add RunPod() for rkt. 2015-04-30 17:31:35 -07:00
Yifan Gu 2e4be0bcf1 kubelet/rkt: Add RunInContainer()/ExecInContainer()/PortForward(). 2015-04-30 17:25:16 -07:00
Victor Marmol 262c34e7db Merge pull request #7543 from yifan-gu/pod_manifest 
kubelet/rkt: Add routines for converting kubelet pod to rkt pod.
 2015-04-30 17:18:19 -07:00
Clayton Coleman aa810e4e88 Merge pull request #7467 from brendandburns/qps 
Augment describe to search for matching things if it doesn't match the original resource.
 2015-04-30 20:17:34 -04:00
Victor Marmol 3235799595 Merge pull request #7601 from yujuhong/kill_container 
Add KillContainerInPod in DockerManager
 2015-04-30 17:05:00 -07:00
Victor Marmol df8490f52f Merge pull request #7555 from yifan-gu/rkt_pod_info 
kubelet/rkt: Add podInfo.
 2015-04-30 17:04:51 -07:00
Yu-Ju Hong b37f23f1eb Add KillContainerInPod in DockerManager 
This changes adds one of the functions that DockerManager needs to implement
the Runtime interface.
 2015-04-30 16:23:39 -07:00
Victor Marmol 441a4e6f30 Merge pull request #7578 from yujuhong/docker_manager 
Add image-related methods to DockerManager
 2015-04-30 16:16:39 -07:00
Victor Marmol a94aeb27fa Merge pull request #7586 from yujuhong/container_info 
Remove more docker references in kubelet
 2015-04-30 16:16:23 -07:00
Yifan Gu 7e8afc7c96 kubelet/rkt: Add routines for converting kubelet pod to rkt pod. 2015-04-30 15:24:47 -07:00
Clayton Coleman f41e03ce9f Merge pull request #7582 from smarterclayton/example_typo 
Correct the capitalization of KubeProxyVersion
 2015-04-30 18:20:10 -04:00
Victor Marmol 0e89d65563 Merge pull request #7545 from yifan-gu/getlog 
Getlog
 2015-04-30 15:15:44 -07:00
Victor Marmol 57cc1218ca Merge pull request #7549 from yifan-gu/rkt_gc 
Rkt gc
 2015-04-30 15:15:07 -07:00
Alex Robinson f3352d96e6 Merge pull request #7595 from a-robinson/typo 
Fix typo in kubelet prober code
 2015-04-30 14:42:18 -07:00
Yifan Gu 01841a8c19 kubelet/rkt: Add podInfo. 
podInfo reprensents the state of rkt pods.
It is used to for reporting the pod and container status to kubelet.
 2015-04-30 14:39:10 -07:00
Vish Kannan 1dead9c670 Merge pull request #6400 from ddysher/nfs-volume-mounter 
Implement Mount interface using mount(8) and umount(8)
 2015-04-30 14:00:56 -07:00
Yu-Ju Hong 644ec0dbfb Remove ErrNoKubeletContainers 
We no longer use it.
 2015-04-30 13:35:21 -07:00
Yu-Ju Hong 83c599e4d4 Add image-related methods to DockerManager 
This change is part of the efforts to make DockerManager implement the Runtime
interface.

The change also modifies the interface slightly to work with existing
code, and aggregates the type converting functions to convert.go.
 2015-04-30 13:27:52 -07:00
Alex Robinson faa3292bb3 Fix typo in kubelet prober code. 2015-04-30 13:17:10 -07:00
Yu-Ju Hong 2f7b951140 Remove more docker references in kubelet 
This change also renames TrimRuntimePrefixFromImage to TrimRuntimePrefix to
better reflect that the usage is not limited to images (e.g. ID).
 2015-04-30 13:16:11 -07:00
Victor Marmol 2c381a6f6f Merge pull request #7550 from yifan-gu/rkt_pull 
Rkt pull
 2015-04-30 13:09:14 -07:00