Commit Graph

7458 Commits

Author SHA1 Message Date
Michael Schmidt
57f89da69a Fix to detect unformatted volumes in CoreOS
The `file` command used here to check whether a device is formatted is not
available for CoreOS. The effect is that the mounter tries to mount an
unformatted volume which fails. This makes it quite tedious to use persistent
volumes in CoreOS.

This patch replaces the `file` command with `lsblk` which is available in
CoreOS. I checked that it's also available on RHEL, Debian, Ubuntu and SLES.
2015-09-17 15:25:23 +02:00
Piotr Szczesniak
81d3bd9a36 Merge pull request #14034 from jszczepkowski/hpa-unittest
Unittests for horizontal pod autoscaler controller.
2015-09-17 13:53:29 +02:00
k8s-merge-robot
e83bf49f86 Merge pull request #13957 from ghodss/rename-deployment-structs
Auto commit by PR queue bot
2015-09-17 04:23:13 -07:00
k8s-merge-robot
b342591032 Merge pull request #13604 from JanetKuo/kubectl-edit
Auto commit by PR queue bot
2015-09-17 03:00:33 -07:00
k8s-merge-robot
2e255b5fcd Merge pull request #13977 from JanetKuo/kubectl-scale-rc-pd
Auto commit by PR queue bot
2015-09-17 01:52:33 -07:00
k8s-merge-robot
bf990acefa Merge pull request #13988 from thockin/kube-proxy-startup-clobber
Auto commit by PR queue bot
2015-09-17 01:29:35 -07:00
k8s-merge-robot
4b5c2253f3 Merge pull request #14012 from brendandburns/apiserver
Auto commit by PR queue bot
2015-09-17 00:48:51 -07:00
Jerzy Szczepkowski
722b0a6cf8 Unittests for horizontal pod autoscaler controller.
Unittests for horizontal pod autoscaler controller.
2015-09-17 09:32:05 +02:00
k8s-merge-robot
445fde3dc5 Merge pull request #13447 from pweil-/pid-mode
Auto commit by PR queue bot
2015-09-16 23:34:35 -07:00
k8s-merge-robot
d680ea2444 Merge pull request #13542 from yujuhong/backoff_restarts
Auto commit by PR queue bot
2015-09-16 23:11:42 -07:00
k8s-merge-robot
f44432ae7b Merge pull request #13702 from ghodss/ghodss-yaml-upgrade
Auto commit by PR queue bot
2015-09-16 22:27:24 -07:00
Alex Mohr
2cf207ec60 Merge pull request #13992 from aveshagarwal/userspace-proxy-typo
Fixes error message.
2015-09-16 21:49:19 -07:00
Alex Mohr
0789627b6c Merge pull request #14025 from zhengguoyong/fix-var-hostdir
fix the change of hostDir to hostPath
2015-09-16 21:47:53 -07:00
k8s-merge-robot
7cd7aaec9b Merge pull request #13910 from wojtek-t/watch_resoure_version
Auto commit by PR queue bot
2015-09-16 21:40:34 -07:00
k8s-merge-robot
80e6d660b0 Merge pull request #13915 from tmrts/docs/improvement
Auto commit by PR queue bot
2015-09-16 21:17:37 -07:00
k8s-merge-robot
d5a6466349 Merge pull request #14056 from yifan-gu/rkt_image
Auto commit by PR queue bot
2015-09-16 20:52:20 -07:00
k8s-merge-robot
2da93a48b1 Merge pull request #13864 from feiskyer/logs-follow
Auto commit by PR queue bot
2015-09-16 19:27:44 -07:00
Mike Danese
77a06cbf05 Merge pull request #13183 from mikedanese/daemon_kubectl
Add daemonset support to kubectl
2015-09-16 19:02:36 -07:00
k8s-merge-robot
ac8e548f35 Merge pull request #13922 from jszczepkowski/events-cleaunp
Auto commit by PR queue bot
2015-09-16 18:44:06 -07:00
k8s-merge-robot
426d4a2477 Merge pull request #13945 from caesarxuchao/kube-api-prefix
Auto commit by PR queue bot
2015-09-16 18:43:55 -07:00
k8s-merge-robot
de233d35da Merge pull request #13958 from feihujiang/removeUselessCodeAboutMinion
Auto commit by PR queue bot
2015-09-16 17:59:00 -07:00
k8s-merge-robot
4c46bc3243 Merge pull request #13989 from yujuhong/sync_first
Auto commit by PR queue bot
2015-09-16 17:16:23 -07:00
Brendan Burns
58e7cc4106 Add a not found error to admission control 2015-09-16 13:17:29 -07:00
Yifan Gu
ad33db1a84 kubelet/rkt: bump rkt version for rkt image list fix. 2015-09-16 11:31:59 -07:00
Kel Cecil
6687075300 Correct AWS EBS comment 2015-09-16 14:04:36 -04:00
k8s-merge-robot
22f698f5b0 Merge pull request #13953 from liguangbo/change_iff_to_if_and_only_if
Auto commit by PR queue bot
2015-09-16 08:35:20 -07:00
eulerzgy
d312c30847 fix the change of hostDir to hostPath 2015-09-16 22:31:17 +08:00
feisky
800e8fb54c Fix kubelet logs --follow bug 2015-09-16 22:06:50 +08:00
k8s-merge-robot
75bce0ed8d Merge pull request #14000 from mikedanese/nc_spam
Auto commit by PR queue bot
2015-09-16 04:45:40 -07:00
liguangbo
4df68f03a3 change iff to if and only if to improve annotation readability 2015-09-16 08:29:36 +00:00
k8s-merge-robot
f6fb0a58b6 Merge pull request #13874 from timstclair/status-manager
Auto commit by PR queue bot
2015-09-16 00:46:01 -07:00
Jerzy Szczepkowski
04919ebfa9 Fixed reasons of some events.
Fixed reasons of some events: made consistent with API conventions (CamelCase).
2015-09-16 08:46:31 +02:00
feihujiang
ba38a8764b Remove useless codes about minion 2015-09-16 14:22:53 +08:00
k8s-merge-robot
20d74e9fb0 Merge pull request #13983 from mikedanese/ds_cleanup
Auto commit by PR queue bot
2015-09-15 21:33:47 -07:00
Janet Kuo
5a608446ba pull "kubectl edit" from openshift upstream 2015-09-15 19:16:23 -07:00
Mike Danese
54b0faf39a rebase onto head 2015-09-15 18:13:28 -07:00
Ananya Kumar
30f5b93d2f Add Kubectl support for Daemon 2015-09-15 18:11:12 -07:00
Janet Kuo
3aad8cabbd Better error handling when scaling a rc 2015-09-15 18:04:04 -07:00
Jeff Lowdermilk
a92c8b6886 Merge pull request #13384 from ZJU-SEL/portsbindings
Allow multiple host ports map to the same container port
2015-09-15 17:57:57 -07:00
Jeff Lowdermilk
9ed2d842bc Merge pull request #12655 from gmarek/api_ports
Add information about ports opened by Kubelet to API
2015-09-15 17:54:31 -07:00
Jeff Lowdermilk
20e127028f Merge pull request #12396 from danwinship/iptables
Update util/iptables to deal with firewalld
2015-09-15 17:54:16 -07:00
Jeff Lowdermilk
e0aeb1151b Merge pull request #9870 from markturansky/recyc_config
Allow Volume Plugins to be configurable
2015-09-15 17:53:49 -07:00
Jeff Lowdermilk
b2c74a7297 Merge pull request #13254 from soltysh/job_controller_kubectl
Job resource - kubectl part
2015-09-15 17:45:14 -07:00
Jeff Lowdermilk
9a8ce4867e Merge pull request #13952 from zhengguoyong/fix-apiserver
fix the optim of apiserver
2015-09-15 17:43:36 -07:00
k8s-merge-robot
02c0e091d2 Merge pull request #13879 from krousey/etcd_prefix_default
Auto commit by PR queue bot
2015-09-15 16:19:31 -07:00
Sam Ghods
cc6754f8d9 Rename Deployment API structs 2015-09-15 14:46:41 -07:00
Mike Danese
c24ef49c90 only log when we are actually cancelling an eviction in the node controller 2015-09-15 14:45:56 -07:00
k8s-merge-robot
f03a267089 Merge pull request #13895 from jhadvig/typos_fix
Auto commit by PR queue bot
2015-09-15 14:29:06 -07:00
k8s-merge-robot
7d7ceea0e1 Merge pull request #13946 from bprashanth/l7_cloudapi
Auto commit by PR queue bot
2015-09-15 14:28:29 -07:00
Yu-Ju Hong
8f8541b4cd kubelet: make sure sync loop is run before performing housekeeping
Otherwise, kubelet may kill the existing pods before having a chance to update
the desired pods.
2015-09-15 13:11:55 -07:00