Commit Graph

10281 Commits

Author SHA1 Message Date
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
Eric Paris
204170e038 Merge pull request #7636 from eparis/copyright-boilerplate-man2doc
Update license boilerplate for docs/man/md2man-all.sh
2015-05-01 12:57:36 -05:00
Eric Paris
89037a656b Merge pull request #7632 from eparis/copyright-boilerplate-k8petstore
Include shell license boilerplate in examples/k8petstore
2015-05-01 12:55:41 -05:00
Eric Paris
ea9d6dfee6 Update license boilerplate for docs/man/md2man-all.sh 2015-05-01 13:50:14 -04:00
Jeff Lowdermilk
01fdd74a91 Merge pull request #7624 from erictune/servicedoc
Explain what pets are.
2015-05-01 10:45:40 -07:00
Eric Paris
8bd9d4b6ec Include shell license boilerplate in examples/k8petstore 2015-05-01 13:39:59 -04: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
David Oppenheimer
0759864d74 Merge pull request #6995 from rrati/ha-proposal-6993
Proposal for High Availability of Daemons
2015-05-01 09:56:56 -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
Alex Robinson
5f0dbfc093 Merge pull request #7596 from a-robinson/hack
Make hack/test-go.sh friendlier to OS X bash by not using a -1 array index
2015-05-01 09:40:36 -07:00
Eric Tune
51d96cb683 Explain what pets are. 2015-05-01 09:39:42 -07:00
Eric Tune
dc137a47eb Merge pull request #7209 from you-n-g/master
change the current dir to the config dir
2015-05-01 08:29:49 -07:00
Victor Marmol
95bc96627e Merge pull request #7613 from yifan-gu/should
kubelet/container: Move ShouldContainerBeRestarted() to runtime.
2015-05-01 08:01:37 -07:00
Robert Rati
0beb72729e Fixed list formatting in the design discussion notes. #6993 2015-05-01 10:02:56 -04: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
Victor Marmol
72708d74b9 Merge pull request #7605 from yifan-gu/rkt_killpod
kubelet/rkt: Add KillPod() and GetPodStatus() for rkt.
2015-04-30 18:51:23 -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
Victor Marmol
eb580dce9e Merge pull request #7599 from yifan-gu/rkt_getpods
kubelet/rkt: Add GetPods() for rkt.
2015-04-30 18:28:29 -07:00
Yifan Gu
9ce568a142 kubelet/rkt: Add GetPods() for rkt. 2015-04-30 18:00:18 -07:00
Victor Marmol
d8d6e84c81 Merge pull request #7589 from yifan-gu/rkt_runpod
kubelet/rkt: Add RunPod() for rkt.
2015-04-30 17:56:03 -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
Eric Tune
dddf414cf5 Merge pull request #7195 from mbruzek/add-charms
Add the Juju charms to Kubernetes
2015-04-30 16:26:58 -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
CJ Cullen
248508ca9b Merge pull request #7583 from erictune/servicedoc
Document session affinity option.
2015-04-30 15:37:20 -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
1bb76633da Make hack/test-go.sh friendlier to OS X bash by not using a -1 array index.
Without this, everytime I run test-go.sh I get the following error:
./hack/test-go.sh: line 215: apiVersions: bad array subscript
2015-04-30 14:56:02 -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
Zach Loafman
2c4ad94f4c Merge pull request #7590 from GoogleCloudPlatform/revert-7462-native-ginkgo-runner
Revert "Use native Ginkgo test runner instead of cmd/e2e"
2015-04-30 13:46:53 -07:00
Quinton Hoole
bfaf976df7 Revert "Use native Ginkgo test runner instead of cmd/e2e" 2015-04-30 13:45:46 -07:00
Alex Robinson
8d24f73bab Merge pull request #7579 from satnam6502/fluentd-es-image
Improve comment in Fluentd to ES logging config file
2015-04-30 13:45:03 -07:00
Alex Robinson
f30ed069c0 Merge pull request #7588 from satnam6502/fluentd-gcp-image
Trim Fleuntd tag for Cloud Logging
2015-04-30 13:44:39 -07:00
Satnam Singh
95007d7217 Improve comment in Fluentd to ES logging config file 2015-04-30 13:42:30 -07:00