Skip to content

Commit 056e866

Browse files
wzshimingwzshiming
authored
Release v1.23.5-lts.1, v1.22.8-lts.1, v1.21.11-lts.1 (#145)
* Release * Format patch * Regenerate
1 parent 231fff3 commit 056e866

File tree

3 files changed

+50
-50
lines changed

3 files changed

+50
-50
lines changed

‎.github/workflows/verify.yml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: |
3232
make verify-patch-format
3333
34-
Test-v1-23-4-lts-2:
34+
Test-v1-23-5-lts-1:
3535
needs: Patch
3636
runs-on: ubuntu-latest
3737
steps:
@@ -43,23 +43,23 @@ jobs:
4343
with:
4444
path: |
4545
src
46-
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-23-4-lts-2
46+
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-23-5-lts-1
4747
restore-keys: |
4848
${{ runner.os }}-build-${{ env.cache-name }}
4949
- name: Install dependent
5050
run: |
5151
make dependent
52-
- name: Checkout to v1.23.4-lts.2
52+
- name: Checkout to v1.23.5-lts.1
5353
run: |
54-
make v1.23.4-lts.2
54+
make v1.23.5-lts.1
5555
- name: Install etcd
5656
run: |
5757
make install-etcd
5858
- name: Test
5959
run: |
6060
make test
6161
62-
Test-Cmd-v1-23-4-lts-2:
62+
Test-Cmd-v1-23-5-lts-1:
6363
needs: Patch
6464
runs-on: ubuntu-latest
6565
steps:
@@ -71,23 +71,23 @@ jobs:
7171
with:
7272
path: |
7373
src
74-
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-23-4-lts-2
74+
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-23-5-lts-1
7575
restore-keys: |
7676
${{ runner.os }}-build-${{ env.cache-name }}
7777
- name: Install dependent
7878
run: |
7979
make dependent
80-
- name: Checkout to v1.23.4-lts.2
80+
- name: Checkout to v1.23.5-lts.1
8181
run: |
82-
make v1.23.4-lts.2
82+
make v1.23.5-lts.1
8383
- name: Install etcd
8484
run: |
8585
make install-etcd
8686
- name: Test cmd
8787
run: |
8888
make test-cmd
8989
90-
Test-Integration-v1-23-4-lts-2:
90+
Test-Integration-v1-23-5-lts-1:
9191
needs: Patch
9292
runs-on: ubuntu-latest
9393
steps:
@@ -100,23 +100,23 @@ jobs:
100100
path: |
101101
src
102102
/tmp/kubernetes-lts/
103-
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-23-4-lts-2
103+
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-23-5-lts-1
104104
restore-keys: |
105105
${{ runner.os }}-build-${{ env.cache-name }}
106106
- name: Install dependent
107107
run: |
108108
make dependent
109-
- name: Checkout to v1.23.4-lts.2
109+
- name: Checkout to v1.23.5-lts.1
110110
run: |
111-
make v1.23.4-lts.2
111+
make v1.23.5-lts.1
112112
- name: Install etcd
113113
run: |
114114
make install-etcd
115115
- name: Test integration
116116
run: |
117117
make test-integration
118118
119-
Test-v1-22-7-lts-2:
119+
Test-v1-22-8-lts-1:
120120
needs: Patch
121121
runs-on: ubuntu-latest
122122
steps:
@@ -128,23 +128,23 @@ jobs:
128128
with:
129129
path: |
130130
src
131-
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-22-7-lts-2
131+
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-22-8-lts-1
132132
restore-keys: |
133133
${{ runner.os }}-build-${{ env.cache-name }}
134134
- name: Install dependent
135135
run: |
136136
make dependent
137-
- name: Checkout to v1.22.7-lts.2
137+
- name: Checkout to v1.22.8-lts.1
138138
run: |
139-
make v1.22.7-lts.2
139+
make v1.22.8-lts.1
140140
- name: Install etcd
141141
run: |
142142
make install-etcd
143143
- name: Test
144144
run: |
145145
make test
146146
147-
Test-Cmd-v1-22-7-lts-2:
147+
Test-Cmd-v1-22-8-lts-1:
148148
needs: Patch
149149
runs-on: ubuntu-latest
150150
steps:
@@ -156,23 +156,23 @@ jobs:
156156
with:
157157
path: |
158158
src
159-
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-22-7-lts-2
159+
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-22-8-lts-1
160160
restore-keys: |
161161
${{ runner.os }}-build-${{ env.cache-name }}
162162
- name: Install dependent
163163
run: |
164164
make dependent
165-
- name: Checkout to v1.22.7-lts.2
165+
- name: Checkout to v1.22.8-lts.1
166166
run: |
167-
make v1.22.7-lts.2
167+
make v1.22.8-lts.1
168168
- name: Install etcd
169169
run: |
170170
make install-etcd
171171
- name: Test cmd
172172
run: |
173173
make test-cmd
174174
175-
Test-Integration-v1-22-7-lts-2:
175+
Test-Integration-v1-22-8-lts-1:
176176
needs: Patch
177177
runs-on: ubuntu-latest
178178
steps:
@@ -185,23 +185,23 @@ jobs:
185185
path: |
186186
src
187187
/tmp/kubernetes-lts/
188-
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-22-7-lts-2
188+
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-22-8-lts-1
189189
restore-keys: |
190190
${{ runner.os }}-build-${{ env.cache-name }}
191191
- name: Install dependent
192192
run: |
193193
make dependent
194-
- name: Checkout to v1.22.7-lts.2
194+
- name: Checkout to v1.22.8-lts.1
195195
run: |
196-
make v1.22.7-lts.2
196+
make v1.22.8-lts.1
197197
- name: Install etcd
198198
run: |
199199
make install-etcd
200200
- name: Test integration
201201
run: |
202202
make test-integration
203203
204-
Test-v1-21-10-lts-2:
204+
Test-v1-21-11-lts-1:
205205
needs: Patch
206206
runs-on: ubuntu-latest
207207
steps:
@@ -213,23 +213,23 @@ jobs:
213213
with:
214214
path: |
215215
src
216-
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-21-10-lts-2
216+
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-21-11-lts-1
217217
restore-keys: |
218218
${{ runner.os }}-build-${{ env.cache-name }}
219219
- name: Install dependent
220220
run: |
221221
make dependent
222-
- name: Checkout to v1.21.10-lts.2
222+
- name: Checkout to v1.21.11-lts.1
223223
run: |
224-
make v1.21.10-lts.2
224+
make v1.21.11-lts.1
225225
- name: Install etcd
226226
run: |
227227
make install-etcd
228228
- name: Test
229229
run: |
230230
make test
231231
232-
Test-Cmd-v1-21-10-lts-2:
232+
Test-Cmd-v1-21-11-lts-1:
233233
needs: Patch
234234
runs-on: ubuntu-latest
235235
steps:
@@ -241,23 +241,23 @@ jobs:
241241
with:
242242
path: |
243243
src
244-
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-21-10-lts-2
244+
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-21-11-lts-1
245245
restore-keys: |
246246
${{ runner.os }}-build-${{ env.cache-name }}
247247
- name: Install dependent
248248
run: |
249249
make dependent
250-
- name: Checkout to v1.21.10-lts.2
250+
- name: Checkout to v1.21.11-lts.1
251251
run: |
252-
make v1.21.10-lts.2
252+
make v1.21.11-lts.1
253253
- name: Install etcd
254254
run: |
255255
make install-etcd
256256
- name: Test cmd
257257
run: |
258258
make test-cmd
259259
260-
Test-Integration-v1-21-10-lts-2:
260+
Test-Integration-v1-21-11-lts-1:
261261
needs: Patch
262262
runs-on: ubuntu-latest
263263
steps:
@@ -270,15 +270,15 @@ jobs:
270270
path: |
271271
src
272272
/tmp/kubernetes-lts/
273-
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-21-10-lts-2
273+
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-21-11-lts-1
274274
restore-keys: |
275275
${{ runner.os }}-build-${{ env.cache-name }}
276276
- name: Install dependent
277277
run: |
278278
make dependent
279-
- name: Checkout to v1.21.10-lts.2
279+
- name: Checkout to v1.21.11-lts.1
280280
run: |
281-
make v1.21.10-lts.2
281+
make v1.21.11-lts.1
282282
- name: Install etcd
283283
run: |
284284
make install-etcd

‎patches/fix-run-docker.1.23.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Run docker as root in tests
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/build/common.sh b/build/common.sh
11-
index c59692408ae..da28826f108 100755
11+
index bd4676b8b1b..001b287b350 100755
1212
--- a/build/common.sh
1313
+++ b/build/common.sh
1414
@@ -490,7 +490,7 @@ function kube::build::run_build_command_ex() {
@@ -31,7 +31,7 @@ Subject: [PATCH 2/2] Run docker with device kmsg
3131
1 file changed, 1 insertion(+)
3232

3333
diff --git a/build/common.sh b/build/common.sh
34-
index da28826f108..b1dc1a26a4e 100755
34+
index 001b287b350..927db03e3a3 100755
3535
--- a/build/common.sh
3636
+++ b/build/common.sh
3737
@@ -492,6 +492,7 @@ function kube::build::run_build_command_ex() {

‎releases.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ base: https://github.com/kubernetes/kubernetes
22

33
releases:
44

5-
- name: v1.23.4-lts.2
6-
base_release: v1.23.4-ci
5+
- name: v1.23.5-lts.1
6+
base_release: v1.23.5-ci
77
must: true
88
patches: []
99

10-
- name: v1.22.7-lts.2
11-
base_release: v1.22.7-ci
10+
- name: v1.22.8-lts.1
11+
base_release: v1.22.8-ci
1212
must: true
1313
patches: []
1414

15-
- name: v1.21.10-lts.2
16-
base_release: v1.21.10-ci
15+
- name: v1.21.11-lts.1
16+
base_release: v1.21.11-ci
1717
must: true
1818
patches: []
1919

@@ -162,22 +162,22 @@ releases:
162162
# TODO: Need to upgrade go version greater than 1.9 to remove this
163163
- k8s.io/kubernetes/pkg/kubectl/cmd
164164

165-
- name: v1.23.4-ci
166-
base_release: v1.23.4
165+
- name: v1.23.5-ci
166+
base_release: v1.23.5
167167
patches:
168168
- fix-run-docker.1.23
169169
- no-delete-images.1.23
170170
- fix-etcd-put-key.1.23
171171

172-
- name: v1.22.7-ci
173-
base_release: v1.22.7
172+
- name: v1.22.8-ci
173+
base_release: v1.22.8
174174
patches:
175175
- fix-run-docker.1.23
176176
- no-delete-images.1.23
177177
- fix-etcd-put-key.1.23
178178

179-
- name: v1.21.10-ci
180-
base_release: v1.21.10
179+
- name: v1.21.11-ci
180+
base_release: v1.21.11
181181
patches:
182182
- fix-run-docker.1.23
183183
- no-delete-images.1.23

0 commit comments

Comments
 (0)