Commit Graph

2594 Commits

Author SHA1 Message Date
k8s-merge-robot
1bcf03f3fb Merge pull request #16646 from aalexand/dns-poll
Auto commit by PR queue bot
2015-11-16 03:57:24 -08:00
k8s-merge-robot
96ae38c036 Merge pull request #16802 from extesy/patch-1
Auto commit by PR queue bot
2015-11-15 06:07:10 -08:00
Dr. Stefan Schimanski
3009555dd5 cluster/mesos/docker: increase dind loop device size to 10GB
For the conformance tests 5 GB turned out to be not enough.
2015-11-13 19:41:57 +01:00
k8s-merge-robot
abbed4f7e8 Merge pull request #17029 from mesosphere/sttts-enforce-log-dump
Auto commit by PR queue bot
2015-11-13 10:22:57 -08:00
k8s-merge-robot
ec61441a80 Merge pull request #17159 from 2opremio/17157-socat-hyperkube-container
Auto commit by PR queue bot
2015-11-12 23:41:09 -08:00
Derek Parker
909fba00a5 docs: fix typo 2015-11-12 11:45:04 -08:00
Dr. Stefan Schimanski
58f57f8a18 Move MESOS_DOCKER_SKIP_BUILD default to config-default.sh 2015-11-12 14:15:43 +01:00
Dr. Stefan Schimanski
3d2ae0e67f Move MESOS_DOCKER_DUMP_LOGS default to config-default.sh 2015-11-12 14:14:48 +01:00
Alfonso Acosta
a9465e77c7 Add socat command to hyperkube image
This is needed to for port forwarding to work in kubelet.
2015-11-12 12:39:35 +00:00
k8s-merge-robot
440bdd27d5 Merge pull request #17087 from justinsb/aws_delete_ebs
Auto commit by PR queue bot
2015-11-12 01:17:40 -08:00
k8s-merge-robot
eee8af8991 Merge pull request #17089 from justinsb/aws_refactor_script_size
Auto commit by PR queue bot
2015-11-12 01:17:37 -08:00
Dr. Stefan Schimanski
b502032b42 Add MESOS_DOCKER_DUMP_LOGS to enforce log dumping 2015-11-12 01:33:29 +01:00
k8s-merge-robot
b873dce298 Merge pull request #16006 from paralin/remove-experimental-api-env
Auto commit by PR queue bot
2015-11-11 16:23:35 -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
b7d4f55df2 Merge pull request #16187 from brendandburns/heapster
Auto commit by PR queue bot
2015-11-11 01:46:35 -08:00
k8s-merge-robot
2c73e43002 Merge pull request #16972 from pmorie/kubelet-makefile
Auto commit by PR queue bot
2015-11-10 23:31:14 -08:00
Justin Santa Barbara
875e3d49df AWS: Create a helper to set salt grain from env var
This is better from a DRY standpoint.

This helps reduce the script size, so we have a little bit of breathing
room vs the 16KB limit.
2015-11-10 23:50:51 -05:00
Justin Santa Barbara
d5f62ca67b AWS: Don't use JSON parsing in kube-up
We use the AWS CLI support for --query and --filter instead; should be
more reliable and clearer.

Also set the output format to text, so we don't have to set it every
time and don't risk problems if we forget to set it.

Fixes #16747

We do still have to use JSON parsing in one place: ELB does not support
--filter, so we have to use Python there.
2015-11-10 23:30:42 -05:00
Christian Stewart
d61d57adec
Remove ENABLE_EXPERIMENTAL_API and similar in favor of KUBE_RUNTIME_CONFIG.
Addresses #15968

This patch removes KUBE_ENABLE_EXPERIMENTAL_API and similar calls in
favor of specifying desired features in KUBE_RUNTIME_CONFIG. Changes
have also been made to e2e scripts to re-enable using
KUBE_RUNTIME_CONFIG rather than EXPERIMENTAL_API env vars.

This also introduces KUBE_ENABLE_DAEMONSETS and KUBE_ENABLE_DEPLOYMENTS.

Signed-off-by: Christian Stewart <christian@paral.in>
2015-11-10 21:36:34 -05:00
k8s-merge-robot
23cd7d0251 Merge pull request #17067 from mesosphere/jdef_ignore_mesos_docker_km_overlay
Auto commit by PR queue bot
2015-11-10 15:41:26 -08:00
Brendan Burns
bd65c733b3 Add some more retry... 2015-11-10 13:06:12 -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
k8s-merge-robot
18c74de9a8 Merge pull request #16986 from pmorie/gce-sc
Auto commit by PR queue bot
2015-11-10 11:15:27 -08:00
k8s-merge-robot
6fbae33eb1 Merge pull request #16918 from justinsb/aws_fix_kubedown_no_instances
Auto commit by PR queue bot
2015-11-10 11:11:56 -08:00
James DeFelice
8cb3e2191e added .gitignore for ignoring generated binaries in cluster/mesos/docker/km/overlay 2015-11-10 18:52:55 +00: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
Prashanth B
17c5c0922b Merge pull request #16932 from bprashanth/ing_docs
Ingress doc clarifications
2015-11-07 17:07:27 -08:00
Paul Morie
0ac50b4ba6 Revert "Delete Makefile as it is useless"
This reverts commit 8bf5a50439.
2015-11-07 14:19:22 -05:00
k8s-merge-robot
7d7aa9ec1f Merge pull request #16939 from ihmccreery/versioning-cleanup
Auto commit by PR queue bot
2015-11-07 09:21:24 -08:00
k8s-merge-robot
157f663f5b Merge pull request #16867 from justinsb/aws_log_upload_urls
Auto commit by PR queue bot
2015-11-07 00:00:28 -08:00
He Simei
ba5b65ece2 set valid kubectl path for ubuntu 2015-11-07 10:47:18 +08:00
k8s-merge-robot
da158f9bcf Merge pull request #16922 from justinsb/aws_update_vivic
Auto commit by PR queue bot
2015-11-06 13:01:17 -08:00
Prashanth Balasubramanian
10d1d4c791 Ingress doc clarifications 2015-11-06 12:01:52 -08:00
Isaac Hollander McCreery
e5449f7d42 Cleanup for versioning 2015-11-06 11:35:16 -08:00
k8s-merge-robot
b719d7a45e Merge pull request #15070 from justinsb/aws_print_region_if_not_matching
Auto commit by PR queue bot
2015-11-06 10:31:29 -08:00
Paul Morie
ff88cc4df9 Allow security context in GCE clusters 2015-11-06 13:01:54 -05:00
Justin Santa Barbara
4c02b85c7a AWS: Update Ubuntu Vivid AMIs
Pick up some updates, and reduce need for users to update manually.
2015-11-06 11:58:39 -05:00
Daniele Testa
dd2a77f73a Always use $SSH_OPTS on SSH connections 2015-11-06 16:57:18 +00:00
Justin Santa Barbara
84bab0dae5 AWS: kube-down was failing with no instances
The new delete-ASG logic wasn't correct if there were no instances
2015-11-06 10:43:13 -05:00
k8s-merge-robot
449d467d36 Merge pull request #16655 from ZJU-SEL/patch-makefile
Auto commit by PR queue bot
2015-11-06 01:43:24 -08:00
k8s-merge-robot
0b183f43fd Merge pull request #16574 from hurf/stop_doc
Auto commit by PR queue bot
2015-11-05 19:43:21 -08:00
k8s-merge-robot
75dadbc117 Merge pull request #16763 from zmerlynn/bump-containervm
Auto commit by PR queue bot
2015-11-05 14:55:40 -08:00
k8s-merge-robot
3a6c9df1f5 Merge pull request #16719 from mikedanese/enable-deploy
Auto commit by PR queue bot
2015-11-05 13:11:31 -08:00
Justin Santa Barbara
5bde574eca AWS: Log the download URLs after we upload to S3
This is helpful if you want to manually update a cluster.
2015-11-05 14:39:18 -05:00
k8s-merge-robot
1831a057f1 Merge pull request #16694 from jbeda/update-etcd
Auto commit by PR queue bot
2015-11-05 03:27:26 -08:00
k8s-merge-robot
4ac9a6e888 Merge pull request #16735 from justinsb/aws_kube_up_improvements
Auto commit by PR queue bot
2015-11-04 17:56:18 -08:00
Joe Beda
993c1ee222 Update etcd to 2.2.1 2015-11-04 12:26:57 -08:00
Oleg Anashkin
1fcb0019b9 Fix running mesos-docker configuration on Darwin
When following https://github.com/kubernetes/kubernetes/blob/master/docs/getting-started-guides/mesos-docker.md guide on Mac it builds binaries under Darwin platform, therefore km/build.sh can't find km binary because it was only looking for Linux. This change makes it also look for Darwin binaries too.
2015-11-04 11:37:08 -08:00
k8s-merge-robot
8e5f3a3f9b Merge pull request #16761 from roberthbailey/supervisord
Auto commit by PR queue bot
2015-11-04 02:28:38 -08:00