Merge pull request #1717 from justinsb/ci_extra_securitygroups

Fix extra security group tests

docs/advanced_create.md

@@ -10,8 +10,8 @@ kops create cluster \
     --dns-zone kubernetes.com \
     --node-size t2.medium \
     --master-size t2.medium \
-    --node-security-groups i-123456 \
+    --node-security-groups sg-12345678 \
-    --master-security-groups i-123456,i-123457 \
+    --master-security-groups sg-12345678,i-abcd1234 \
     --topology private \
     --networking weave \
     --image 293135079892/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-11-16 \

tests/integration/create_cluster/ha/options.yaml

@@ -1,4 +1,10 @@
 ClusterName: ha.example.com
-Zones: us-test-1a,us-test-1b,us-test-1c
+Zones:
-MasterZones: us-test-1a,us-test-1b,us-test-1c
+- us-test-1a
+- us-test-1b
+- us-test-1c
+MasterZones:
+- us-test-1a
+- us-test-1b
+- us-test-1c
 Cloud: aws

tests/integration/create_cluster/minimal/options.yaml

@@ -1,3 +1,4 @@
 ClusterName: minimal.example.com
-Zones: us-test-1a
+Zones:
+- us-test-1a
 Cloud: aws

tests/integration/create_cluster/ngwspecified/options.yaml

@@ -1,5 +1,6 @@
 ClusterName: private.example.com
-Zones: us-test-1a
+Zones:
+- us-test-1a
 Cloud: aws
 Topology: private
 Networking: kopeio-vxlan

tests/integration/create_cluster/private/expected-v1alpha1.yaml

@@ -69,8 +69,8 @@ metadata:
   name: master-us-test-1a
 spec:
   additionalSecurityGroups:
-  - i-exampleid3
+  - sg-exampleid3
-  - i-exampleid4
+  - sg-exampleid4
   image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
   machineType: m3.medium
   maxSize: 1
@@ -90,8 +90,8 @@ metadata:
   name: nodes
 spec:
   additionalSecurityGroups:
-  - i-exampleid
+  - sg-exampleid
-  - i-exampleid2
+  - sg-exampleid2
   image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
   machineType: t2.medium
   maxSize: 2

tests/integration/create_cluster/private/expected-v1alpha2.yaml

@@ -75,8 +75,8 @@ metadata:
   name: master-us-test-1a
 spec:
   additionalSecurityGroups:
-  - i-exampleid3
+  - sg-exampleid3
-  - i-exampleid4
+  - sg-exampleid4
   image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
   machineType: m3.medium
   maxSize: 1
@@ -96,8 +96,8 @@ metadata:
   name: nodes
 spec:
   additionalSecurityGroups:
-  - i-exampleid
+  - sg-exampleid
-  - i-exampleid2
+  - sg-exampleid2
   image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
   machineType: t2.medium
   maxSize: 2

tests/integration/create_cluster/private/options.yaml

@@ -1,8 +1,13 @@
 ClusterName: private.example.com
-Zones: us-test-1a
+Zones:
+- us-test-1a
 Cloud: aws
 Topology: private
 Networking: kopeio-vxlan
 Bastion: true
-NodeSecurityGroupIDs: i-exampleid, i-exampleid2
+NodeSecurityGroups:
-MasterSecurityGroupIDs: i-exampleid3, i-exampleid4
+- sg-exampleid
+- sg-exampleid2
+MasterSecurityGroups:
+- sg-exampleid3
+- sg-exampleid4