Commit Graph

288 Commits

Author SHA1 Message Date
Alan Gutierrez
c1c789aea6 Fix generation of master minion.d/grains.conf.
Remove a comment that disabled the redirection of output destined for
`/etc/salt/minion.d/grains.conf`. Must have been a commented added to
debug the generation of the line, to view it on `STDOUT`.
2015-11-16 16:37:56 -05: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
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
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
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
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
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
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
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
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
Justin Santa Barbara
2d5671aec2 AWS: Fix kube-up comments per code review 2015-11-03 13:12:17 -05: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
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
Jan Safranek
fe0741bffe Configure cluster for e2e tests.
When KUBE_E2E_STORAGE_TEST_ENVIRONMENT is set to 'true', kube-up.sh script
will:

- Install the right packages for all storage volumes.
- Use devicemapper as docker storage backend. 'aufs', the default one on
Debian, does not support extended attibutes required by Ceph RBD and Gluster
server containers.

Tested on GCE and Vagrant, e2e tests for storage volumes passes without any
additional configuration.
2015-10-29 11:03:34 +01:00
k8s-merge-robot
f13ed3ff75 Merge pull request #16056 from paralin/fix-aws-reboot-failure
Auto commit by PR queue bot
2015-10-28 22:07:37 -07:00
Juan Valencia
8f5a2deada Fixed #16188 2015-10-27 09:17:28 -07:00
Justin Santa Barbara
1ab663e912 AWS: Log the region when we don't recognize it.
This will help users see when they've typoed the region name (#14278)
2015-10-27 10:18:52 -04:00
k8s-merge-robot
3298eff212 Merge pull request #15936 from justinsb/aws_enable_deployments
Auto commit by PR queue bot
2015-10-24 11:43:05 -07:00
k8s-merge-robot
74a1f7e86f Merge pull request #16131 from brendandburns/aws2
Auto commit by PR queue bot
2015-10-23 23:19:47 -07:00
Dawn Chen
038f871c43 Merge pull request #16071 from brendandburns/heapster
Make heapster config creation dynamic
2015-10-23 09:25:59 -07:00
Brendan Burns
d32e713b77 Make AWS node sizes dynamic in the number of nodes. 2015-10-22 20:22:00 -07:00
Brendan Burns
90d9e6e935 Make heapster config creation dynamic 2015-10-22 12:05:49 -07:00
Justin Santa Barbara
ff44cd113a AWS: Wire-up ENABLE_DEPLOYMENT env var
The AWS equivalent of a558fca24b
2015-10-21 21:57:38 -04:00
k8s-merge-robot
7f7f9e343e Merge pull request #15984 from mikedanese/aws-extensions
Auto commit by PR queue bot
2015-10-21 16:45:12 -07:00
Christian Stewart
baa61c14da
cluster/aws: Fix #14162 reboot docker failure
Fixes AWS ubuntu deployment due to extra-$(uname) vs extra-virtual
package being installed. See issue #14162

Signed-off-by: Christian Stewart <christian@paral.in>
2015-10-21 17:43:21 -04:00
Mike Danese
e9ff8e7f97 fix extensions enabling in aws kube-up 2015-10-20 15:59:30 -07:00
Piotr Szczesniak
57a5f8d5a5 Removed flag ENABLE_HORIZONTAL_POD_AUTOSCALER which is no longer used 2015-10-20 13:59:00 +02:00
Isaac Hollander McCreery
a379e52c57 Factor find-release-tars into cluster/common 2015-10-16 13:09:52 -07:00
Justin Santa Barbara
33d0541a00 AWS: Add configuration for ENABLE_EXPERIMENTAL
We need this for some tests; not all the options are fully plumbed in,
but should enable experimental/v1alpha1, as needed for jobs tests.

In particular, ENABLE_NODE_AUTOSCALER is not yet actually implemented.
2015-10-08 10:15:10 -04:00
Abhi Shah
aa9957e754 Merge pull request #15035 from ArtfulCoder/admissionChange
Removed DenyEscalatingExec from the list of default admission control…
2015-10-06 14:25:12 -07:00
Abhishek Shah
a1b6dbe870 Removed DenyEscalatingExec from the list of default admission controllers. 2015-10-06 13:35:32 -07:00
Alex Robinson
1efee0b49e Merge pull request #8255 from iterion/default_dhcp_option_set
AWS: Create DHCP Option Set on kube-up
2015-10-05 16:29:48 -07:00
Alex Robinson
0b6bcab091 Merge pull request #15049 from Juniper/opencontrail-provisioning
Add opencontrail networking provisioning support in kubernetes via salt based provisioning
2015-10-05 14:40:11 -07:00
Adam Sunderland
1c77179652 Adding DHCP Option Setup
Fix Spacing
2015-10-05 14:13:40 -05:00
Alex Robinson
8b68089ac4 Merge pull request #15071 from justinsb/aws_include_distro_when_not_recognized
AWS: Log the distro when we don't recognize it
2015-10-05 11:19:38 -07:00
Justin Santa Barbara
d898834037 AWS: Log the distro when we don't recognize it
Similar to #15070, we should log the distro if we're going to tell the
user we can't match it (so the user can see if they have typoed it, and
so it will hopefully be included to us in error reports)
2015-10-05 09:25:59 -04:00
Justin Santa Barbara
f763c59743 AWS: Increase the timeout for S3 bucket creation
The current timeout of 5 seconds is needlessly short, given that we
fail kube-up if the (eventually consistent?) bucket creation takes
longer.

Raise it to 120 seconds.

Possibly related to issue #14278
2015-10-05 09:17:12 -04:00
Ananth Suryanarayana
d50d7763da Add opencontrail networking provisioning support in kubernetes salt based provisioning
OpenContrail is an open-source based networking software which provides virtualization support for the cloud.

This change-set adds ability to install and provision opencontrail software for networking in kubernetes based cloud environment.

There are basically 3 components

o kube-network-manager -- plugin between contrail components and kubernets components
o provision_master.sh -- OpenContrail software installer and provisioner in master node
o provision_minion.sh -- OpenContrail software installer and provisioner in minion node(s)

These are driven via salt configuration files

One can provision opencontrail by just setting "export NETWORK_PROVIDER=opencontrail"
Optionally, OPENCONTRAIL_TAG, and OPENCONTRAIL_KUBERNETES_TAG can be used to
specify opencontrail and contrail-kubernetes software versions to install and provision.

Public-IP Subnet provided by contrail can be configured via OPENCONTRAIL_PUBLIC_SUBNET
environment variable

At this moment, plan is to add support for aws, gce and vagrant based platforms

For more information on contrail-kubernetes, please visit https://github.com/juniper/contrail-kubernetes For more information on opencontrail, please visit http://www.opencontrail.org
2015-10-03 08:03:02 -07:00
Brendan Burns
5545630641 Merge pull request #13185 from xsamurai/master
Changed SSH_USER to core instead ubuntu, also applied fixes from #11975
2015-09-30 11:29:46 -07:00
Brian Grant
1b8727ada1 Merge pull request #13072 from mikaelh/master
Elastic IP need to be assigned after the instance is in running state
2015-09-24 17:39:26 -07:00
Paul Weil
ed80c2b940 pid mode 2015-09-15 13:51:44 -04:00
Justin Santa Barbara
9f4ec648b4 AWS: Create one storage pool for aufs, not two
We were splitting the aufs storage into docker & kubernetes areas, but
the kubernetes area was filling up very quickly because empty volumes
went on there, and I had originally not sized it big enough for that.

Instead, create one volume for both so they can share space freely.  We
can't do this for devicemapper, but that configuration seems to be
deprecated by Docker anyway.
2015-09-10 07:06:34 -07:00
derekwaynecarr
06bbe00642 Remove NamespaceExists from configuration 2015-09-03 13:42:09 -04:00