Commit Graph

3233 Commits (b9537245ec098d6747bcd5244a71760b82d1f272)

Author SHA1 Message Date
k8s-merge-robot 70d2a02959 Merge pull request #17701 from hurf/anno_label
Auto commit by PR queue bot
2015-11-26 15:29:46 -08:00
k8s-merge-robot d800e02f84 Merge pull request #17816 from ZJU-SEL/bump-ubuntu-calico
Auto commit by PR queue bot
2015-11-26 14:00:57 -08:00
k8s-merge-robot c7cddbefc9 Merge pull request #17697 from dchen1107/event
Auto commit by PR queue bot
2015-11-26 13:42:05 -08:00
Clayton Coleman 61270f4534 Generated docs 2015-11-26 11:53:37 -05:00
k8s-merge-robot 0c4f302e5e Merge pull request #17601 from eosrei/shell-var-MINION-to-NODE
Auto commit by PR queue bot
2015-11-26 05:02:44 -08:00
k8s-merge-robot 5f8743ea7b Merge pull request #17108 from kargakis/fix-editor-env
Auto commit by PR queue bot
2015-11-26 03:53:53 -08:00
He Simei 0f3f22e99f bump k8s version to v1.1.2 on ubuntu/calico 2015-11-26 15:26:54 +08:00
k8s-merge-robot 0c77ff55c8 Merge pull request #17812 from ZJU-SEL/ubuntu-maintain-doc
Auto commit by PR queue bot
2015-11-25 22:07:25 -08:00
k8s-merge-robot e09dd8df47 Merge pull request #17537 from ihmccreery/upgrading-masters-docs
Auto commit by PR queue bot
2015-11-25 18:39:02 -08:00
He Simei ad557988d7 self-add to the orchestration maintainer of ubuntu 2015-11-26 10:20:07 +08:00
Ravi Gadde cadc24e9fd Scheduler extension 2015-11-25 08:19:27 -08:00
kargakis 523b6ec7e3 edit: Make environment variables composable
It also adds support for KUBE_EDITOR and GIT_EDITOR which were already
advertised in the edit usage message.
2015-11-25 11:23:23 +01:00
Brad Erickson 53172a5356 Minion->Node rename: NUM_NODES 2015-11-25 00:45:10 -08:00
Brad Erickson bd06c19aa8 Minion->Node rename: NODE_SIZE 2015-11-25 00:45:09 -08:00
Brad Erickson fc04b55088 Minion->Node rename: NODE_NAMES, NODE_NAME, NODE_PORT 2015-11-25 00:45:09 -08:00
Brad Erickson 6fe68a737e Minion->Node rename: NODE_IP_BASE, NODE_IP_RANGES, NODE_IP_RANGE, etc
NODE_IPS
NODE_IP
NODE_MEMORY_MB
2015-11-25 00:45:09 -08:00
Brad Erickson a36d3390bf Minion->Node rename: KUBERNETES_NODE_MEMORY, VAGRANT_NODE_NAMES, etc
ENABLE_NODE_PUBLIC_IP
NODE_ADDRESS
NODE_BLOCK_DEVICE_MAPPINGS
NODE_CONTAINER_ADDRS
NODE_CONTAINER_NETMASKS
NODE_CONTAINER_SUBNET_BASE
NODE_CONTAINER_SUBNETS
NODE_CPU
2015-11-25 00:43:52 -08:00
Brad Erickson 6b91b45eff Minion->Node rename: IAM_PROFILE_NODE, KUBE_ENABLE_NODE_PUBLIC_IP, etc
KUBE_GCE_NODE_IMAGE, KUBE_GCE_NODE_PROJECT, KUBEMARK_NUM_NODES
2015-11-25 00:43:51 -08:00
Prashanth Balasubramanian 9aa0efa393 Turn flannel off by default 2015-11-25 09:43:48 +01:00
Prashanth Balasubramanian ad2d3d4c20 Docs etc 2015-11-25 09:42:59 +01:00
Prashanth Balasubramanian 321bc73264 Flannel server in static pod with private etcd. 2015-11-25 09:42:59 +01:00
hurf ad26db7f45 Annotate support label
allow "kubectl annotate pods -l app=nginx"
2015-11-25 14:13:39 +08:00
k8s-merge-robot 4a9b0fc715 Merge pull request #17476 from jiangyaoguo/add-separate-client-for-events
Auto commit by PR queue bot
2015-11-24 21:14:58 -08:00
k8s-merge-robot cc3515d702 Merge pull request #17136 from kargakis/use-deprecation-field-in-stop
Auto commit by PR queue bot
2015-11-24 17:37:19 -08:00
k8s-merge-robot d42030170b Merge pull request #15999 from aveshagarwal/master-issue-15624
Auto commit by PR queue bot
2015-11-24 17:07:10 -08:00
k8s-merge-robot 97401153bd Merge pull request #17195 from janetkuo/kubectl-run-deployment-job
Auto commit by PR queue bot
2015-11-24 11:46:34 -08:00
k8s-merge-robot 2ddc61e941 Merge pull request #17663 from yanns/patch-1
Auto commit by PR queue bot
2015-11-24 10:34:43 -08:00
Janet Kuo c0c02c95c4 kubectl run to produce deployment and job 2015-11-24 10:21:31 -08:00
jiangyaoguo e3ea9d7c40 add separate client for events in kubelet 2015-11-25 01:28:34 +08:00
k8s-merge-robot 564918217f Merge pull request #17633 from yangxiangyu/master
Auto commit by PR queue bot
2015-11-24 07:30:56 -08:00
Avesh Agarwal c053290e04 This commit regenerates docs. 2015-11-24 09:59:54 -05:00
k8s-merge-robot 683e908f0a Merge pull request #17265 from gambol99/rj/node_labels
Auto commit by PR queue bot
2015-11-24 06:55:31 -08:00
k8s-merge-robot 5502aefa01 Merge pull request #17152 from daizuozhuo/jsonpath
Auto commit by PR queue bot
2015-11-24 04:45:38 -08:00
k8s-merge-robot c4bedfbf32 Merge pull request #17298 from caesarxuchao/escape-double-dollar
Auto commit by PR queue bot
2015-11-24 04:37:59 -08:00
k8s-merge-robot 8500a0fe96 Merge pull request #17446 from ihmccreery/no-more-latest
Auto commit by PR queue bot
2015-11-24 03:41:32 -08:00
k8s-merge-robot 53bb90f9bb Merge pull request #17492 from johscheuer/master
Auto commit by PR queue bot
2015-11-24 03:41:26 -08:00
k8s-merge-robot 5f193e7c47 Merge pull request #17552 from AlexChesser/fix-documentation-17519
Auto commit by PR queue bot
2015-11-24 03:41:14 -08:00
k8s-merge-robot 873150362e Merge pull request #17710 from ZJU-SEL/minor-fix-ubuntu-doc
Auto commit by PR queue bot
2015-11-24 03:40:42 -08:00
kargakis 3c7b9f83d7 stop: Make use of deprecation field 2015-11-24 12:27:20 +01:00
He Simei 0a267aa11d minor fix ubuntu doc 2015-11-24 15:09:27 +08:00
yangxiangyu c28b75a91f fix ./master.sh: line 125: --data-dir=/var/etcd/data: No such file or directory 2015-11-24 10:29:50 +08:00
hurf 1270764eb9 Fix description errro for client-certificate option
From "client key file" to "client certificate file".
2015-11-24 09:33:35 +08:00
Dawn Chen 0b734cec93 Have a sane default for RegistryPullQPS 2015-11-23 17:14:15 -08:00
k8s-merge-robot 367f0e03dd Merge pull request #17621 from mikedanese/cleanup-kube-proxy-cgroup
Auto commit by PR queue bot
2015-11-23 15:23:23 -08:00
k8s-merge-robot b38836c1e0 Merge pull request #17625 from ruizeng/master
Auto commit by PR queue bot
2015-11-23 14:52:16 -08:00
Chao Xu 21d8ad3a36 escape $$ in asciidoc when generating api-reference pages 2015-11-23 14:47:17 -08:00
krousey 77e85e45c5 Revert "Added a kubectl cheatsheet." 2015-11-23 10:54:11 -08:00
k8s-merge-robot 4eabda835d Merge pull request #15657 from agonzalezro/patch-1
Auto commit by PR queue bot
2015-11-23 10:42:28 -08:00
k8s-merge-robot c52e45c63c Merge pull request #15674 from erictune/cheatsheet
Auto commit by PR queue bot
2015-11-23 10:42:26 -08:00
Mike Danese 65b8d43543 remove code that puts kube-proxy into a special cgroup since it runs in a container now 2015-11-23 10:20:58 -08:00