Commit Graph

59 Commits

Author SHA1 Message Date
Justin Santa Barbara 42321adec7 Update expected cloudformation output for tighter route53 policy
Fix #1951
2017-02-20 14:08:26 -05:00
Kris Nova 540947cbc4 Merge pull request #1877 from justinsb/cloudformation
Initial support for cloudformation output
2017-02-19 10:19:14 -07:00
Justin Santa Barbara fec89f0f33 Skip DNS precreate on CF; a few test fixes 2017-02-17 11:04:39 -05:00
Justin Santa Barbara 7d68f744f6 Initial support for cloudformation output 2017-02-17 10:59:16 -05:00
Zac Blazic e6ea6a00fa
Rebase for flannel support 2017-02-14 21:49:58 +02:00
Zac Blazic 42a619b873
Update tf output to match expected output 2017-02-14 21:34:58 +02:00
Matthew Mihok bc235765d1 Adding basic flannel support 2017-02-11 16:26:18 -05:00
Justin Santa Barbara 9ef75746e9 Fix test failure
Caused by terraform default format change & crossing of PRs
2017-02-11 11:19:08 -05:00
Stephen Schlie 991fc5bc7c Integrating Canal (Flannel + Calico) for CNI (#1459)
* Integrating Canal (Flannel + Calico) for CNI

Initial steps to integrate Canal as a CNI provider for kops

Removed CNI in help as per chrislovecnm

* Integration tests, getting closer to working

- Added some integration tests for Canal
- Finding more places Canal needed to be added
- Sneaking in update to Calico Policy Controller

* Add updated conversion file

* turned back on canal integration tests

* fixed some rebase issues

* Fixed tests and flannel version

* Fixed canal yaml, and some rebasing errors

- Added some env vars to the install-cni container to get the proper
  node name handed off

* Added resource limits

- set resource limits on containers for Canal
- Ran through basic calico tutorials to verify functionality

* Updating Calico parts to Calico 2.0.2
2017-02-11 11:03:23 -05:00
Justin Santa Barbara 5a4ddb2f8d create cluster: take correct k8s version
We were not overriding the cluster version, even when a kubernetes
version could be determined from the direct specifications.
2017-02-07 01:18:13 -05:00
Justin Santa Barbara e6fb6281f6 Merge pull request #1804 from justinsb/fix_create_test_k8s_version
Specify KubernetesVersion in create cluster test
2017-02-07 01:17:59 -05:00
Justin Santa Barbara 61631f4815 Specify KubernetesVersion in create cluster test
We probably should use a canned channel, but in the interim this is
probably the best option, otherwise every time we update the stable
channel we break the tests.
2017-02-07 00:27:57 -05:00
Kris Nova b05e1b0ad3 Bump to 1.4.8 in integration tests to fix #1799 2017-02-06 21:23:43 -07:00
Justin Santa Barbara 32bd620f36 Fix tests 2017-02-06 16:23:00 -05:00
Justin Santa Barbara 2d5fd877ad Add --master-count flag, to make it easy to run masters in the same AZ
* The master zones are the default set of zones unless explicitly set
* The master count is the number of master zones unless explicitly set
* We then round-robin around the zones
* We append a suffix -1, -2, -3 if there are more masters than zones
* We trim prefixes to keep etcd member names short

Fix #1653
2017-01-31 01:11:06 -05:00
Justin Santa Barbara e9d0a93e0c Fix extra security group tests 2017-01-31 00:28:47 -05:00
Justin Santa Barbara 37bfe29406 Merge pull request #1444 from tsupertramp/allow-adding-existing-security-groups
Allow adding existing security groups
2017-01-31 00:27:40 -05:00
Justin Santa Barbara 3c6ed44a94 Merge pull request #1651 from tazjin/fix/terraform-format
fix cloudup: Apply Terraform formatting to TF files
2017-01-30 21:04:54 -05:00
Thomas Peitz 27957062ac Fix additionalSecurityGroups in tests 2017-01-30 19:33:23 +01:00
Thomas Peitz 651f50e257 Add tests for additionalSecurityGroupIDs 2017-01-30 18:58:48 +01:00
Chris Love 080f2ca8df Merge pull request #1691 from justinsb/versioned_images
Add version-dependent recommendations to alpha channel
2017-01-29 14:53:12 -07:00
Justin Santa Barbara 2ac112a2dd Add version-dependent recommendations to alpha channel
Issue #1667
2017-01-29 14:08:44 -05:00
Chris Love 97a4ba8c02 Merge pull request #1661 from justinsb/fix_1641
Allow specification of multiple CIDRs to create cluster
2017-01-29 01:28:28 -07:00
Justin Santa Barbara bd5d7c83a5 AssociatePublicIP defaults to nil
Rather than always setting it (incorrectly in many cases), we infer it
from the subnets.

Users can still set it, we just don't default it to a value we then
ignore.

Fix #1582
2017-01-28 21:40:31 -05:00
Justin Santa Barbara 7e232f14d8 Allow specification of multiple CIDRs to create cluster
Fix #1641
2017-01-28 15:58:50 -05:00
Vincent Ambo fa56d5ca92 chore: Apply terraform fmt to integration test files 2017-01-27 22:04:43 +01:00
Justin Santa Barbara 379e0ca098 Channel manifest should be version aware
* We can target AMIs to kubernetes versions
* We can recommend / force a kops upgrade
* We can recommend / force a kubernetes upgrade
2017-01-25 23:13:48 -05:00
Justin Santa Barbara d885074723 Merge pull request #1560 from justinsb/kops_get_should_include_cluster_label
Include `cluster` label in `kops get ig -oyaml`
2017-01-21 09:50:58 -05:00
Justin Santa Barbara 686e4efa3b Egress follow up
* Round trip to v1alpha1
* Enable test
2017-01-20 00:40:41 -05:00
Justin Santa Barbara 2b277c6789 Include `cluster` label in `kops get ig -oyaml`
Fix #1559
2017-01-19 22:59:55 -05:00
Eric Hole 8c0a4f2890 Fix integration tests. 2017-01-10 10:20:02 -05:00
Eric Hole a03ba42b56 Merge branch 'master' into kris-and-eric-1282 2017-01-09 22:01:59 -05:00
Eric Hole f5b3425d3d First pass at create_cluster_integration_test for specifying NGWs. 2017-01-09 17:28:10 -05:00
Justin Santa Barbara 6393290f47 Merge pull request #1313 from justinsb/security_to_master
Lock down master security group rules
2017-01-09 12:23:17 -05:00
Justin Santa Barbara 7140117780 Separate protocol rule naming from AWS rules 2017-01-09 11:35:18 -05:00
Justin Santa Barbara 41495f36fe Default bastion name should be bastion.<clusterName>
bastion-<clustername> is not necessarily in the same hosted zone, nor is
bastion-<dnszone>, and bastion-<dnszone> is not necessarily unique
across clusters.
2017-01-09 11:01:56 -05:00
Justin Santa Barbara d2480299a9 Update expected terraform output 2017-01-09 10:52:33 -05:00
Justin Santa Barbara 61011650dd Support private hosted zones in DNS 2017-01-09 09:32:52 -05:00
Justin Santa Barbara 1890bb43a9 Tag ELBs when building with terraform
Otherwise we can't delete
2017-01-08 01:35:15 -05:00
Justin Santa Barbara 53135fa57e Add conversion tests, and fix some problems
* We were naming our etcd zones inconsistently
* When we wrote to v1alpha2, we would change the etc member names

Fix #1202
2017-01-07 21:54:15 -05:00
Justin Santa Barbara 2912dee6e1 Rename -> AccessSpec, ELB -> LoadBalancer
Also add docs
2017-01-04 23:04:30 -05:00
Justin Santa Barbara e41e938e1c Fix tests: bastions should get public ip 2017-01-04 23:04:30 -05:00
Justin Santa Barbara f52300d020 Fix tests: default api block 2017-01-04 23:04:30 -05:00
Justin Santa Barbara 9545c5dbd7 Lock down bastion->master/nodes
Only open port 22 (SSH)

Fix #1312
2017-01-03 11:20:01 -05:00
Justin Santa Barbara cf78fa134d Update integration tests for version bump
We really should be using a copy of the stable channel, but for now we
want to get the tests working.
2016-12-28 12:56:18 -05:00
Justin Santa Barbara f665733b0d Add test for bastion creation
Bastions are created when `-bastion` is passed.

Issue #1232
2016-12-27 01:29:50 -05:00
heschlie 5cb8575dfe Fixed CI integration, added some tests for Calico
- CI issues were due to v1alpha2 being added, created Calico there
- Added some tests around Calico, similar to Weave
- Added conversion functions similar to Weave in zz_generated_conversion
2016-12-21 19:15:52 -08:00
Justin Santa Barbara 8ce09c65e9 Fixes per code review 2016-12-19 01:18:28 -05:00
Justin Santa Barbara 91b77ae11e Multi-version testing; fix few edge cases
By testing with data from various schema versions, we effectively check
that they are equivalent.

Also this uncovered a few places where we were not strictly ordering
things - add some sorts in there.
2016-12-18 23:14:29 -05:00
Justin Santa Barbara ef6d1fddf5 Update tests for new TF output 2016-12-18 21:56:57 -05:00