Skip to content

Commit 80ee99b

Browse files
handan-yxhhandan-yxh
authored
Merge branch 'volcano-sh:master' into doc/agent-scheduler-snapshot-design
2 parents fdb123b + 3275f8a commit 80ee99b

Some content is hidden

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

51 files changed

+1388
-781
lines changed

‎.github/workflows/release.yaml‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
- "v*.*.*"
1010

1111

12+
permissions:
13+
contents: read
14+
packages: write
15+
1216
jobs:
1317
docker:
1418
runs-on: ubuntu-latest
@@ -37,6 +41,9 @@ jobs:
3741
run: |
3842
echo "TAG=${{ github.ref_name }}" >> $GITHUB_ENV
3943
echo "RELEASE_VER=${{ github.ref_name }}" >> $GITHUB_ENV
44+
# Downcase the repository owner for GHCR / Docker compatibility
45+
OWNER="${{ github.repository_owner }}"
46+
echo "REPO_OWNER=${OWNER,,}" >> $GITHUB_ENV
4047
4148
- name: Update tag and release_ver
4249
if: ${{ github.ref_name == 'master' }}
@@ -63,9 +70,23 @@ jobs:
6370
username: ${{ secrets.DOCKERHUB_USERNAME }}
6471
password: ${{ secrets.DOCKERHUB_TOKEN }}
6572

66-
- name: Daily Release
73+
- name: Daily Release to Docker Hub
6774
run: docker buildx create --use && make TAG=${{ env.TAG }} RELEASE_VER=${{ env.RELEASE_VER }} DOCKER_USERNAME=${{ secrets.DOCKERHUB_USERNAME }} DOCKER_PASSWORD=${{ secrets.DOCKERHUB_TOKEN }} CC=/usr/local/musl/bin/musl-gcc DOCKER_PLATFORMS="linux/amd64,linux/arm64" BUILDX_OUTPUT_TYPE=registry release
6875
working-directory: ./src/github.com/${{ github.repository }}
6976

70-
- name: Loginout DockerHub
71-
run: docker logout
77+
- name: Login to GitHub Container Registry
78+
uses: docker/login-action@v3
79+
with:
80+
registry: ghcr.io
81+
username: ${{ github.actor }}
82+
password: ${{ secrets.GITHUB_TOKEN }}
83+
84+
- name: Daily Release to GitHub Container Registry
85+
run: make TAG=${{ env.TAG }} RELEASE_VER=${{ env.RELEASE_VER }} IMAGE_PREFIX=ghcr.io/${{ env.REPO_OWNER }} CC=/usr/local/musl/bin/musl-gcc DOCKER_PLATFORMS="linux/amd64,linux/arm64" BUILDX_OUTPUT_TYPE=registry release
86+
working-directory: ./src/github.com/${{ github.repository }}
87+
88+
- name: Logout from registries
89+
if: always()
90+
run: |
91+
docker logout
92+
docker logout ghcr.io

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@ network_closure.sh
8181
/_tmp/
8282
/doc_tmp/
8383

84-
# Test artifacts produced by Jenkins jobs
84+
# Test artifacts
8585
/_artifacts/
86+
/test-artifacts/
8687

8788
# Go dependencies installed on Jenkins
8889
/_gopath/

‎OWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ approvers:
3535
- hwdef
3636
- wangyang0616
3737
- JesseStutler
38+
- archlitchi

‎config/crd/jobflow/bases/flow.volcano.sh_jobflows.yaml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,18 @@ spec:
6262
minimum: 0
6363
type: integer
6464
taskName:
65+
maxLength: 253
6566
type: string
6667
type: object
6768
type: array
6869
taskStatusList:
6970
items:
7071
properties:
7172
phase:
73+
maxLength: 63
7274
type: string
7375
taskName:
76+
maxLength: 253
7477
type: string
7578
type: object
7679
type: array
@@ -82,6 +85,7 @@ spec:
8285
minimum: 0
8386
type: integer
8487
taskName:
88+
maxLength: 253
8589
type: string
8690
required:
8791
- port
@@ -103,9 +107,11 @@ spec:
103107
maxRetry:
104108
default: 3
105109
format: int32
110+
minimum: 0
106111
type: integer
107112
minAvailable:
108113
format: int32
114+
minimum: 0
109115
type: integer
110116
minSuccess:
111117
format: int32
@@ -114,8 +120,11 @@ spec:
114120
networkTopology:
115121
properties:
116122
highestTierAllowed:
123+
minimum: 0
117124
type: integer
118125
highestTierName:
126+
maxLength: 253
127+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
119128
type: string
120129
mode:
121130
default: hard
@@ -173,12 +182,18 @@ spec:
173182
type: object
174183
type: array
175184
priorityClassName:
185+
maxLength: 253
186+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
176187
type: string
177188
queue:
189+
default: default
190+
maxLength: 253
191+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
178192
type: string
179193
runningEstimate:
180194
type: string
181195
schedulerName:
196+
maxLength: 63
182197
type: string
183198
tasks:
184199
items:
@@ -194,23 +209,31 @@ spec:
194209
type: object
195210
maxRetry:
196211
format: int32
212+
minimum: 0
197213
type: integer
198214
minAvailable:
199215
format: int32
216+
minimum: 0
200217
type: integer
201218
name:
219+
maxLength: 63
220+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
202221
type: string
203222
partitionPolicy:
204223
properties:
205224
minPartitions:
206225
default: 0
207226
format: int32
227+
minimum: 0
208228
type: integer
209229
networkTopology:
210230
properties:
211231
highestTierAllowed:
232+
minimum: 0
212233
type: integer
213234
highestTierName:
235+
maxLength: 253
236+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
214237
type: string
215238
mode:
216239
default: hard
@@ -221,9 +244,11 @@ spec:
221244
type: object
222245
partitionSize:
223246
format: int32
247+
minimum: 1
224248
type: integer
225249
totalPartitions:
226250
format: int32
251+
minimum: 1
227252
type: integer
228253
required:
229254
- partitionSize
@@ -273,6 +298,7 @@ spec:
273298
type: array
274299
replicas:
275300
format: int32
301+
minimum: 0
276302
type: integer
277303
template:
278304
properties:
@@ -4091,14 +4117,18 @@ spec:
40914117
- single-numa-node
40924118
type: string
40934119
type: object
4120+
minItems: 1
40944121
type: array
40954122
ttlSecondsAfterFinished:
40964123
format: int32
4124+
minimum: 0
40974125
type: integer
40984126
volumes:
40994127
items:
41004128
properties:
41014129
mountPath:
4130+
minLength: 1
4131+
pattern: ^[^:]+$
41024132
type: string
41034133
volumeClaim:
41044134
properties:
@@ -4189,6 +4219,7 @@ spec:
41894219
type: string
41904220
type: object
41914221
volumeClaimName:
4222+
maxLength: 253
41924223
type: string
41934224
required:
41944225
- mountPath
@@ -4248,6 +4279,7 @@ spec:
42484279
type: string
42494280
restartCount:
42504281
format: int32
4282+
minimum: 0
42514283
type: integer
42524284
runningHistories:
42534285
items:
@@ -4280,6 +4312,12 @@ spec:
42804312
state:
42814313
properties:
42824314
phase:
4315+
enum:
4316+
- Succeed
4317+
- Terminating
4318+
- Failed
4319+
- Running
4320+
- Pending
42834321
type: string
42844322
type: object
42854323
terminatedJobs:

‎config/crd/jobflow/bases/flow.volcano.sh_jobtemplates.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ spec:
3131
maxRetry:
3232
default: 3
3333
format: int32
34+
minimum: 0
3435
type: integer
3536
minAvailable:
3637
format: int32
38+
minimum: 0
3739
type: integer
3840
minSuccess:
3941
format: int32
@@ -42,8 +44,11 @@ spec:
4244
networkTopology:
4345
properties:
4446
highestTierAllowed:
47+
minimum: 0
4548
type: integer
4649
highestTierName:
50+
maxLength: 253
51+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
4752
type: string
4853
mode:
4954
default: hard
@@ -101,12 +106,18 @@ spec:
101106
type: object
102107
type: array
103108
priorityClassName:
109+
maxLength: 253
110+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
104111
type: string
105112
queue:
113+
default: default
114+
maxLength: 253
115+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
106116
type: string
107117
runningEstimate:
108118
type: string
109119
schedulerName:
120+
maxLength: 63
110121
type: string
111122
tasks:
112123
items:
@@ -122,23 +133,31 @@ spec:
122133
type: object
123134
maxRetry:
124135
format: int32
136+
minimum: 0
125137
type: integer
126138
minAvailable:
127139
format: int32
140+
minimum: 0
128141
type: integer
129142
name:
143+
maxLength: 63
144+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
130145
type: string
131146
partitionPolicy:
132147
properties:
133148
minPartitions:
134149
default: 0
135150
format: int32
151+
minimum: 0
136152
type: integer
137153
networkTopology:
138154
properties:
139155
highestTierAllowed:
156+
minimum: 0
140157
type: integer
141158
highestTierName:
159+
maxLength: 253
160+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
142161
type: string
143162
mode:
144163
default: hard
@@ -149,9 +168,11 @@ spec:
149168
type: object
150169
partitionSize:
151170
format: int32
171+
minimum: 1
152172
type: integer
153173
totalPartitions:
154174
format: int32
175+
minimum: 1
155176
type: integer
156177
required:
157178
- partitionSize
@@ -201,6 +222,7 @@ spec:
201222
type: array
202223
replicas:
203224
format: int32
225+
minimum: 0
204226
type: integer
205227
template:
206228
properties:
@@ -4019,14 +4041,18 @@ spec:
40194041
- single-numa-node
40204042
type: string
40214043
type: object
4044+
minItems: 1
40224045
type: array
40234046
ttlSecondsAfterFinished:
40244047
format: int32
4048+
minimum: 0
40254049
type: integer
40264050
volumes:
40274051
items:
40284052
properties:
40294053
mountPath:
4054+
minLength: 1
4055+
pattern: ^[^:]+$
40304056
type: string
40314057
volumeClaim:
40324058
properties:
@@ -4117,6 +4143,7 @@ spec:
41174143
type: string
41184144
type: object
41194145
volumeClaimName:
4146+
maxLength: 253
41204147
type: string
41214148
required:
41224149
- mountPath

0 commit comments

Comments
 (0)