Commit Graph

137 Commits (458eb5284abd6933c620ba8ea383032f225e0885)

Author SHA1 Message Date
Brendan Burns 4f845ad6e1 Merge pull request #19642 from MikeSpreitzer/issue/19618
Introduce FLANNEL_OTHER_NET_CONFIG
2016-01-27 12:20:11 -08:00
Jean-Francois Chevrette c5dca43427 remove etcd dependency on sysv init scripts 2016-01-21 13:38:27 -05:00
Mike Spreitzer bf671f5723 Fix reference to kubernetes release
Replace old repo name with https://github.com/kubernetes/kubernetes.
Update default release to the latest, which is 1.1.4.
2016-01-18 23:54:36 -05:00
Mike Spreitzer d4ab9663c4 Introduce FLANNEL_OTHER_NET_CONFIG
.. so allow configuration of other fields in, usually,
/coreos.com/network/config in etcd.

Fixes #19618
2016-01-14 01:27:13 -05:00
Mike Spreitzer f23e4fb37b Make deployAddons.sh ensure KUBE_CONFIG_FILE is defined
Fixes #19484
2016-01-13 23:12:11 -05:00
He Simei 5d92dd4cb8 fix typo 2015-12-17 09:51:07 +08:00
Robert Bailey 74d568815b Fix a typo in #18490. 2015-12-16 09:00:13 -08:00
k8s-merge-robot c6299c48db Merge pull request #18490 from ZJU-SEL/configurable-kubelet-config
Auto commit by PR queue bot
2015-12-15 22:20:27 -08:00
He Simei 1571edfb94 propagate config file 2015-12-11 16:50:05 +08:00
k8s-merge-robot 1b90941841 Merge pull request #18456 from thockin/bump-flannel-ver
Auto commit by PR queue bot
2015-12-11 00:34:39 -08:00
Tim Hockin 6b830cf229 Fix a couple flannel invocations I missed 2015-12-10 11:48:46 -08:00
k8s-merge-robot 8847c6dba8 Merge pull request #17877 from ZJU-SEL/vxlan
Auto commit by PR queue bot
2015-12-10 07:24:41 -08:00
k8s-merge-robot 184171c583 Merge pull request #17615 from hpcloud/source-config-default
Auto commit by PR queue bot
2015-12-10 05:14:02 -08:00
He Simei 86d5a23238 make --config for kubelet configurable 2015-12-10 19:52:02 +08:00
He Simei c46957ed5e specify advertise-address for api-server 2015-12-10 10:49:11 +08:00
Arsen Mamikonyan 693213656b Add --config=/etc/kubernetes/manifests to kubelet 2015-12-08 15:33:47 -08:00
Robert Roland ebeb7bc524 Removing quoting of the PROXY_SETTING value.
When PROXY_SETTING is empty, you end up an empty
command of "", as witnessed by this bash debug
output when +x is enabled:

    + '' /home/ubuntu/kube/make-ca-cert.sh 10.0.0.232 IP:10.0.0.232,IP:192.168.3.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local

Given the example:

    PROXY_SETTING="http_proxy=http://server:port https_proxy=https://server:port"

You would not want this quoted on the script executed
on the remote master or minion node.

Enabling +e, for additional tracing and to
abort on any failure in the remote SSH session.

Adding a DEBUG parameter into config-default.sh allowing additional
debug information to be present in the logs during node rollout, using
bash's "set -x" when DEBUG=true
2015-12-08 07:53:02 -08:00
Robert Roland 6698ac6dcc Need to source the config-default.sh file before modifying the /etc/default/docker file, otherwise the DOCKER_OPTS set there do not get applied to new minion nodes. 2015-12-08 07:52:11 -08:00
k8s-merge-robot ffd5725690 Merge pull request #18008 from ZJU-SEL/multi-nic
Auto commit by PR queue bot
2015-12-05 05:50:33 -08:00
k8s-merge-robot 8c182c2713 Merge pull request #18002 from wiwiwa/systemd
Auto commit by PR queue bot
2015-12-03 09:18:48 -08:00
He Simei cab6c13ea2 ubuntu with multi-nic 2015-12-03 15:31:15 +08:00
samuel shan c55ab7d63e ubuntu: skip download binaries if specified version exists 2015-12-03 10:37:02 +08:00
jiangyaoguo a739fc44c4 keep kubeproxy hostname consistent with kubelet 2015-11-28 10:47:29 +08:00
Harry Zhang eae12de67c Use vxlan as default backend 2015-11-27 14:24:14 +00:00
Brad Erickson 53172a5356 Minion->Node rename: NUM_NODES 2015-11-25 00:45:10 -08:00
k8s-merge-robot 2371cdaac4 Merge pull request #17419 from ZJU-SEL/fix-ubuntu-etcd-flag
Auto commit by PR queue bot
2015-11-23 03:19:17 -08:00
He Simei e0bcf11abf upgrade k8s to v1.1.2 on ubuntu 2015-11-21 11:29:41 +08:00
He Simei 5ebff99dbf fix etcd flag for ubuntu 2015-11-21 10:17:07 +08:00
He Simei 208d65ab59 kube-down gracefully 2015-11-19 15:38:27 +08:00
He Simei cc9fff8e92 fix kube-up workflow 2015-11-18 14:54:32 +08:00
He Simei b836f0cf85 fix messy quote thing 2015-11-18 09:47:33 +08:00
He Simei 8749638b9e clean up deployment script for ubuntu 2015-11-17 09:29:34 +08:00
k8s-merge-robot 142eae0f78 Merge pull request #14912 from thaerlo/master
Auto commit by PR queue bot
2015-11-11 02:17:38 -08:00
k8s-merge-robot fb7520153d Merge pull request #16921 from buzzy/master
Auto commit by PR queue bot
2015-11-10 12:01:51 -08:00
Harry Zhang 88f65d5dfb Declare function-specific variables with local 2015-11-08 09:20:21 +00:00
k8s-merge-robot 8fd069ded2 Merge pull request #16850 from ZJU-SEL/set-kubectl-path
Auto commit by PR queue bot
2015-11-08 00:15:20 -08:00
He Simei ba5b65ece2 set valid kubectl path for ubuntu 2015-11-07 10:47:18 +08:00
Daniele Testa dd2a77f73a Always use $SSH_OPTS on SSH connections 2015-11-06 16:57:18 +00:00
Joe Beda 993c1ee222 Update etcd to 2.2.1 2015-11-04 12:26:57 -08:00
Jeff Lowdermilk de4f29f1f5 Load or generate auth from kubeconfig on kube-up
Allows loading existing auth from kubeconfig on kube-up if a
valid KUBE_CONTEXT is specified, instead of always force
regenerating auth (basic or token) when creating a new cluster.
2015-10-30 10:19:40 -07:00
k8s-merge-robot 0aa62edaf5 Merge pull request #13897 from darron/patch-1
Auto commit by PR queue bot
2015-10-21 02:20:03 -07:00
He Simei d45fc707dd minor clean upstart script for ubuntu 2015-10-18 18:37:01 +08:00
k8s-merge-robot 4008c65323 Merge pull request #15135 from ZJU-SEL/upgrade-flannel
Auto commit by PR queue bot
2015-10-13 07:07:18 -07:00
He Simei 3e9905bb07 fix incorrect upstart script for ubuntu 2015-10-08 13:57:22 +08:00
He Simei c41eda7309 kube-down gracefully 2015-10-08 13:30:37 +08:00
He Simei 51f1570710 upgrade flannel to 0.5.3 2015-10-08 13:28:58 +08:00
thaerlo 6e6c5375d2 Changed config-default.sh: deleting the DenyEscalatingExec option from ADMISSION_CONTROL, so kube-apiserver can start correctly.
Changed util.sh: provision-* functions so every flannel interface is created after starting the etcd service and reconfDocker.sh with the "i" option is launched after every flannel interface is up and running.
2015-10-04 22:03:54 -04:00
He Simei d593c42e42 deprecate unknown admission control 2015-10-01 12:45:36 +08:00
He Simei be14f720c4 upgrade k8s to 1.0.6 for ubuntu 2015-10-01 12:45:36 +08:00
Brian Grant dc9a094e1f Merge pull request #14251 from zhengguoyong/del-whitespace2
delete the front whitespace of the annotation
2015-09-24 16:52:42 -07:00