hack/update-expected.sh

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

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -61,7 +61,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: complex.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium

tests/integration/create_cluster/different-amis/expected-v1alpha2.yaml

@@ -17,14 +17,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -112,7 +112,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: amis.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: ami-control-plane
   instanceMetadata:

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

@@ -16,13 +16,13 @@ spec:
   etcdClusters:
   - cpuRequest: 200m
     etcdMembers:
-    - instanceGroup: master-us-test1-a
+    - instanceGroup: control-plane-us-test1-a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
-    - instanceGroup: master-us-test1-a
+    - instanceGroup: control-plane-us-test1-a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -62,7 +62,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: gce.example.com
-  name: master-us-test1-a
+  name: control-plane-us-test1-a
 spec:
   image: ubuntu-os-cloud/ubuntu-2004-focal-v20221018
   machineType: e2-medium

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

@@ -15,26 +15,26 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     - encryptedVolume: true
-      instanceGroup: master-us-test-1b
+      instanceGroup: control-plane-us-test-1b
       name: b
     - encryptedVolume: true
-      instanceGroup: master-us-test-1c
+      instanceGroup: control-plane-us-test-1c
       name: c
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     - encryptedVolume: true
-      instanceGroup: master-us-test-1b
+      instanceGroup: control-plane-us-test-1b
       name: b
     - encryptedVolume: true
-      instanceGroup: master-us-test-1c
+      instanceGroup: control-plane-us-test-1c
       name: c
     memoryRequest: 100Mi
     name: events
@@ -82,7 +82,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium
@@ -100,7 +100,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-us-test-1b
+  name: control-plane-us-test-1b
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium
@@ -118,7 +118,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-us-test-1c
+  name: control-plane-us-test-1c
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium

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

@@ -15,26 +15,26 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     - encryptedVolume: true
-      instanceGroup: master-us-test-1b
+      instanceGroup: control-plane-us-test-1b
       name: b
     - encryptedVolume: true
-      instanceGroup: master-us-test-1c
+      instanceGroup: control-plane-us-test-1c
       name: c
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     - encryptedVolume: true
-      instanceGroup: master-us-test-1b
+      instanceGroup: control-plane-us-test-1b
       name: b
     - encryptedVolume: true
-      instanceGroup: master-us-test-1c
+      instanceGroup: control-plane-us-test-1c
       name: c
     memoryRequest: 100Mi
     name: events
@@ -82,7 +82,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium
@@ -100,7 +100,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-us-test-1b
+  name: control-plane-us-test-1b
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium
@@ -118,7 +118,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-us-test-1c
+  name: control-plane-us-test-1c
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium

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

@@ -15,21 +15,21 @@ spec:
   etcdClusters:
   - cpuRequest: 200m
     etcdMembers:
-    - instanceGroup: master-us-test1-a
+    - instanceGroup: control-plane-us-test1-a
       name: a
-    - instanceGroup: master-us-test1-b
+    - instanceGroup: control-plane-us-test1-b
       name: b
-    - instanceGroup: master-us-test1-c
+    - instanceGroup: control-plane-us-test1-c
       name: c
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
-    - instanceGroup: master-us-test1-a
+    - instanceGroup: control-plane-us-test1-a
       name: a
-    - instanceGroup: master-us-test1-b
+    - instanceGroup: control-plane-us-test1-b
       name: b
-    - instanceGroup: master-us-test1-c
+    - instanceGroup: control-plane-us-test1-c
       name: c
     memoryRequest: 100Mi
     name: events
@@ -69,7 +69,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha-gce.example.com
-  name: master-us-test1-a
+  name: control-plane-us-test1-a
 spec:
   image: ubuntu-os-cloud/ubuntu-2004-focal-v20221018
   machineType: e2-medium
@@ -89,7 +89,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha-gce.example.com
-  name: master-us-test1-b
+  name: control-plane-us-test1-b
 spec:
   image: ubuntu-os-cloud/ubuntu-2004-focal-v20221018
   machineType: e2-medium
@@ -109,7 +109,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha-gce.example.com
-  name: master-us-test1-c
+  name: control-plane-us-test1-c
 spec:
   image: ubuntu-os-cloud/ubuntu-2004-focal-v20221018
   machineType: e2-medium

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

@@ -15,21 +15,21 @@ spec:
   etcdClusters:
   - cpuRequest: 200m
     etcdMembers:
-    - instanceGroup: master-fsn1-1
+    - instanceGroup: control-plane-fsn1-1
       name: etcd-1
-    - instanceGroup: master-fsn1-2
+    - instanceGroup: control-plane-fsn1-2
       name: etcd-2
-    - instanceGroup: master-fsn1-3
+    - instanceGroup: control-plane-fsn1-3
       name: etcd-3
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
-    - instanceGroup: master-fsn1-1
+    - instanceGroup: control-plane-fsn1-1
       name: etcd-1
-    - instanceGroup: master-fsn1-2
+    - instanceGroup: control-plane-fsn1-2
       name: etcd-2
-    - instanceGroup: master-fsn1-3
+    - instanceGroup: control-plane-fsn1-3
       name: etcd-3
     memoryRequest: 100Mi
     name: events
@@ -67,7 +67,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-fsn1-1
+  name: control-plane-fsn1-1
 spec:
   image: ubuntu-20.04
   machineType: cx21
@@ -85,7 +85,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-fsn1-2
+  name: control-plane-fsn1-2
 spec:
   image: ubuntu-20.04
   machineType: cx21
@@ -103,7 +103,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-fsn1-3
+  name: control-plane-fsn1-3
 spec:
   image: ubuntu-20.04
   machineType: cx21

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

@@ -15,26 +15,26 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a-1
+      instanceGroup: control-plane-us-test-1a-1
       name: etcd-1
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a-2
+      instanceGroup: control-plane-us-test-1a-2
       name: etcd-2
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a-3
+      instanceGroup: control-plane-us-test-1a-3
       name: etcd-3
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a-1
+      instanceGroup: control-plane-us-test-1a-1
       name: etcd-1
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a-2
+      instanceGroup: control-plane-us-test-1a-2
       name: etcd-2
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a-3
+      instanceGroup: control-plane-us-test-1a-3
       name: etcd-3
     memoryRequest: 100Mi
     name: events
@@ -74,7 +74,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-us-test-1a-1
+  name: control-plane-us-test-1a-1
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium
@@ -92,7 +92,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-us-test-1a-2
+  name: control-plane-us-test-1a-2
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium
@@ -110,7 +110,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-us-test-1a-3
+  name: control-plane-us-test-1a-3
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium

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

@@ -15,38 +15,38 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a-1
+      instanceGroup: control-plane-us-test-1a-1
       name: a-1
     - encryptedVolume: true
-      instanceGroup: master-us-test-1b-1
+      instanceGroup: control-plane-us-test-1b-1
       name: b-1
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a-2
+      instanceGroup: control-plane-us-test-1a-2
       name: a-2
     - encryptedVolume: true
-      instanceGroup: master-us-test-1b-2
+      instanceGroup: control-plane-us-test-1b-2
       name: b-2
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a-3
+      instanceGroup: control-plane-us-test-1a-3
       name: a-3
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a-1
+      instanceGroup: control-plane-us-test-1a-1
       name: a-1
     - encryptedVolume: true
-      instanceGroup: master-us-test-1b-1
+      instanceGroup: control-plane-us-test-1b-1
       name: b-1
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a-2
+      instanceGroup: control-plane-us-test-1a-2
       name: a-2
     - encryptedVolume: true
-      instanceGroup: master-us-test-1b-2
+      instanceGroup: control-plane-us-test-1b-2
       name: b-2
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a-3
+      instanceGroup: control-plane-us-test-1a-3
       name: a-3
     memoryRequest: 100Mi
     name: events
@@ -90,7 +90,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-us-test-1a-1
+  name: control-plane-us-test-1a-1
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium
@@ -108,7 +108,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-us-test-1a-2
+  name: control-plane-us-test-1a-2
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium
@@ -126,7 +126,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-us-test-1a-3
+  name: control-plane-us-test-1a-3
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium
@@ -144,7 +144,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-us-test-1b-1
+  name: control-plane-us-test-1b-1
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium
@@ -162,7 +162,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ha.example.com
-  name: master-us-test-1b-2
+  name: control-plane-us-test-1b-2
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium

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

@@ -17,14 +17,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -89,7 +89,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: private.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium

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

@@ -18,14 +18,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -75,7 +75,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: ipv6.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   instanceMetadata:

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

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -76,7 +76,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: karpenter.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   instanceMetadata:

tests/integration/create_cluster/minimal-1.20/expected-v1alpha2.yaml

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -62,7 +62,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: minimal.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium

tests/integration/create_cluster/minimal-1.21/expected-v1alpha2.yaml

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -62,7 +62,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: minimal.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium

tests/integration/create_cluster/minimal-1.22/expected-v1alpha2.yaml

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -62,7 +62,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: minimal.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   instanceMetadata:

tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -62,7 +62,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: minimal.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   instanceMetadata:

tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -62,7 +62,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: minimal.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   instanceMetadata:

tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -62,7 +62,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: minimal.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   instanceMetadata:

tests/integration/create_cluster/minimal-1.26-arm64/expected-v1alpha2.yaml

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -62,7 +62,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: minimal.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20221018
   instanceMetadata:

tests/integration/create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -66,7 +66,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: minimal.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   instanceMetadata:

tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -62,7 +62,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: minimal.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   instanceMetadata:

tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -86,7 +86,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: minimal.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   instanceMetadata:

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

@@ -15,13 +15,13 @@ spec:
   etcdClusters:
   - cpuRequest: 200m
     etcdMembers:
-    - instanceGroup: master-fsn1
+    - instanceGroup: control-plane-fsn1
       name: etcd-1
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
-    - instanceGroup: master-fsn1
+    - instanceGroup: control-plane-fsn1
       name: etcd-1
     memoryRequest: 100Mi
     name: events
@@ -59,7 +59,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: minimal.k8s.local
-  name: master-fsn1
+  name: control-plane-fsn1
 spec:
   image: ubuntu-20.04
   machineType: cx21

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

@@ -17,14 +17,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -89,7 +89,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: private.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium

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

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -65,7 +65,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: overrides.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium

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

@@ -21,14 +21,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -92,7 +92,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: private.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   additionalSecurityGroups:
   - sg-exampleid3

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

@@ -21,13 +21,13 @@ spec:
   etcdClusters:
   - cpuRequest: 200m
     etcdMembers:
-    - instanceGroup: master-us-test1-a
+    - instanceGroup: control-plane-us-test1-a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
-    - instanceGroup: master-us-test1-a
+    - instanceGroup: control-plane-us-test1-a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -89,7 +89,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: private.example.com
-  name: master-us-test1-a
+  name: control-plane-us-test1-a
 spec:
   additionalSecurityGroups:
   - sg-exampleid3

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

@@ -17,14 +17,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -71,7 +71,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: private-subnets.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium

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

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -64,7 +64,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: subnet.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium

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

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -64,7 +64,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: subnet.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium

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

@@ -15,14 +15,14 @@ spec:
   - cpuRequest: 200m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: main
   - cpuRequest: 100m
     etcdMembers:
     - encryptedVolume: true
-      instanceGroup: master-us-test-1a
+      instanceGroup: control-plane-us-test-1a
       name: a
     memoryRequest: 100Mi
     name: events
@@ -63,7 +63,7 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   labels:
     kops.k8s.io/cluster: vpc.example.com
-  name: master-us-test-1a
+  name: control-plane-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221018
   machineType: m3.medium