diff --git a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml index 7293df889d..126a9f7cb6 100644 --- a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml @@ -79,14 +79,14 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: complex.example.com - name: nodes + name: nodes-us-test-1a spec: image: kope.io/k8s-1.15-debian-stretch-amd64-hvm-ebs-2020-01-17 machineType: t2.medium - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test-1a role: Node subnets: - us-test-1a diff --git a/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml b/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml index 5fc5d09579..1adae76b4e 100644 --- a/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml @@ -83,15 +83,15 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: gce.example.com - name: nodes + name: nodes-us-test1-a spec: image: cos-cloud/cos-stable-65-10323-99-0 machineType: n1-standard-2 - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: cloud.google.com/metadata-proxy-ready: "true" - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test1-a role: Node subnets: - us-test1 diff --git a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml index 7c7bc993ac..ef515224f6 100644 --- a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml @@ -135,16 +135,54 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: ha.example.com - name: nodes + name: nodes-us-test-1a spec: image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2020-01-17 machineType: t2.medium - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test-1a role: Node subnets: - us-test-1a + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2017-01-01T00:00:00Z" + labels: + kops.k8s.io/cluster: ha.example.com + name: nodes-us-test-1b +spec: + image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2020-01-17 + machineType: t2.medium + maxSize: 1 + minSize: 1 + nodeLabels: + kops.k8s.io/instancegroup: nodes-us-test-1b + role: Node + subnets: - us-test-1b + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2017-01-01T00:00:00Z" + labels: + kops.k8s.io/cluster: ha.example.com + name: nodes-us-test-1c +spec: + image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2020-01-17 + machineType: t2.medium + maxSize: 1 + minSize: 1 + nodeLabels: + kops.k8s.io/instancegroup: nodes-us-test-1c + role: Node + subnets: - us-test-1c diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml index 013219726b..232e0f8046 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml @@ -141,16 +141,54 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: ha.example.com - name: nodes + name: nodes-us-test-1a spec: image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2020-01-17 machineType: t2.medium - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test-1a role: Node subnets: - us-test-1a + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2017-01-01T00:00:00Z" + labels: + kops.k8s.io/cluster: ha.example.com + name: nodes-us-test-1b +spec: + image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2020-01-17 + machineType: t2.medium + maxSize: 1 + minSize: 1 + nodeLabels: + kops.k8s.io/instancegroup: nodes-us-test-1b + role: Node + subnets: - us-test-1b + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2017-01-01T00:00:00Z" + labels: + kops.k8s.io/cluster: ha.example.com + name: nodes-us-test-1c +spec: + image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2020-01-17 + machineType: t2.medium + maxSize: 1 + minSize: 1 + nodeLabels: + kops.k8s.io/instancegroup: nodes-us-test-1c + role: Node + subnets: - us-test-1c diff --git a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml index 578d08fe14..b51e666f59 100644 --- a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml @@ -137,19 +137,63 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: ha-gce.example.com - name: nodes + name: nodes-us-test1-a spec: image: cos-cloud/cos-stable-65-10323-99-0 machineType: n1-standard-2 - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: cloud.google.com/metadata-proxy-ready: "true" - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test1-a role: Node subnets: - us-test1 zones: - us-test1-a + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2017-01-01T00:00:00Z" + labels: + kops.k8s.io/cluster: ha-gce.example.com + name: nodes-us-test1-b +spec: + image: cos-cloud/cos-stable-65-10323-99-0 + machineType: n1-standard-2 + maxSize: 1 + minSize: 1 + nodeLabels: + cloud.google.com/metadata-proxy-ready: "true" + kops.k8s.io/instancegroup: nodes-us-test1-b + role: Node + subnets: + - us-test1 + zones: - us-test1-b + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2017-01-01T00:00:00Z" + labels: + kops.k8s.io/cluster: ha-gce.example.com + name: nodes-us-test1-c +spec: + image: cos-cloud/cos-stable-65-10323-99-0 + machineType: n1-standard-2 + maxSize: 1 + minSize: 1 + nodeLabels: + cloud.google.com/metadata-proxy-ready: "true" + kops.k8s.io/instancegroup: nodes-us-test1-c + role: Node + subnets: + - us-test1 + zones: - us-test1-c diff --git a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml index 84b50987e4..04265392a2 100644 --- a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml @@ -179,15 +179,34 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: ha.example.com - name: nodes + name: nodes-us-test-1a spec: image: kope.io/k8s-1.15-debian-stretch-amd64-hvm-ebs-2020-01-17 machineType: t2.medium - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test-1a role: Node subnets: - us-test-1a + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2017-01-01T00:00:00Z" + labels: + kops.k8s.io/cluster: ha.example.com + name: nodes-us-test-1b +spec: + image: kope.io/k8s-1.15-debian-stretch-amd64-hvm-ebs-2020-01-17 + machineType: t2.medium + maxSize: 1 + minSize: 1 + nodeLabels: + kops.k8s.io/instancegroup: nodes-us-test-1b + role: Node + subnets: - us-test-1b diff --git a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml index 00f45faba2..5e9ada5ee9 100644 --- a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml @@ -107,14 +107,14 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: private.example.com - name: nodes + name: nodes-us-test-1a spec: image: kope.io/k8s-1.15-debian-stretch-amd64-hvm-ebs-2020-01-17 machineType: t2.medium - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test-1a role: Node subnets: - us-test-1a diff --git a/tests/integration/create_cluster/minimal/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal/expected-v1alpha2.yaml index 7b00c675a1..e4c59dc204 100644 --- a/tests/integration/create_cluster/minimal/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal/expected-v1alpha2.yaml @@ -79,14 +79,14 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: minimal.example.com - name: nodes + name: nodes-us-test-1a spec: image: kope.io/k8s-1.11-debian-stretch-amd64-hvm-ebs-2020-01-17 machineType: t2.medium - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test-1a role: Node subnets: - us-test-1a diff --git a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml index 15c59f1865..033fcdf4d5 100644 --- a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml @@ -107,14 +107,14 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: private.example.com - name: nodes + name: nodes-us-test-1a spec: image: kope.io/k8s-1.15-debian-stretch-amd64-hvm-ebs-2020-01-17 machineType: t2.medium - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test-1a role: Node subnets: - us-test-1a diff --git a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml index 69ef83a8ec..2c5c0729c3 100644 --- a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml @@ -82,14 +82,14 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: overrides.example.com - name: nodes + name: nodes-us-test-1a spec: image: kope.io/k8s-1.15-debian-stretch-amd64-hvm-ebs-2020-01-17 machineType: t2.medium - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test-1a role: Node subnets: - us-test-1a diff --git a/tests/integration/create_cluster/private/expected-v1alpha2.yaml b/tests/integration/create_cluster/private/expected-v1alpha2.yaml index 39c9238658..a728463492 100644 --- a/tests/integration/create_cluster/private/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private/expected-v1alpha2.yaml @@ -113,17 +113,17 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: private.example.com - name: nodes + name: nodes-us-test-1a spec: additionalSecurityGroups: - sg-exampleid - sg-exampleid2 image: kope.io/k8s-1.15-debian-stretch-amd64-hvm-ebs-2020-01-17 machineType: t2.medium - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test-1a role: Node subnets: - us-test-1a diff --git a/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml b/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml index 784ec60d11..4024b0909f 100644 --- a/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml @@ -87,14 +87,14 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: private-subnets.example.com - name: nodes + name: nodes-us-test-1a spec: image: kope.io/k8s-1.15-debian-stretch-amd64-hvm-ebs-2020-01-17 machineType: t2.medium - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test-1a role: Node subnets: - us-test-1a diff --git a/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml index c21efb368b..0488371ad7 100644 --- a/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml @@ -81,14 +81,14 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: subnet.example.com - name: nodes + name: nodes-us-test-1a spec: image: kope.io/k8s-1.15-debian-stretch-amd64-hvm-ebs-2020-01-17 machineType: t2.medium - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test-1a role: Node subnets: - us-test-1a diff --git a/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml index c21efb368b..0488371ad7 100644 --- a/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml @@ -81,14 +81,14 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: subnet.example.com - name: nodes + name: nodes-us-test-1a spec: image: kope.io/k8s-1.15-debian-stretch-amd64-hvm-ebs-2020-01-17 machineType: t2.medium - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test-1a role: Node subnets: - us-test-1a diff --git a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml index 2b267546d2..b3b636166d 100644 --- a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml @@ -80,14 +80,14 @@ metadata: creationTimestamp: "2017-01-01T00:00:00Z" labels: kops.k8s.io/cluster: vpc.example.com - name: nodes + name: nodes-us-test-1a spec: image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2020-01-17 machineType: t2.medium - maxSize: 2 - minSize: 2 + maxSize: 1 + minSize: 1 nodeLabels: - kops.k8s.io/instancegroup: nodes + kops.k8s.io/instancegroup: nodes-us-test-1a role: Node subnets: - us-test-1a