Skip to content

Commit be26760

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #12334 from dntosas/bump-amis
[channels] Bump AWS/GCP/Azure Ubuntu AMIs to latest
2 parents 8f42a4a + dc59265 commit be26760

File tree

25 files changed

+77
-77
lines changed

25 files changed

+77
-77
lines changed

‎channels/alpha

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ spec:
5858
providerID: aws
5959
architectureID: amd64
6060
kubernetesVersion: ">=1.17.0 <1.18.0"
61-
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
61+
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
6262
providerID: aws
6363
architectureID: amd64
6464
kubernetesVersion: ">=1.18.0"
65-
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210720
65+
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210907
6666
providerID: aws
6767
architectureID: arm64
6868
kubernetesVersion: ">=1.20.0"
@@ -74,11 +74,11 @@ spec:
7474
providerID: gce
7575
architectureID: amd64
7676
kubernetesVersion: ">=1.16.0 <1.18.0"
77-
- name: ubuntu-os-cloud/ubuntu-2004-focal-v20210720
77+
- name: ubuntu-os-cloud/ubuntu-2004-focal-v20210908
7878
providerID: gce
7979
architectureID: amd64
8080
kubernetesVersion: ">=1.18.0"
81-
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202107200
81+
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202109080
8282
providerID: azure
8383
architectureID: amd64
8484
kubernetesVersion: ">=1.20.0"

‎channels/stable

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ spec:
5858
providerID: aws
5959
architectureID: amd64
6060
kubernetesVersion: ">=1.17.0 <1.18.0"
61-
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
61+
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
6262
providerID: aws
6363
architectureID: amd64
6464
kubernetesVersion: ">=1.18.0"
65-
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210720
65+
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210907
6666
providerID: aws
6767
architectureID: arm64
6868
kubernetesVersion: ">=1.20.0"
@@ -74,11 +74,11 @@ spec:
7474
providerID: gce
7575
architectureID: amd64
7676
kubernetesVersion: ">=1.16.0 <1.18.0"
77-
- name: ubuntu-os-cloud/ubuntu-2004-focal-v20210720
77+
- name: ubuntu-os-cloud/ubuntu-2004-focal-v20210908
7878
providerID: gce
7979
architectureID: amd64
8080
kubernetesVersion: ">=1.18.0"
81-
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202107200
81+
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202109080
8282
providerID: azure
8383
architectureID: amd64
8484
kubernetesVersion: ">=1.20.0"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ metadata:
6363
kops.k8s.io/cluster: complex.example.com
6464
name: master-us-test-1a
6565
spec:
66-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
66+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
6767
machineType: m3.medium
6868
maxSize: 1
6969
minSize: 1
@@ -83,7 +83,7 @@ metadata:
8383
kops.k8s.io/cluster: complex.example.com
8484
name: nodes-us-test-1a
8585
spec:
86-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
86+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
8787
machineType: t2.medium
8888
maxSize: 1
8989
minSize: 1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ metadata:
6363
kops.k8s.io/cluster: gce.example.com
6464
name: master-us-test1-a
6565
spec:
66-
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210720
66+
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908
6767
machineType: n1-standard-1
6868
maxSize: 1
6969
minSize: 1
@@ -86,7 +86,7 @@ metadata:
8686
kops.k8s.io/cluster: gce.example.com
8787
name: nodes-us-test1-a
8888
spec:
89-
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210720
89+
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908
9090
machineType: n1-standard-2
9191
maxSize: 1
9292
minSize: 1

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ metadata:
8484
kops.k8s.io/cluster: ha.example.com
8585
name: master-us-test-1a
8686
spec:
87-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
87+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
8888
machineType: m3.medium
8989
maxSize: 1
9090
minSize: 1
@@ -104,7 +104,7 @@ metadata:
104104
kops.k8s.io/cluster: ha.example.com
105105
name: master-us-test-1b
106106
spec:
107-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
107+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
108108
machineType: m3.medium
109109
maxSize: 1
110110
minSize: 1
@@ -124,7 +124,7 @@ metadata:
124124
kops.k8s.io/cluster: ha.example.com
125125
name: master-us-test-1c
126126
spec:
127-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
127+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
128128
machineType: m3.medium
129129
maxSize: 1
130130
minSize: 1
@@ -144,7 +144,7 @@ metadata:
144144
kops.k8s.io/cluster: ha.example.com
145145
name: nodes-us-test-1a
146146
spec:
147-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
147+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
148148
machineType: t2.medium
149149
maxSize: 1
150150
minSize: 1
@@ -164,7 +164,7 @@ metadata:
164164
kops.k8s.io/cluster: ha.example.com
165165
name: nodes-us-test-1b
166166
spec:
167-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
167+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
168168
machineType: t2.medium
169169
maxSize: 1
170170
minSize: 1
@@ -184,7 +184,7 @@ metadata:
184184
kops.k8s.io/cluster: ha.example.com
185185
name: nodes-us-test-1c
186186
spec:
187-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
187+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
188188
machineType: t2.medium
189189
maxSize: 1
190190
minSize: 1

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ metadata:
8484
kops.k8s.io/cluster: ha.example.com
8585
name: master-us-test-1a
8686
spec:
87-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
87+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
8888
machineType: m3.medium
8989
maxSize: 1
9090
minSize: 1
@@ -104,7 +104,7 @@ metadata:
104104
kops.k8s.io/cluster: ha.example.com
105105
name: master-us-test-1b
106106
spec:
107-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
107+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
108108
machineType: m3.medium
109109
maxSize: 1
110110
minSize: 1
@@ -124,7 +124,7 @@ metadata:
124124
kops.k8s.io/cluster: ha.example.com
125125
name: master-us-test-1c
126126
spec:
127-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
127+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
128128
machineType: m3.medium
129129
maxSize: 1
130130
minSize: 1
@@ -144,7 +144,7 @@ metadata:
144144
kops.k8s.io/cluster: ha.example.com
145145
name: nodes-us-test-1a
146146
spec:
147-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
147+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
148148
machineType: t2.medium
149149
maxSize: 1
150150
minSize: 1
@@ -164,7 +164,7 @@ metadata:
164164
kops.k8s.io/cluster: ha.example.com
165165
name: nodes-us-test-1b
166166
spec:
167-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
167+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
168168
machineType: t2.medium
169169
maxSize: 1
170170
minSize: 1
@@ -184,7 +184,7 @@ metadata:
184184
kops.k8s.io/cluster: ha.example.com
185185
name: nodes-us-test-1c
186186
spec:
187-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
187+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
188188
machineType: t2.medium
189189
maxSize: 1
190190
minSize: 1

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ metadata:
7171
kops.k8s.io/cluster: ha-gce.example.com
7272
name: master-us-test1-a
7373
spec:
74-
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210720
74+
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908
7575
machineType: n1-standard-1
7676
maxSize: 1
7777
minSize: 1
@@ -94,7 +94,7 @@ metadata:
9494
kops.k8s.io/cluster: ha-gce.example.com
9595
name: master-us-test1-b
9696
spec:
97-
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210720
97+
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908
9898
machineType: n1-standard-1
9999
maxSize: 1
100100
minSize: 1
@@ -117,7 +117,7 @@ metadata:
117117
kops.k8s.io/cluster: ha-gce.example.com
118118
name: master-us-test1-c
119119
spec:
120-
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210720
120+
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908
121121
machineType: n1-standard-1
122122
maxSize: 1
123123
minSize: 1
@@ -140,7 +140,7 @@ metadata:
140140
kops.k8s.io/cluster: ha-gce.example.com
141141
name: nodes-us-test1-a
142142
spec:
143-
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210720
143+
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908
144144
machineType: n1-standard-2
145145
maxSize: 1
146146
minSize: 1
@@ -163,7 +163,7 @@ metadata:
163163
kops.k8s.io/cluster: ha-gce.example.com
164164
name: nodes-us-test1-b
165165
spec:
166-
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210720
166+
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908
167167
machineType: n1-standard-2
168168
maxSize: 1
169169
minSize: 1
@@ -186,7 +186,7 @@ metadata:
186186
kops.k8s.io/cluster: ha-gce.example.com
187187
name: nodes-us-test1-c
188188
spec:
189-
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210720
189+
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210908
190190
machineType: n1-standard-2
191191
maxSize: 1
192192
minSize: 1

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ metadata:
7676
kops.k8s.io/cluster: ha.example.com
7777
name: master-us-test-1a-1
7878
spec:
79-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
79+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
8080
machineType: m3.medium
8181
maxSize: 1
8282
minSize: 1
@@ -96,7 +96,7 @@ metadata:
9696
kops.k8s.io/cluster: ha.example.com
9797
name: master-us-test-1a-2
9898
spec:
99-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
99+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
100100
machineType: m3.medium
101101
maxSize: 1
102102
minSize: 1
@@ -116,7 +116,7 @@ metadata:
116116
kops.k8s.io/cluster: ha.example.com
117117
name: master-us-test-1a-3
118118
spec:
119-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
119+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
120120
machineType: m3.medium
121121
maxSize: 1
122122
minSize: 1
@@ -136,7 +136,7 @@ metadata:
136136
kops.k8s.io/cluster: ha.example.com
137137
name: nodes-us-test-1a
138138
spec:
139-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
139+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
140140
machineType: t2.medium
141141
maxSize: 1
142142
minSize: 1

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ metadata:
9292
kops.k8s.io/cluster: ha.example.com
9393
name: master-us-test-1a-1
9494
spec:
95-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
95+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
9696
machineType: m3.medium
9797
maxSize: 1
9898
minSize: 1
@@ -112,7 +112,7 @@ metadata:
112112
kops.k8s.io/cluster: ha.example.com
113113
name: master-us-test-1a-2
114114
spec:
115-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
115+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
116116
machineType: m3.medium
117117
maxSize: 1
118118
minSize: 1
@@ -132,7 +132,7 @@ metadata:
132132
kops.k8s.io/cluster: ha.example.com
133133
name: master-us-test-1a-3
134134
spec:
135-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
135+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
136136
machineType: m3.medium
137137
maxSize: 1
138138
minSize: 1
@@ -152,7 +152,7 @@ metadata:
152152
kops.k8s.io/cluster: ha.example.com
153153
name: master-us-test-1b-1
154154
spec:
155-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
155+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
156156
machineType: m3.medium
157157
maxSize: 1
158158
minSize: 1
@@ -172,7 +172,7 @@ metadata:
172172
kops.k8s.io/cluster: ha.example.com
173173
name: master-us-test-1b-2
174174
spec:
175-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
175+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
176176
machineType: m3.medium
177177
maxSize: 1
178178
minSize: 1
@@ -192,7 +192,7 @@ metadata:
192192
kops.k8s.io/cluster: ha.example.com
193193
name: nodes-us-test-1a
194194
spec:
195-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
195+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
196196
machineType: t2.medium
197197
maxSize: 1
198198
minSize: 1
@@ -212,7 +212,7 @@ metadata:
212212
kops.k8s.io/cluster: ha.example.com
213213
name: nodes-us-test-1b
214214
spec:
215-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
215+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
216216
machineType: t2.medium
217217
maxSize: 1
218218
minSize: 1

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ metadata:
7373
kops.k8s.io/cluster: private.example.com
7474
name: bastions
7575
spec:
76-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
76+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
7777
machineType: t2.micro
7878
maxSize: 1
7979
minSize: 1
@@ -93,7 +93,7 @@ metadata:
9393
kops.k8s.io/cluster: private.example.com
9494
name: master-us-test-1a
9595
spec:
96-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
96+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
9797
machineType: m3.medium
9898
maxSize: 1
9999
minSize: 1
@@ -113,7 +113,7 @@ metadata:
113113
kops.k8s.io/cluster: private.example.com
114114
name: nodes-us-test-1a
115115
spec:
116-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
116+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
117117
machineType: t2.medium
118118
maxSize: 1
119119
minSize: 1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ metadata:
6565
kops.k8s.io/cluster: ipv6.example.com
6666
name: master-us-test-1a
6767
spec:
68-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
68+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
6969
instanceMetadata:
7070
httpPutResponseHopLimit: 3
7171
httpTokens: required
@@ -88,7 +88,7 @@ metadata:
8888
kops.k8s.io/cluster: ipv6.example.com
8989
name: nodes-us-test-1a
9090
spec:
91-
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210720
91+
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210907
9292
instanceMetadata:
9393
httpPutResponseHopLimit: 1
9494
httpTokens: required

0 commit comments

Comments
 (0)