github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,579 Commits
32 Branches
881 Tags
633 MiB
Commit Graph

2578 Commits (de5f0f73e792af164ccce0891be8c4cbd3da1230)

Author SHA1 Message Date
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
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
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
k8s-merge-robot f030b74be0 Merge pull request #16678 from goltermann/subnet 
Auto commit by PR queue bot
 2015-11-03 23:23:20 -08:00
Karl Isenberg 34ca69cd50 Upgrade mesos/docker cluster to docker-compose 1.5.0 
- Migrate to the new env var interpolation syntax (backwards incompatibile)
 2015-11-03 16:58:13 -08:00
Robert Bailey d5bb12134e Replace monit with supervisord in documentation. 2015-11-03 16:20:02 -08:00
Zach Loafman 4b29260bc6 Bump ContainerVM to container-vm-v20151103 2015-11-03 15:44:36 -08:00
Justin Santa Barbara 2d5671aec2 AWS: Fix kube-up comments per code review 2015-11-03 13:12:17 -05:00
Dawn Chen 956561810f Remove monit related salt files. 2015-11-03 09:31:50 -08:00
Dawn Chen 29614d3fe0 Enable supervisord for other cloud providers. 2015-11-03 09:30:24 -08:00
Justin Santa Barbara 41743ce87a AWS: Delete ASGs by following instances 
We can't tag ASGs, but we can see what instances are running in an ASG,
and we can match those by our tags.

So look for our running instances, and look for the ASGs that created
them, and delete those.

This can be defeated (most notably if users change the ASG size to 0),
but it is safer that other deletion methods.
 2015-11-03 11:58:05 -05:00
Justin Santa Barbara cf86ecc604 AWS: Only match minions in the current ASG 
i.e. don't assume there is only one ASG any more
 2015-11-03 11:58:05 -05:00
Justin Santa Barbara d64643fe26 AWS: Experimental support for multiple subnets/AZs in kube-up 
By setting KUBE_SHARE_MASTER=true we reuse an existing master, rather
than creating a new one.

By setting KUBE_SUBNET_CIDR=172.20.1.0/24 you can specify the CIDR for a
new subnet, avoiding conflicts.

Both these options are documented only in kube-up and clearly marked as
'experimental' i.e. likely to change.

By combining these, you can kube-up a cluster normally, and then kube-up
a cluster in a different AZ, and the new nodes will attach to the same
master.

KUBE_SHARE_MASTER is also useful for addding a second node
auto-scaling-group, for example if you wanted to mix spot & on-demand
instances.
 2015-11-03 11:57:59 -05:00
Justin Santa Barbara df3897c4ab Split main kube-up function into sub-functions 
Makes it a little easier to read, also lets us reuse a master in the
next commit without a complex diff.
 2015-11-03 10:16:32 -05:00
Justin Santa Barbara 1607ac1a7a AWS: use filters in get_igw_id & get_subnet_id 
Also remove unused get_route_table_id
 2015-11-03 10:09:51 -05:00
k8s-merge-robot 9b953d75d2 Merge pull request #16111 from mesosphere/sttts-sandbox-overlay 
Auto commit by PR queue bot
 2015-11-03 03:00:57 -08:00
Dr. Stefan Schimanski 1cebf2f014 Add MESOS_DOCKER_OVERLAY_DIR variable to set overlay volume dir 2015-11-03 11:27:41 +01:00
Dr. Stefan Schimanski 4062e2be2f Add executor sandbox overlay mechanism to distribute nsenter and socat 2015-11-03 11:27:40 +01:00