kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Ubuntu images to latest version

This commit is contained in:
Ciprian Hacman 2021-04-25 09:10:13 +03:00
parent 71b93587f8
commit 55e154a526
23 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
channels/alpha
View File

@ -58,15 +58,15 @@ spec:
providerID: aws providerID: aws
architectureID: amd64 architectureID: amd64
kubernetesVersion: ">=1.17.0 <1.18.0" kubernetesVersion: ">=1.17.0 <1.18.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
providerID: aws providerID: aws
architectureID: amd64 architectureID: amd64
kubernetesVersion: ">=1.18.0" kubernetesVersion: ">=1.18.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210325 - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210415
providerID: aws providerID: aws
architectureID: arm64 architectureID: arm64
kubernetesVersion: ">=1.20.0" kubernetesVersion: ">=1.20.0"
- name: "cos-cloud/cos-stable-65-10323-99-0" - name: cos-cloud/cos-stable-65-10323-99-0
providerID: gce providerID: gce
architectureID: amd64 architectureID: amd64
kubernetesVersion: "<1.16.0-alpha.1" kubernetesVersion: "<1.16.0-alpha.1"
@ -74,11 +74,11 @@ spec:
providerID: gce providerID: gce
architectureID: amd64 architectureID: amd64
kubernetesVersion: ">=1.16.0 <1.18.0" kubernetesVersion: ">=1.16.0 <1.18.0"
- name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210325" - name: ubuntu-os-cloud/ubuntu-2004-focal-v20210415
providerID: gce providerID: gce
architectureID: amd64 architectureID: amd64
kubernetesVersion: ">=1.18.0" kubernetesVersion: ">=1.18.0"
- name: "Canonical:UbuntuServer:20.04-LTS:latest" - name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202104150
providerID: azure providerID: azure
architectureID: amd64 architectureID: amd64
kubernetesVersion: ">=1.20.0" kubernetesVersion: ">=1.20.0"

10
channels/stable
View File

@ -58,15 +58,15 @@ spec:
providerID: aws providerID: aws
architectureID: amd64 architectureID: amd64
kubernetesVersion: ">=1.17.0 <1.18.0" kubernetesVersion: ">=1.17.0 <1.18.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
providerID: aws providerID: aws
architectureID: amd64 architectureID: amd64
kubernetesVersion: ">=1.18.0" kubernetesVersion: ">=1.18.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210325 - name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210415
providerID: aws providerID: aws
architectureID: arm64 architectureID: arm64
kubernetesVersion: ">=1.20.0" kubernetesVersion: ">=1.20.0"
- name: "cos-cloud/cos-stable-65-10323-99-0" - name: cos-cloud/cos-stable-65-10323-99-0
providerID: gce providerID: gce
architectureID: amd64 architectureID: amd64
kubernetesVersion: "<1.16.0-alpha.1" kubernetesVersion: "<1.16.0-alpha.1"
@ -74,11 +74,11 @@ spec:
providerID: gce providerID: gce
architectureID: amd64 architectureID: amd64
kubernetesVersion: ">=1.16.0 <1.18.0" kubernetesVersion: ">=1.16.0 <1.18.0"
- name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210325" - name: ubuntu-os-cloud/ubuntu-2004-focal-v20210415
providerID: gce providerID: gce
architectureID: amd64 architectureID: amd64
kubernetesVersion: ">=1.18.0" kubernetesVersion: ">=1.18.0"
- name: "Canonical:UbuntuServer:20.04-LTS:latest" - name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202104150
providerID: azure providerID: azure
architectureID: amd64 architectureID: amd64
kubernetesVersion: ">=1.20.0" kubernetesVersion: ">=1.20.0"

4
pkg/apis/kops/channel.go
View File

@ -335,6 +335,6 @@ func (c *Channel) HasUpstreamImagePrefix(image string) bool {
return strings.HasPrefix(image, "kope.io/k8s-") || return strings.HasPrefix(image, "kope.io/k8s-") ||
strings.HasPrefix(image, "099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-") || strings.HasPrefix(image, "099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-") ||
strings.HasPrefix(image, "cos-cloud/cos-stable-") || strings.HasPrefix(image, "cos-cloud/cos-stable-") ||
strings.HasPrefix(image, "ubuntu-os-cloud/ubuntu-") || strings.HasPrefix(image, "ubuntu-os-cloud/ubuntu-2004-focal-") ||
strings.HasPrefix(image, "Canonical:UbuntuServer:") strings.HasPrefix(image, "Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:")
} }

4
tests/integration/create_cluster/complex/expected-v1alpha2.yaml
View File

@ -63,7 +63,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -83,7 +83,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

4
tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml
View File

@ -62,7 +62,7 @@ metadata:
kops.k8s.io/cluster: gce.example.com kops.k8s.io/cluster: gce.example.com
name: master-us-test1-a name: master-us-test1-a
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415
machineType: n1-standard-1 machineType: n1-standard-1
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -85,7 +85,7 @@ metadata:
kops.k8s.io/cluster: gce.example.com kops.k8s.io/cluster: gce.example.com
name: nodes-us-test1-a name: nodes-us-test1-a
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415
machineType: n1-standard-2 machineType: n1-standard-2
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

12
tests/integration/create_cluster/ha/expected-v1alpha2.yaml
View File

@ -83,7 +83,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -103,7 +103,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1b name: master-us-test-1b
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -123,7 +123,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1c name: master-us-test-1c
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -143,7 +143,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -163,7 +163,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1b name: nodes-us-test-1b
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -183,7 +183,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1c name: nodes-us-test-1c
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

12
tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml
View File

@ -83,7 +83,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -103,7 +103,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1b name: master-us-test-1b
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -123,7 +123,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1c name: master-us-test-1c
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -143,7 +143,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -163,7 +163,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1b name: nodes-us-test-1b
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -183,7 +183,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1c name: nodes-us-test-1c
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

12
tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml
View File

@ -70,7 +70,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com kops.k8s.io/cluster: ha-gce.example.com
name: master-us-test1-a name: master-us-test1-a
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415
machineType: n1-standard-1 machineType: n1-standard-1
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -93,7 +93,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com kops.k8s.io/cluster: ha-gce.example.com
name: master-us-test1-b name: master-us-test1-b
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415
machineType: n1-standard-1 machineType: n1-standard-1
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -116,7 +116,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com kops.k8s.io/cluster: ha-gce.example.com
name: master-us-test1-c name: master-us-test1-c
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415
machineType: n1-standard-1 machineType: n1-standard-1
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -139,7 +139,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-a name: nodes-us-test1-a
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415
machineType: n1-standard-2 machineType: n1-standard-2
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -162,7 +162,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-b name: nodes-us-test1-b
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415
machineType: n1-standard-2 machineType: n1-standard-2
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -185,7 +185,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-c name: nodes-us-test1-c
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415
machineType: n1-standard-2 machineType: n1-standard-2
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

8
tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml
View File

@ -75,7 +75,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a-1 name: master-us-test-1a-1
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -95,7 +95,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a-2 name: master-us-test-1a-2
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -115,7 +115,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a-3 name: master-us-test-1a-3
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -135,7 +135,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

14
tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml
View File

@ -91,7 +91,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a-1 name: master-us-test-1a-1
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -111,7 +111,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a-2 name: master-us-test-1a-2
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -131,7 +131,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a-3 name: master-us-test-1a-3
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -151,7 +151,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1b-1 name: master-us-test-1b-1
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -171,7 +171,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1b-2 name: master-us-test-1b-2
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -191,7 +191,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -211,7 +211,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1b name: nodes-us-test-1b
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

6
tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml
View File

@ -72,7 +72,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: bastions name: bastions
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.micro machineType: t2.micro
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -92,7 +92,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -112,7 +112,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

4
tests/integration/create_cluster/minimal-1.18/expected-v1alpha2.yaml
View File

@ -63,7 +63,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -83,7 +83,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

4
tests/integration/create_cluster/minimal-1.19/expected-v1alpha2.yaml
View File

@ -63,7 +63,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -83,7 +83,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

4
tests/integration/create_cluster/minimal-1.20/expected-v1alpha2.yaml
View File

@ -63,7 +63,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -83,7 +83,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

4
tests/integration/create_cluster/minimal-1.21/expected-v1alpha2.yaml
View File

@ -63,7 +63,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -83,7 +83,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

6
tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml
View File

@ -72,7 +72,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: bastions name: bastions
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.micro machineType: t2.micro
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -92,7 +92,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -112,7 +112,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

4
tests/integration/create_cluster/overrides/expected-v1alpha2.yaml
View File

@ -66,7 +66,7 @@ metadata:
kops.k8s.io/cluster: overrides.example.com kops.k8s.io/cluster: overrides.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -86,7 +86,7 @@ metadata:
kops.k8s.io/cluster: overrides.example.com kops.k8s.io/cluster: overrides.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

6
tests/integration/create_cluster/private/expected-v1alpha2.yaml
View File

@ -75,7 +75,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: bastions name: bastions
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.micro machineType: t2.micro
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -98,7 +98,7 @@ spec:
additionalSecurityGroups: additionalSecurityGroups:
- sg-exampleid3 - sg-exampleid3
- sg-exampleid4 - sg-exampleid4
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -121,7 +121,7 @@ spec:
additionalSecurityGroups: additionalSecurityGroups:
- sg-exampleid - sg-exampleid
- sg-exampleid2 - sg-exampleid2
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

6
tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml
View File

@ -72,7 +72,7 @@ metadata:
kops.k8s.io/cluster: private.example.com kops.k8s.io/cluster: private.example.com
name: bastions name: bastions
spec: spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415
machineType: f1-micro machineType: f1-micro
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -98,7 +98,7 @@ spec:
additionalSecurityGroups: additionalSecurityGroups:
- sg-exampleid3 - sg-exampleid3
- sg-exampleid4 - sg-exampleid4
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415
machineType: n1-standard-1 machineType: n1-standard-1
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -124,7 +124,7 @@ spec:
additionalSecurityGroups: additionalSecurityGroups:
- sg-exampleid - sg-exampleid
- sg-exampleid2 - sg-exampleid2
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210325 image: ubuntu-os-cloud/ubuntu-2004-focal-v20210415
machineType: n1-standard-2 machineType: n1-standard-2
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

4
tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml
View File

@ -72,7 +72,7 @@ metadata:
kops.k8s.io/cluster: private-subnets.example.com kops.k8s.io/cluster: private-subnets.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -92,7 +92,7 @@ metadata:
kops.k8s.io/cluster: private-subnets.example.com kops.k8s.io/cluster: private-subnets.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

4
tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml
View File

@ -65,7 +65,7 @@ metadata:
kops.k8s.io/cluster: subnet.example.com kops.k8s.io/cluster: subnet.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -85,7 +85,7 @@ metadata:
kops.k8s.io/cluster: subnet.example.com kops.k8s.io/cluster: subnet.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

4
tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml
View File

@ -65,7 +65,7 @@ metadata:
kops.k8s.io/cluster: subnet.example.com kops.k8s.io/cluster: subnet.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -85,7 +85,7 @@ metadata:
kops.k8s.io/cluster: subnet.example.com kops.k8s.io/cluster: subnet.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1

4
tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml
View File

@ -64,7 +64,7 @@ metadata:
kops.k8s.io/cluster: vpc.example.com kops.k8s.io/cluster: vpc.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -84,7 +84,7 @@ metadata:
kops.k8s.io/cluster: vpc.example.com kops.k8s.io/cluster: vpc.example.com
name: nodes-us-test-1a name: nodes-us-test-1a
spec: spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210325 image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium machineType: t2.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1