Commit Graph

10245 Commits

Author SHA1 Message Date
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
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
Satnam Singh
941a457851 Trim Fleuntd tag for Cloud Logging 2015-04-30 13:39:35 -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
Quinton Hoole
3602884d32 Merge pull request #7462 from ixdy/native-ginkgo-runner
Use native Ginkgo test runner instead of cmd/e2e
2015-04-30 13:27:04 -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
Victor Marmol
dad73fa94a Merge pull request #7569 from bakins/kubernetes-master-name
GCE CoreOS cluster - set master name based on variable
2015-04-30 12:59:41 -07:00
Clayton Coleman
32dfd3e07b Correct the capitalization of KubeProxyVersion 2015-04-30 15:43:14 -04:00
Eric Tune
53c6c5cfb3 Document session affinity option.
Closes #2867
2015-04-30 12:41:21 -07:00
Brian Grant
0a9a10e997 Merge pull request #7535 from smarterclayton/bad_capitalization
Capitalization of KubeProxyVersion wrong in JSON
2015-04-30 12:36:02 -07:00
Brian Grant
2d37650c65 Merge pull request #7530 from mbforbes/nodeExternal
Make nodes report their external IP rather than the master's.
2015-04-30 12:29:45 -07:00
Derek Carr
f45ef93a2b Merge pull request #7523 from pmorie/secret-example
Add example for secrets
2015-04-30 15:21:53 -04:00
CJ Cullen
015c0656a6 Merge pull request #7568 from yujuhong/rm_getcontainers
Remove GetContainers from Runtime interface
2015-04-30 12:01:58 -07:00
Yu-Ju Hong
11be6811b3 Merge pull request #7563 from vmarmol/runtime-pre
Move lifecycle handlers to their own subpackage
2015-04-30 11:22:58 -07:00
Clayton Coleman
d03b5299f9 Merge pull request #7432 from piosz/termination_notice
Added TerminationGracePeriod field to PodSpec and grace-period flag to kubectl stop
2015-04-30 13:55:51 -04:00
CJ Cullen
b15e2e7340 Merge pull request #7544 from jayunit100/kubectl-ns
E2E: Update kubectl.go - remove default NS and use idiomatic namepsace l...
2015-04-30 10:43:50 -07:00
Yifan Gu
ca4643ef31 kubelet/rkt: Add GetContainerLogs() for rkt. 2015-04-30 10:31:31 -07:00
Alex Robinson
58ede77a58 Merge pull request #7539 from satnam6502/master
Trim cluster log tags to pod name and container name
2015-04-30 10:29:41 -07:00
Yifan Gu
488f49a216 kubelet/rkt: Add GarbageCollection to rkt runtime. 2015-04-30 10:29:38 -07:00
Zach Loafman
b1f5e3e5ea Merge pull request #7574 from zmerlynn/fix_the_gke_fix
Fix the fix for GKE kube-down
2015-04-30 10:26:08 -07:00
Zach Loafman
6a0fab3d34 Fix the fix for GKE kube-down
Fixes issue in #7565
2015-04-30 10:23:21 -07:00
CJ Cullen
b11f07be7a Merge pull request #7541 from csrwng/fix_bool_conversion
Handle conversion of boolean query parameters with a value of "false"
2015-04-30 10:14:54 -07:00
Yifan Gu
01693c8233 kubelet/rkt: Add PullImage()/IsImagePresent() to rkt runtime. 2015-04-30 10:01:24 -07:00
CJ Cullen
f4b9efff54 Merge pull request #7531 from pmorie/secret-docs
Fix representation of v1beta3 pod in secrets doc
2015-04-30 09:55:30 -07:00
Brian Akins
b311a12d90 Use the variable as this changes based on environment. 2015-04-30 12:40:09 -04:00
Paul Morie
e1885ba05f Add example for secrets 2015-04-30 12:35:21 -04:00
Yu-Ju Hong
176fc9b9c6 Remove GetContainers from Runtime interface
This function is no longer considered needed.
2015-04-30 09:33:23 -07:00