Skip to content

Commit e5849f1

Browse files
JamesMurkinJamesMurkin
committed
Merge branch 'master' into wip_defrag
2 parents 3aec046 + eb1324c commit e5849f1

File tree

473 files changed

+14595
-9258
lines changed

Some content is hidden

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

473 files changed

+14595
-9258
lines changed

‎.github/workflows/airflow-operator-release-to-pypi.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
- run: go run github.com/magefile/mage@v1.14.0 -v airflowOperator
2121
- uses: ./.github/workflows/python-tests
2222
with:
23-
python-version: '3.8'
24-
tox-env: 'py38'
23+
python-version: '3.10'
24+
tox-env: 'py310'
2525
path: third_party/airflow
2626
github-token: ${{secrets.GITHUB_TOKEN}}
2727
- name: Publish package to PyPI

‎.github/workflows/airflow-operator.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,14 @@ jobs:
4040
runs-on: ubuntu-22.04
4141
strategy:
4242
matrix:
43-
python: [ '3.8', '3.9', '3.10' ]
43+
python: [ '3.10', '3.11', '3.12' ]
4444
include:
45-
- tox-env: 'py38'
46-
- tox-env: 'py39'
47-
python: '3.9'
4845
- tox-env: 'py310'
4946
python: '3.10'
47+
- tox-env: 'py311'
48+
python: '3.11'
49+
- tox-env: 'py312'
50+
python: '3.12'
5051
steps:
5152
- uses: actions/checkout@v4
5253
- name: Setup Go

‎.github/workflows/python-client-release-to-pypi.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
repo-token: ${{ secrets.GITHUB_TOKEN }}
2020
- uses: ./.github/workflows/python-tests
2121
with:
22-
python-version: '3.8'
23-
tox-env: 'py38'
22+
python-version: '3.9'
23+
tox-env: 'py39'
2424
path: 'client/python'
2525
github-token: ${{secrets.GITHUB_TOKEN}}
2626
- name: Publish package to PyPI

‎.github/workflows/python-client.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@ jobs:
3434
runs-on: ubuntu-22.04
3535
strategy:
3636
matrix:
37-
python: [ '3.8', '3.9', '3.10' ]
37+
python: [ '3.9', '3.10', '3.11', '3.12' ]
3838
include:
39-
- tox-env: 'py38'
4039
- tox-env: 'py39'
4140
python: '3.9'
4241
- tox-env: 'py310'
4342
python: '3.10'
43+
- tox-env: 'py311'
44+
python: '3.11'
45+
- tox-env: 'py312'
46+
python: '3.12'
4447
steps:
4548
- uses: actions/checkout@v4
4649
- name: Setup Go

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ junit.xml
1414
docker-compose.dev.yaml
1515
delve
1616

17+
# VS Code debugging
18+
__debug_bin
19+
**/__debug_bin*
20+
1721
# Build artifacts
1822
dist
1923
.goreleaser-minimal.yml

‎.goreleaser.yml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ dockers:
186186
- --label=org.opencontainers.image.version={{ .Version }}
187187
- --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
188188
- --label=org.opencontainers.image.revision={{ .FullCommit }}
189-
- --label=org.opencontainers.image.base.name=alpine:3.20.3
189+
- --label=org.opencontainers.image.base.name=alpine:3.21.0
190190
- --label=org.opencontainers.image.licenses=Apache-2.0
191191
- --label=org.opencontainers.image.vendor=G-Research
192192
ids:
@@ -197,6 +197,7 @@ dockers:
197197
- scheduler
198198
- scheduleringester
199199
extra_files:
200+
- config/logging.yaml
200201
- config/server/config.yaml
201202
- config/executor/config.yaml
202203
- config/binoculars/config.yaml
@@ -217,11 +218,13 @@ dockers:
217218
- lookoutv2
218219
- lookoutingesterv2
219220
extra_files:
221+
- config/logging.yaml
220222
- config/lookoutv2/config.yaml
221223
- config/lookoutingesterv2/config.yaml
222224
- internal/lookout/ui
223225
- pkg/api/api.swagger.json
224226
- pkg/api/binoculars/api.swagger.json
227+
- pkg/api/schedulerobjects/api.swagger.json
225228
dockerfile: ./build/bundles/lookout/Dockerfile
226229

227230
- id: full-bundle
@@ -244,6 +247,7 @@ dockers:
244247
- lookoutingesterv2
245248
- fakeexecutor
246249
extra_files:
250+
- config/logging.yaml
247251
- config/server/config.yaml
248252
- config/executor/config.yaml
249253
- config/binoculars/config.yaml
@@ -255,6 +259,7 @@ dockers:
255259
- internal/lookout/ui
256260
- pkg/api/api.swagger.json
257261
- pkg/api/binoculars/api.swagger.json
262+
- pkg/api/schedulerobjects/api.swagger.json
258263
dockerfile: ./build/bundles/full/Dockerfile
259264

260265
- id: server
@@ -269,6 +274,7 @@ dockers:
269274
- server
270275
extra_files:
271276
- config/server/config.yaml
277+
- config/logging.yaml
272278
dockerfile: ./build/server/Dockerfile
273279

274280
- id: executor
@@ -283,6 +289,7 @@ dockers:
283289
- executor
284290
extra_files:
285291
- config/executor/config.yaml
292+
- config/logging.yaml
286293
dockerfile: ./build/executor/Dockerfile
287294

288295
- id: fakeexecutor
@@ -297,6 +304,7 @@ dockers:
297304
- fakeexecutor
298305
extra_files:
299306
- config/executor/config.yaml
307+
- config/logging.yaml
300308
dockerfile: ./build/fakeexecutor/Dockerfile
301309

302310
- id: armadaloadtester
@@ -335,6 +343,7 @@ dockers:
335343
- lookoutingesterv2
336344
extra_files:
337345
- config/lookoutingesterv2/config.yaml
346+
- config/logging.yaml
338347
dockerfile: ./build/lookoutingesterv2/Dockerfile
339348

340349
- id: lookoutv2
@@ -352,8 +361,10 @@ dockers:
352361
- internal/lookout/ui
353362
- pkg/api/api.swagger.json
354363
- pkg/api/binoculars/api.swagger.json
364+
- pkg/api/schedulerobjects/api.swagger.json
355365
- config/lookoutv2/config.yaml
356366
- config/lookoutingesterv2/config.yaml
367+
- config/logging.yaml
357368
dockerfile: ./build/lookoutv2/Dockerfile
358369

359370
- id: eventingester
@@ -368,6 +379,7 @@ dockers:
368379
- eventingester
369380
extra_files:
370381
- config/eventingester/config.yaml
382+
- config/logging.yaml
371383
dockerfile: ./build/eventingester/Dockerfile
372384

373385
- id: scheduler
@@ -382,6 +394,7 @@ dockers:
382394
- scheduler
383395
extra_files:
384396
- config/scheduler/config.yaml
397+
- config/logging.yaml
385398
dockerfile: ./build/scheduler/Dockerfile
386399

387400
- id: scheduleringester
@@ -396,6 +409,7 @@ dockers:
396409
- scheduleringester
397410
extra_files:
398411
- config/scheduleringester/config.yaml
412+
- config/logging.yaml
399413
dockerfile: ./build/scheduleringester/Dockerfile
400414

401415
- id: binoculars
@@ -410,6 +424,7 @@ dockers:
410424
- binoculars
411425
extra_files:
412426
- config/binoculars/config.yaml
427+
- config/logging.yaml
413428
dockerfile: ./build/binoculars/Dockerfile
414429

415430
- id: armadactl

‎.mergify.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ pull_request_rules:
99
- "#approved-reviews-by>=2"
1010
- and:
1111
- "#approved-reviews-by>=1"
12-
- "author~=^(d80tb7|dave[-]gantenbein|dejanzele|eleanorpratt|JamesMurkin|mauriceyap|masipauskas|MustafaI|zuqq|richscott|robertdavidsmith|samclark|suprjinx)"
12+
- "author~=^(d80tb7|dave[-]gantenbein|dejanzele|eleanorpratt|geaere|JamesMurkin|mauriceyap|masipauskas|MustafaI|zuqq|richscott|robertdavidsmith|samclark|suprjinx)"
1313
title:
1414
Two are checks required.

‎.run/Event Ingester.run.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<module name="armada" />
44
<working_directory value="$PROJECT_DIR$" />
55
<envs>
6+
<env name="ARMADA_LOG_CONFIG" value="config/logging-dev.yaml" />
67
<env name="ARMADA_PULSAR_URL" value="pulsar://localhost:6650" />
78
<env name="ARMADA_REDIS_ADDRS" value="localhost:6379" />
89
<env name="ARMADA_METRICSPORT" value="9011" />
@@ -13,4 +14,4 @@
1314
<filePath value="$PROJECT_DIR$/cmd/eventingester/main.go" />
1415
<method v="2" />
1516
</configuration>
16-
</component>
17+
</component>

‎.run/Executor.run.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<env name="ARMADA_APICONNECTION_FORCENOTLS" value="true" />
77
<env name="ARMADA_EXECUTORAPICONNECTION_ARMADAURL" value="localhost:50052" />
88
<env name="ARMADA_EXECUTORAPICONNECTION_FORCENOTLS" value="true" />
9+
<env name="ARMADA_LOG_CONFIG" value="config/logging-dev.yaml" />
910
<env name="ARMADA_HTTPPORT" value="8085" />
1011
<env name="HOME" value="$USER_HOME$/" />
1112
<env name="KUBECONFIG" value="$PROJECT_DIR$/.kube/external/config" />
@@ -17,4 +18,4 @@
1718
<filePath value="$PROJECT_DIR$/cmd/executor/main.go" />
1819
<method v="2" />
1920
</configuration>
20-
</component>
21+
</component>

‎.run/Lookout Ingester V2.run.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<module name="armada" />
44
<working_directory value="$PROJECT_DIR$" />
55
<envs>
6+
<env name="ARMADA_LOG_CONFIG" value="config/logging-dev.yaml" />
67
<env name="ARMADA_METRICS_PORT" value="9006" />
78
<env name="ARMADA_POSTGRES_CONNECTION_HOST" value="localhost" />
89
<env name="ARMADA_POSTGRES_CONNECTION_PORT" value="5432" />

0 commit comments

Comments
 (0)