From d9e999d377ff3f0ceb325603b47cc8b04e0405c6 Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Tue, 28 Jan 2020 22:32:34 -0800
Subject: [PATCH] Convert TestMinimal_json to v1alpha2 API

---
 cmd/kops/integration_test.go                  |  2 +-
 .../{in-v1alpha0.yaml => in-v1alpha2.yaml}    | 29 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)
 rename tests/integration/update_cluster/minimal-json/{in-v1alpha0.yaml => in-v1alpha2.yaml} (79%)

diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go
index 9986d856fb..c40bdd6485 100644
--- a/cmd/kops/integration_test.go
+++ b/cmd/kops/integration_test.go
@@ -138,7 +138,7 @@ func TestMinimal_json(t *testing.T) {
 		featureflag.ParseFlags("-TerraformJSON")
 	}
 	defer unsetFeaureFlag()
-	runTestAWS(t, "minimal-json.example.com", "minimal-json", "v1alpha0", false, 1, true, false, nil, true, true)
+	runTestAWS(t, "minimal-json.example.com", "minimal-json", "v1alpha2", false, 1, true, false, nil, true, true)
 }
 
 // TestMinimal_141 runs the test on a configuration from 1.4.1 release
diff --git a/tests/integration/update_cluster/minimal-json/in-v1alpha0.yaml b/tests/integration/update_cluster/minimal-json/in-v1alpha2.yaml
similarity index 79%
rename from tests/integration/update_cluster/minimal-json/in-v1alpha0.yaml
rename to tests/integration/update_cluster/minimal-json/in-v1alpha2.yaml
index 0ea5e03ad3..ed4118ff6b 100644
--- a/tests/integration/update_cluster/minimal-json/in-v1alpha0.yaml
+++ b/tests/integration/update_cluster/minimal-json/in-v1alpha2.yaml
@@ -1,22 +1,22 @@
-apiVersion: kops.k8s.io/v1alpha1
+apiVersion: kops.k8s.io/v1alpha2
 kind: Cluster
 metadata:
   creationTimestamp: "2016-12-10T22:42:27Z"
   name: minimal-json.example.com
 spec:
-  adminAccess:
+  kubernetesApiAccess:
   - 0.0.0.0/0
   channel: stable
   cloudProvider: aws
   configBase: memfs://clusters.example.com/minimal-json.example.com
   etcdClusters:
   - etcdMembers:
-    - name: us-test-1a
-      zone: us-test-1a
+    - instanceGroup: master-us-test-1a
+      name: us-test-1a
     name: main
   - etcdMembers:
-    - name: us-test-1a
-      zone: us-test-1a
+    - instanceGroup: master-us-test-1a
+      name: us-test-1a
     name: events
   kubernetesVersion: v1.14.0
   masterInternalName: api.internal.minimal-json.example.com
@@ -25,19 +25,20 @@ spec:
   networking:
     kubenet: {}
   nonMasqueradeCIDR: 100.64.0.0/10
+  sshAccess:
+    - 0.0.0.0/0
   topology:
-    bastion:
-      idleTimeout: 120
-      machineType: t2.medium
     masters: public
     nodes: public
-  zones:
+  subnets:
   - cidr: 172.20.32.0/19
     name: us-test-1a
+    type: Public
+    zone: us-test-1a
 
 ---
 
-apiVersion: kops.k8s.io/v1alpha1
+apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
   creationTimestamp: "2016-12-10T22:42:28Z"
@@ -51,12 +52,12 @@ spec:
   maxSize: 2
   minSize: 2
   role: Node
-  zones:
+  subnets:
   - us-test-1a
 
 ---
 
-apiVersion: kops.k8s.io/v1alpha1
+apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
   creationTimestamp: "2016-12-10T22:42:28Z"
@@ -70,7 +71,7 @@ spec:
   maxSize: 1
   minSize: 1
   role: Master
-  zones:
+  subnets:
   - us-test-1a