Skip to content

Commit

Permalink
Merge pull request #12806 from hakman/update_channels
Browse files Browse the repository at this point in the history
Update channels
  • Loading branch information
k8s-ci-robot authored Nov 21, 2021
2 parents b7c2777 + 7357245 commit 3e683ca
Show file tree
Hide file tree
Showing 25 changed files with 97 additions and 97 deletions.
34 changes: 17 additions & 17 deletions channels/alpha
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ spec:
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.17.0 <1.18.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211021
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.18.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20211021
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20211118
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.20.0"
Expand All @@ -74,7 +74,7 @@ spec:
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.16.0 <1.18.0"
- name: ubuntu-os-cloud/ubuntu-2004-focal-v20210927
- name: ubuntu-os-cloud/ubuntu-2004-focal-v20211118
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.18.0"
Expand All @@ -88,13 +88,13 @@ spec:
kubenet: {}
kubernetesVersions:
- range: ">=1.22.0"
recommendedVersion: 1.22.3
recommendedVersion: 1.22.4
requiredVersion: 1.22.0
- range: ">=1.21.0"
recommendedVersion: 1.21.6
recommendedVersion: 1.21.7
requiredVersion: 1.21.0
- range: ">=1.20.0"
recommendedVersion: 1.20.12
recommendedVersion: 1.20.13
requiredVersion: 1.20.0
- range: ">=1.19.0"
recommendedVersion: 1.19.16
Expand Down Expand Up @@ -128,35 +128,35 @@ spec:
requiredVersion: 1.11.10
kopsVersions:
- range: ">=1.22.0-alpha.1"
recommendedVersion: "1.22.0"
recommendedVersion: "1.22.2"
#requiredVersion: 1.22.0
kubernetesVersion: 1.22.3
kubernetesVersion: 1.22.4
- range: ">=1.21.0-alpha.1"
recommendedVersion: "1.21.2"
recommendedVersion: "1.22.2"
#requiredVersion: 1.21.0
kubernetesVersion: 1.21.6
kubernetesVersion: 1.21.7
- range: ">=1.20.0-alpha.1"
recommendedVersion: "1.21.2"
recommendedVersion: "1.22.2"
#requiredVersion: 1.20.0
kubernetesVersion: 1.20.12
kubernetesVersion: 1.20.13
- range: ">=1.19.0-alpha.1"
recommendedVersion: "1.21.2"
recommendedVersion: "1.22.2"
#requiredVersion: 1.19.0
kubernetesVersion: 1.19.16
- range: ">=1.18.0-alpha.1"
recommendedVersion: "1.21.2"
recommendedVersion: "1.22.2"
#requiredVersion: 1.18.0
kubernetesVersion: 1.18.20
- range: ">=1.17.0-alpha.1"
recommendedVersion: "1.21.2"
recommendedVersion: "1.22.2"
#requiredVersion: 1.17.0
kubernetesVersion: 1.17.17
- range: ">=1.16.0-alpha.1"
recommendedVersion: "1.21.2"
recommendedVersion: "1.21.4"
#requiredVersion: 1.16.0
kubernetesVersion: 1.16.15
- range: ">=1.15.0-alpha.1"
recommendedVersion: "1.21.2"
recommendedVersion: "1.21.4"
#requiredVersion: 1.15.0
kubernetesVersion: 1.15.12
- range: ">=1.14.0-alpha.1"
Expand Down
22 changes: 11 additions & 11 deletions channels/stable
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ spec:
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.17.0 <1.18.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.18.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20211015
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20211118
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.20.0"
Expand All @@ -74,7 +74,7 @@ spec:
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.16.0 <1.18.0"
- name: ubuntu-os-cloud/ubuntu-2004-focal-v20210927
- name: ubuntu-os-cloud/ubuntu-2004-focal-v20211118
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.18.0"
Expand All @@ -88,16 +88,16 @@ spec:
kubenet: {}
kubernetesVersions:
- range: ">=1.22.0"
recommendedVersion: 1.22.2
recommendedVersion: 1.22.3
requiredVersion: 1.22.0
- range: ">=1.21.0"
recommendedVersion: 1.21.5
recommendedVersion: 1.21.6
requiredVersion: 1.21.0
- range: ">=1.20.0"
recommendedVersion: 1.20.11
recommendedVersion: 1.20.12
requiredVersion: 1.20.0
- range: ">=1.19.0"
recommendedVersion: 1.19.15
recommendedVersion: 1.19.16
requiredVersion: 1.19.0
- range: ">=1.18.0"
recommendedVersion: 1.18.20
Expand Down Expand Up @@ -130,19 +130,19 @@ spec:
- range: ">=1.22.0-alpha.1"
recommendedVersion: "1.22.0"
#requiredVersion: 1.22.0
kubernetesVersion: 1.22.2
kubernetesVersion: 1.22.3
- range: ">=1.21.0-alpha.1"
recommendedVersion: "1.21.2"
#requiredVersion: 1.21.0
kubernetesVersion: 1.21.5
kubernetesVersion: 1.21.6
- range: ">=1.20.0-alpha.1"
recommendedVersion: "1.21.2"
#requiredVersion: 1.20.0
kubernetesVersion: 1.20.11
kubernetesVersion: 1.20.12
- range: ">=1.19.0-alpha.1"
recommendedVersion: "1.21.2"
#requiredVersion: 1.19.0
kubernetesVersion: 1.19.15
kubernetesVersion: 1.19.16
- range: ">=1.18.0-alpha.1"
recommendedVersion: "1.21.2"
#requiredVersion: 1.18.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: master-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -83,7 +83,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: t2.medium
maxSize: 1
minSize: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ metadata:
kops.k8s.io/cluster: gce.example.com
name: master-us-test1-a
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927
image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118
machineType: n1-standard-1
maxSize: 1
minSize: 1
Expand All @@ -87,7 +87,7 @@ metadata:
kops.k8s.io/cluster: gce.example.com
name: nodes-us-test1-a
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927
image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118
machineType: n1-standard-2
maxSize: 1
minSize: 1
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/create_cluster/ha/expected-v1alpha2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -104,7 +104,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: master-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -124,7 +124,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: master-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -144,7 +144,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: t2.medium
maxSize: 1
minSize: 1
Expand All @@ -164,7 +164,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: t2.medium
maxSize: 1
minSize: 1
Expand All @@ -184,7 +184,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: t2.medium
maxSize: 1
minSize: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -104,7 +104,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: master-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -124,7 +124,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: master-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -144,7 +144,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: t2.medium
maxSize: 1
minSize: 1
Expand All @@ -164,7 +164,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: t2.medium
maxSize: 1
minSize: 1
Expand All @@ -184,7 +184,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: t2.medium
maxSize: 1
minSize: 1
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: master-us-test1-a
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927
image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118
machineType: n1-standard-1
maxSize: 1
minSize: 1
Expand All @@ -95,7 +95,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: master-us-test1-b
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927
image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118
machineType: n1-standard-1
maxSize: 1
minSize: 1
Expand All @@ -118,7 +118,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: master-us-test1-c
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927
image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118
machineType: n1-standard-1
maxSize: 1
minSize: 1
Expand All @@ -141,7 +141,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-a
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927
image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118
machineType: n1-standard-2
maxSize: 1
minSize: 1
Expand All @@ -164,7 +164,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-b
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927
image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118
machineType: n1-standard-2
maxSize: 1
minSize: 1
Expand All @@ -187,7 +187,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-c
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210927
image: ubuntu-os-cloud/ubuntu-2004-focal-v20211118
machineType: n1-standard-2
maxSize: 1
minSize: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a-1
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -96,7 +96,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a-2
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -116,7 +116,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a-3
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: m3.medium
maxSize: 1
minSize: 1
Expand All @@ -136,7 +136,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211015
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211118
machineType: t2.medium
maxSize: 1
minSize: 1
Expand Down
Loading

0 comments on commit 3e683ca

Please sign in to comment.