Commit Graph

10121 Commits

Author SHA1 Message Date
Gao Zheng
b445afdf11 Merge remote-tracking branch 'upstream/master' 2015-04-30 15:42:14 +08:00
Filip Grzadkowski
231284187e Merge pull request #7431 from wojtek-t/conversion_chains
Prepare for chaining autogenerated conversion methods
2015-04-30 09:08:40 +02:00
Jeff Lowdermilk
6f5e08114a Merge pull request #7407 from brendandburns/recovery2
Support recovery for anonymous roll outs
2015-04-29 20:08:23 -07:00
Gao Zheng
95f2d1378f change probe.runner to probe.Runner as based 2015-04-30 10:36:38 +08:00
Gao Zheng
97456d3f0b Merge branch 'master' of github.com:njuicsgz/kubernetes-1
Conflicts:
	pkg/kubelet/prober/prober.go
2015-04-30 10:25:10 +08:00
Gao Zheng
74975eff03 Fixes issue #7352
readinessProbe calls livenessProbe.Exec.Command which cause
"invalid memory address or nil pointer dereference".
2015-04-30 10:19:49 +08:00
Gao Zheng
28da2ef731 Update probe.go
change log when cannot find probe builder to avoid 'invalid memory access'
2015-04-30 09:11:42 +08:00
Quinton Hoole
a2fe8a9e6c Merge pull request #7527 from cjcullen/dns
Bump kube2sky to 1.2. Point it at https endpoint (3rd try).
2015-04-29 18:00:14 -07:00
Victor Marmol
70830adbad Merge pull request #7525 from yujuhong/container_runtime
Adapt pod killing and cleanup for generic container runtime
2015-04-29 17:24:26 -07:00
Victor Marmol
5f831666de Merge pull request #7526 from yifan-gu/metadata-service
cluster/gce/coreos: Add metadata-service in node.yaml
2015-04-29 17:02:51 -07:00
Brendan Burns
83cbd0cf4c Add recovery for anonymous rollouts. 2015-04-29 16:53:30 -07:00
Yu-Ju Hong
d81ecc58f8 Adapt pod killing and cleanup for generic container runtime
This change removes docker-specifc code in killUnwantedPods. It
also instructs the cleanup code to move away from interacting with
containers directly. They should always deal with the pod-level
abstraction if at all possible.
2015-04-29 16:08:09 -07:00
Yu-Ju Hong
ba1140a54f Merge pull request #7480 from vmarmol/runtime-syncpod
Move ComputePodChanges to the Docker runtime
2015-04-29 16:05:20 -07:00
Jeff Lowdermilk
9fd8cbae64 Merge pull request #7510 from eparis/cobra-rebase
Cobra rebase
2015-04-29 15:08:41 -07:00
CJ Cullen
44cffec157 Bump kube2sky to 1.2. Point it at https endpoint (3rd try). 2015-04-29 14:58:56 -07:00
Yifan Gu
9ba1839f52 cluster/gce/coreos: Add metadata-service in node.yaml 2015-04-29 14:58:26 -07:00
Robert Bailey
ee27094238 Merge pull request #7323 from mbforbes/goSsh
Go SSH e2e tests
2015-04-29 14:35:15 -07:00
Victor Marmol
293828c93c Merge pull request #7515 from brendandburns/kubelet
Fix YAML parsing for v1beta3 objects in the kubelet for file/http
2015-04-29 14:31:49 -07:00
Victor Marmol
209b4fcbef Merge pull request #6718 from vishh/sys_oom1
Adding system oom events from kubelet
2015-04-29 14:29:38 -07:00
Victor Marmol
fe4600ba17 Move ComputePodChanges to DockerManager.
This logic is specific to the Docker runtime. This move is the first
step towards making syncPod() runtime-agnostic.
2015-04-29 14:00:37 -07:00
Yu-Ju Hong
134e585195 Merge pull request #7479 from vmarmol/runtime-prefactor
Move Prober to its own subpackage
2015-04-29 13:53:35 -07:00
CJ Cullen
ad37263ab7 Merge pull request #7516 from GoogleCloudPlatform/revert-7288-perf
Revert "Add a simple cache for objects stored in etcd"
2015-04-29 13:17:08 -07:00
CJ Cullen
182f47ee3d Revert "Add a simple cache for objects stored in etcd" 2015-04-29 12:06:52 -07:00
Brendan Burns
48d269e6ab Fix YAML parsing for v1beta3 objects in the kubelet for file/http 2015-04-29 11:38:36 -07:00
Max Forbes
6102704877 Implement Go e2e SSH utility and simple test that runs it on all nodes. 2015-04-29 11:28:17 -07:00
Max Forbes
ac6a47daf1 Add golang.org/x/crypto to Godeps 2015-04-29 11:27:40 -07:00
Vishnu Kannan
020950fd0f Adding events for system ooms.
Kubelet will continuously watch for system OOMs and generate events whenever it
encounters a system OOM.
2015-04-29 11:19:11 -07:00
Zach Loafman
30c841d491 Merge pull request #7513 from cjcullen/dns
Fix parallel-e2e.sh to work on my macbook (bash v3.2)
2015-04-29 11:01:55 -07:00
CJ Cullen
615906ccca Fix parallel-e2e.sh to work on my macbook (bash v3.2) 2015-04-29 10:52:21 -07:00
Victor Marmol
f38c607285 Move Prober to its own subpackage.
This will allow it to be reused by the runtimes.
2015-04-29 10:11:28 -07:00
Yu-Ju Hong
33b8f487f6 Merge pull request #7449 from vmarmol/runtime-network-plugins
Move network plugin TearDown to DockerManager
2015-04-29 10:09:58 -07:00
CJ Cullen
a529c0e0f3 Merge pull request #7499 from elsonrodriguez/coreos-example-fix
Fixes #7498 - CoreOS Getting Started Guide had invalid cloud config
2015-04-29 10:07:49 -07:00
CJ Cullen
6c22007060 Merge pull request #7504 from resouer/patch-1
Fix invalid character '"' after object key:value pair
2015-04-29 10:07:15 -07:00
Victor Marmol
02231ea75d Merge pull request #7503 from jsafrane/devel/fix-volume-rm
Fixed kubelet deleting data from volumes on stop (#7317).
2015-04-29 10:01:16 -07:00
Brian Grant
4071868581 Merge pull request #7482 from nikhiljindal/verifyDescription
Fixing hooks/description to catch API fields without description tags
2015-04-29 09:56:08 -07:00
Daniel Smith
4d2f7a38c2 Merge pull request #6866 from bprashanth/rc_watch_pods
RcManager watches pods and RCs instead of polling every 10s
2015-04-29 09:10:55 -07:00
Daniel Smith
2802b18b0a Merge pull request #7288 from fgrzadkowski/perf
Add a simple cache for objects stored in etcd
2015-04-29 09:00:33 -07:00
Eric Paris
52a005fa24 Update docs after cobra update (spellling mistake) 2015-04-29 11:26:55 -04:00
Eric Paris
a17a26643b Update kube to support new pflag/cobra 2015-04-29 11:26:30 -04:00
Victor Marmol
dfadc10fcb Merge pull request #7488 from yifan-gu/get_container_logs
kubelet/container: Add GetContainerLogs to runtime interface.
2015-04-29 08:24:20 -07:00
Victor Marmol
38831237b2 Merge pull request #7477 from yifan-gu/refactor_runonce
kubelet: Refactor isPodRunning() in runonce.go
2015-04-29 08:24:09 -07:00
Victor Marmol
fc918cc896 Merge pull request #7466 from yifan-gu/refactor_kube
kubelet/container: Update the runtime interface.
2015-04-29 08:23:50 -07:00
Victor Marmol
587d5a6b85 Merge pull request #7408 from vishh/kubelet_namespace
Set the default namespace for events to be "default"
2015-04-29 08:23:27 -07:00
Victor Marmol
e77fb3a290 Merge pull request #7457 from aveshagarwal/kubelet-systemd-servicefile-issue
cadvisor is obsoleted so kubelet service does not require it.
2015-04-29 08:23:12 -07:00
Eric Paris
b7217a33ab Update spf13/cobra and spf13/pflag 2015-04-29 11:11:43 -04:00
Wojciech Tyczynski
fc6fb0953a Generate conversions 2015-04-29 16:32:56 +02:00
Wojciech Tyczynski
8eca76298f Improvements to conversions generator. 2015-04-29 16:32:31 +02:00
Paul Morie
8fa21ebd62 Merge pull request #7419 from liggitt/secrets_etcd
Convert Secret registry to use update/create strategy, allow filtering by Type
2015-04-29 09:59:22 -04:00
Wojciech Tyczynski
467d5924b2 Merge pull request #7502 from piosz/kubectl
Updated kubectl cluster-info to show v1beta3 addresses
2015-04-29 15:06:28 +02:00
Filip Grzadkowski
016e20167b Add a simple cache for objects stored in etcd. 2015-04-29 13:14:31 +02:00