Skip to content

Commit e92063f

Browse files
committed
Merge branch 'master' of https://github.com/minio/console into kms-dummy-endpoints
2 parents 89bcbfb + 67f509e commit e92063f

File tree

578 files changed

+1372
-1664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

578 files changed

+1372
-1664
lines changed

.github/workflows/jobs.yaml

Lines changed: 40 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
strategy:
3131
matrix:
32-
go-version: [ 1.18.x, 1.19.x ]
32+
go-version: [ 1.18.x ]
3333

3434
steps:
3535
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -85,6 +85,13 @@ jobs:
8585
./replication/coverage/
8686
key: ${{ runner.os }}-replication-coverage-2-${{ github.run_id }}
8787

88+
# To save our replication.out file into an artifact.
89+
# By default, GitHub stores build logs and artifacts for 90 days.
90+
- uses: actions/upload-artifact@v3
91+
with:
92+
name: replication-artifact
93+
path: ./replication/coverage/replication.out
94+
8895
sso-integration:
8996

9097
name: SSO Integration Test
@@ -98,7 +105,7 @@ jobs:
98105

99106
strategy:
100107
matrix:
101-
go-version: [ 1.18.x, 1.19.x ]
108+
go-version: [ 1.18.x ]
102109

103110
steps:
104111
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -224,10 +231,10 @@ jobs:
224231

225232
lint-job:
226233
name: Checking Lint
227-
runs-on: [self-hosted]
234+
runs-on: [ self-hosted ]
228235
strategy:
229236
matrix:
230-
go-version: [ 1.18.x, 1.19.x ]
237+
go-version: [ 1.18.x ]
231238
os: [ ubuntu-latest ]
232239
steps:
233240
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -251,7 +258,7 @@ jobs:
251258
runs-on: self-hosted
252259
strategy:
253260
matrix:
254-
go-version: [ 1.18.x, 1.19.x ]
261+
go-version: [ 1.18.x ]
255262
os: [ ubuntu-latest ]
256263
steps:
257264
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -300,7 +307,7 @@ jobs:
300307
runs-on: self-hosted
301308
strategy:
302309
matrix:
303-
go-version: [ 1.18.x, 1.19.x ]
310+
go-version: [ 1.18.x ]
304311
os: [ ubuntu-latest ]
305312
steps:
306313
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -366,7 +373,7 @@ jobs:
366373
runs-on: self-hosted
367374
strategy:
368375
matrix:
369-
go-version: [ 1.18.x, 1.19.x ]
376+
go-version: [ 1.18.x ]
370377
os: [ ubuntu-latest ]
371378
steps:
372379
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -404,7 +411,7 @@ jobs:
404411
runs-on: [ self-hosted, vm-docker, xvfb-run ]
405412
strategy:
406413
matrix:
407-
go-version: [ 1.18.x, 1.19.x ]
414+
go-version: [ 1.18.x ]
408415
os: [ ubuntu-latest ]
409416
steps:
410417
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -501,7 +508,7 @@ jobs:
501508
runs-on: [ self-hosted, vm-docker, xvfb-run ]
502509
strategy:
503510
matrix:
504-
go-version: [ 1.18.x, 1.19.x ]
511+
go-version: [ 1.18.x ]
505512
os: [ ubuntu-latest ]
506513
steps:
507514
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -591,7 +598,7 @@ jobs:
591598
runs-on: [ self-hosted, vm-docker, xvfb-run ]
592599
strategy:
593600
matrix:
594-
go-version: [ 1.18.x, 1.19.x ]
601+
go-version: [ 1.18.x ]
595602
os: [ ubuntu-latest ]
596603
steps:
597604
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -683,7 +690,7 @@ jobs:
683690
timeout-minutes: 5
684691
strategy:
685692
matrix:
686-
go-version: [ 1.18.x, 1.19.x ]
693+
go-version: [ 1.18.x ]
687694
os: [ ubuntu-latest ]
688695
steps:
689696
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -761,7 +768,7 @@ jobs:
761768
runs-on: [ self-hosted, vm-docker, xvfb-run ]
762769
strategy:
763770
matrix:
764-
go-version: [ 1.18.x, 1.19.x ]
771+
go-version: [ 1.18.x ]
765772
os: [ ubuntu-latest ]
766773
steps:
767774
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -839,7 +846,7 @@ jobs:
839846
runs-on: [ self-hosted, vm-docker, xvfb-run ]
840847
strategy:
841848
matrix:
842-
go-version: [ 1.18.x, 1.19.x ]
849+
go-version: [ 1.18.x ]
843850
os: [ ubuntu-latest ]
844851
steps:
845852
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -917,7 +924,7 @@ jobs:
917924
runs-on: [ self-hosted, vm-docker, xvfb-run ]
918925
strategy:
919926
matrix:
920-
go-version: [ 1.18.x, 1.19.x ]
927+
go-version: [ 1.18.x ]
921928
os: [ ubuntu-latest ]
922929
steps:
923930
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -995,7 +1002,7 @@ jobs:
9951002
runs-on: [ self-hosted, vm-docker, xvfb-run ]
9961003
strategy:
9971004
matrix:
998-
go-version: [ 1.18.x, 1.19.x ]
1005+
go-version: [ 1.18.x ]
9991006
os: [ ubuntu-latest ]
10001007
steps:
10011008
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1073,7 +1080,7 @@ jobs:
10731080
runs-on: [ self-hosted, vm-docker, xvfb-run ]
10741081
strategy:
10751082
matrix:
1076-
go-version: [ 1.18.x, 1.19.x ]
1083+
go-version: [ 1.18.x ]
10771084
os: [ ubuntu-latest ]
10781085
steps:
10791086
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1257,7 +1264,7 @@ jobs:
12571264
runs-on: ${{ matrix.os }}
12581265
strategy:
12591266
matrix:
1260-
go-version: [ 1.18.x, 1.19.x ]
1267+
go-version: [ 1.18.x ]
12611268
os: [ ubuntu-latest ]
12621269
steps:
12631270
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1295,7 +1302,7 @@ jobs:
12951302
runs-on: ${{ matrix.os }}
12961303
strategy:
12971304
matrix:
1298-
go-version: [ 1.18.x, 1.19.x ]
1305+
go-version: [ 1.18.x ]
12991306
os: [ ubuntu-latest ]
13001307
steps:
13011308
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1333,7 +1340,7 @@ jobs:
13331340
runs-on: ${{ matrix.os }}
13341341
strategy:
13351342
matrix:
1336-
go-version: [ 1.18.x, 1.19.x ]
1343+
go-version: [ 1.18.x ]
13371344
os: [ ubuntu-latest ]
13381345
steps:
13391346
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1371,7 +1378,7 @@ jobs:
13711378
runs-on: ${{ matrix.os }}
13721379
strategy:
13731380
matrix:
1374-
go-version: [ 1.18.x, 1.19.x ]
1381+
go-version: [ 1.18.x ]
13751382
os: [ ubuntu-latest ]
13761383
steps:
13771384
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1409,7 +1416,7 @@ jobs:
14091416
runs-on: ${{ matrix.os }}
14101417
strategy:
14111418
matrix:
1412-
go-version: [ 1.18.x, 1.19.x ]
1419+
go-version: [ 1.18.x ]
14131420
os: [ ubuntu-latest ]
14141421
steps:
14151422
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1447,7 +1454,7 @@ jobs:
14471454
runs-on: ${{ matrix.os }}
14481455
strategy:
14491456
matrix:
1450-
go-version: [ 1.18.x, 1.19.x ]
1457+
go-version: [ 1.18.x ]
14511458
os: [ ubuntu-latest ]
14521459
steps:
14531460
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1485,7 +1492,7 @@ jobs:
14851492
runs-on: ${{ matrix.os }}
14861493
strategy:
14871494
matrix:
1488-
go-version: [ 1.18.x, 1.19.x ]
1495+
go-version: [ 1.18.x ]
14891496
os: [ ubuntu-latest ]
14901497
steps:
14911498
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1523,7 +1530,7 @@ jobs:
15231530
runs-on: ${{ matrix.os }}
15241531
strategy:
15251532
matrix:
1526-
go-version: [ 1.18.x, 1.19.x ]
1533+
go-version: [ 1.18.x ]
15271534
os: [ ubuntu-latest ]
15281535
steps:
15291536
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1569,7 +1576,7 @@ jobs:
15691576
runs-on: ${{ matrix.os }}
15701577
strategy:
15711578
matrix:
1572-
go-version: [ 1.18.x, 1.19.x ]
1579+
go-version: [ 1.18.x ]
15731580
os: [ ubuntu-latest ]
15741581
steps:
15751582
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1616,7 +1623,7 @@ jobs:
16161623

16171624
strategy:
16181625
matrix:
1619-
go-version: [ 1.18.x, 1.19.x ]
1626+
go-version: [ 1.18.x ]
16201627

16211628
steps:
16221629
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1728,7 +1735,7 @@ jobs:
17281735
runs-on: ${{ matrix.os }}
17291736
strategy:
17301737
matrix:
1731-
go-version: [ 1.18.x, 1.19.x ]
1738+
go-version: [ 1.18.x ]
17321739
os: [ ubuntu-latest ]
17331740
steps:
17341741
- name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1807,6 +1814,12 @@ jobs:
18071814
./pkg/coverage/
18081815
key: ${{ runner.os }}-coverage-pkg-2-${{ github.run_id }}
18091816

1817+
# Get the replication.out file from the artifact since this is working for self host runner.
1818+
- uses: actions/download-artifact@v3
1819+
with:
1820+
name: replication-artifact
1821+
path: replication/coverage
1822+
18101823
- name: Get coverage
18111824
run: |
18121825
echo "change directory to gocovmerge"

k8s/operator-console/base/console-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
serviceAccountName: console-sa
1616
containers:
1717
- name: console
18-
image: 'minio/console:v0.20.1'
18+
image: 'minio/console:v0.20.2'
1919
imagePullPolicy: "IfNotPresent"
2020
env:
2121
- name: CONSOLE_OPERATOR_MODE

k8s/operator-console/standalone/console-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
spec:
3333
containers:
3434
- name: console
35-
image: 'minio/console:v0.20.1'
35+
image: 'minio/console:v0.20.2'
3636
imagePullPolicy: "IfNotPresent"
3737
env:
3838
- name: CONSOLE_MINIO_SERVER

models/csi_format_error_response.go

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)