Skip to content

Commit 381aa69

Browse files
d80tb7d80tb7
committed
Merge branch 'master' of github.com:armadaproject/armada into f/chrisma/remove-schedulobjects-executor
2 parents d6c3bed + 7629005 commit 381aa69

File tree

173 files changed

+4585
-1198
lines changed

Some content is hidden

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

173 files changed

+4585
-1198
lines changed

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
cache: yarn
2424
cache-dependency-path: ./internal/lookoutui/yarn.lock
2525

26-
- name: Install Dependencies And Run Unit Tests
26+
- name: Install Dependencies, Check Types And Run Unit Tests
2727
run: |
28-
yarn install --frozen-lockfile && yarn openapi && CI=true yarn test --reporter=junit
28+
yarn install --frozen-lockfile && yarn openapi && yarn typecheck && CI=true yarn test --reporter=junit
2929
working-directory: ./internal/lookoutui
3030

3131
- name: Publish JUnit Report

‎.goreleaser.yml‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ builds:
7777
goarch:
7878
- amd64
7979
- env: [CGO_ENABLED=0]
80-
id: lookoutingesterv2
81-
binary: lookoutingesterv2
82-
main: ./cmd/lookoutingesterv2/main.go
80+
id: lookoutingester
81+
binary: lookoutingester
82+
main: ./cmd/lookoutingester/main.go
8383
mod_timestamp: '{{ .CommitTimestamp }}'
8484
goos:
8585
- linux
@@ -216,11 +216,11 @@ dockers:
216216
build_flag_templates: *BUILD_FLAG_TEMPLATES
217217
ids:
218218
- lookout
219-
- lookoutingesterv2
219+
- lookoutingester
220220
extra_files:
221221
- config/logging.yaml
222222
- config/lookout/config.yaml
223-
- config/lookoutingesterv2/config.yaml
223+
- config/lookoutingester/config.yaml
224224
- internal/lookoutui
225225
- pkg/api/api.swagger.json
226226
- pkg/api/binoculars/api.swagger.json
@@ -244,7 +244,7 @@ dockers:
244244
- scheduler
245245
- scheduleringester
246246
- lookout
247-
- lookoutingesterv2
247+
- lookoutingester
248248
- fakeexecutor
249249
extra_files:
250250
- config/logging.yaml
@@ -255,7 +255,7 @@ dockers:
255255
- config/scheduler/config.yaml
256256
- config/scheduleringester/config.yaml
257257
- config/lookout/config.yaml
258-
- config/lookoutingesterv2/config.yaml
258+
- config/lookoutingester/config.yaml
259259
- internal/lookoutui
260260
- pkg/api/api.swagger.json
261261
- pkg/api/binoculars/api.swagger.json
@@ -331,20 +331,22 @@ dockers:
331331
- testsuite
332332
dockerfile: ./build/testsuite/Dockerfile
333333

334-
- id: lookoutingesterv2
334+
- id: lookoutingester
335335
use: buildx
336336
goos: linux
337337
goarch: amd64
338338
image_templates:
339339
- "{{ .Env.DOCKER_REPO }}armada-lookout-ingester-v2:latest"
340340
- "{{ .Env.DOCKER_REPO }}armada-lookout-ingester-v2:{{ .Version }}"
341+
- "{{ .Env.DOCKER_REPO }}armada-lookout-ingester:latest"
342+
- "{{ .Env.DOCKER_REPO }}armada-lookout-ingester:{{ .Version }}"
341343
build_flag_templates: *BUILD_FLAG_TEMPLATES
342344
ids:
343-
- lookoutingesterv2
345+
- lookoutingester
344346
extra_files:
345-
- config/lookoutingesterv2/config.yaml
347+
- config/lookoutingester/config.yaml
346348
- config/logging.yaml
347-
dockerfile: ./build/lookoutingesterv2/Dockerfile
349+
dockerfile: ./build/lookoutingester/Dockerfile
348350

349351
- id: lookout
350352
use: buildx
@@ -353,17 +355,19 @@ dockers:
353355
image_templates:
354356
- "{{ .Env.DOCKER_REPO }}armada-lookout-v2:latest"
355357
- "{{ .Env.DOCKER_REPO }}armada-lookout-v2:{{ .Version }}"
358+
- "{{ .Env.DOCKER_REPO }}armada-lookout:latest"
359+
- "{{ .Env.DOCKER_REPO }}armada-lookout:{{ .Version }}"
356360
build_flag_templates: *BUILD_FLAG_TEMPLATES
357361
ids:
358362
- lookout
359-
- lookoutingesterv2
363+
- lookoutingester
360364
extra_files:
361365
- internal/lookoutui
362366
- pkg/api/api.swagger.json
363367
- pkg/api/binoculars/api.swagger.json
364368
- pkg/api/schedulerobjects/api.swagger.json
365369
- config/lookout/config.yaml
366-
- config/lookoutingesterv2/config.yaml
370+
- config/lookoutingester/config.yaml
367371
- config/logging.yaml
368372
dockerfile: ./build/lookout/Dockerfile
369373

@@ -503,9 +507,13 @@ release:
503507
#### Armada Lookout
504508
- `docker pull {{ .Env.DOCKER_REPO }}armada-lookout-v2:{{ .Version }}`
505509
- `docker pull {{ .Env.DOCKER_REPO }}armada-lookout-v2:latest`
506-
#### Armada Lookout Ingester V2
510+
- `docker pull {{ .Env.DOCKER_REPO }}armada-lookout:{{ .Version }}`
511+
- `docker pull {{ .Env.DOCKER_REPO }}armada-lookout:latest`
512+
#### Armada Lookout Ingester
507513
- `docker pull {{ .Env.DOCKER_REPO }}armada-lookout-ingester-v2:{{ .Version }}`
508514
- `docker pull {{ .Env.DOCKER_REPO }}armada-lookout-ingester-v2:latest`
515+
- `docker pull {{ .Env.DOCKER_REPO }}armada-lookout-ingester:{{ .Version }}`
516+
- `docker pull {{ .Env.DOCKER_REPO }}armada-lookout-ingester:latest`
509517
#### Armada Event Ingester
510518
- `docker pull {{ .Env.DOCKER_REPO }}armada-event-ingester:{{ .Version }}`
511519
- `docker pull {{ .Env.DOCKER_REPO }}armada-event-ingester:latest`

‎.mergify.yml‎

Lines changed: 2 additions & 2 deletions
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|geaere|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|EnricoMi)$"
1313
title:
14-
Two are checks required.
14+
Two approvals required, or one if author is a maintainer.

‎.run/Armada.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration default="false" name="Armada" type="CompoundRunConfigurationType">
33
<toRun name="Event Ingester" type="GoApplicationRunConfiguration" />
44
<toRun name="Executor" type="GoApplicationRunConfiguration" />
5-
<toRun name="Lookout Ingester V2" type="GoApplicationRunConfiguration" />
5+
<toRun name="Lookout Ingester" type="GoApplicationRunConfiguration" />
66
<toRun name="Lookout" type="GoApplicationRunConfiguration" />
77
<toRun name="Scheduler" type="GoApplicationRunConfiguration" />
88
<toRun name="Scheduler Ingester" type="GoApplicationRunConfiguration" />

.run/Lookout Ingester V2.run.xml renamed to .run/Lookout Ingester.run.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Lookout Ingester V2" type="GoApplicationRunConfiguration" factoryName="Go Application">
2+
<configuration default="false" name="Lookout Ingester" type="GoApplicationRunConfiguration" factoryName="Go Application">
33
<module name="armada" />
44
<working_directory value="$PROJECT_DIR$" />
55
<envs>
@@ -12,7 +12,7 @@
1212
<kind value="FILE" />
1313
<package value="$PROJECT_DIR$/cmd/lookout/main.go" />
1414
<directory value="$PROJECT_DIR$" />
15-
<filePath value="$PROJECT_DIR$/cmd/lookoutingesterv2/main.go" />
15+
<filePath value="$PROJECT_DIR$/cmd/lookoutingester/main.go" />
1616
<method v="2" />
1717
</configuration>
1818
</component>

‎build/bundles/full/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
2323
USER armada
2424
COPY --from=NODE /lookoutui/build/ /app/internal/lookoutui/build
2525

26-
COPY server executor binoculars eventingester lookoutingesterv2 lookout scheduler scheduleringester armadactl /app/
26+
COPY server executor binoculars eventingester lookoutingester lookout scheduler scheduleringester armadactl /app/
2727
COPY config/ /app/config/
2828

2929
WORKDIR /app

‎build/bundles/lookout/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ USER armada
1111
# Logging (shared between both components)
1212
COPY config/logging.yaml /app/config/logging.yaml
1313

14-
COPY config/lookoutingesterv2/config.yaml /app/config/lookoutingesterv2/config.yaml
14+
COPY config/lookoutingester/config.yaml /app/config/lookoutingester/config.yaml
1515

1616
COPY config/lookout/config.yaml /app/config/lookout/config.yaml
1717

18-
COPY lookoutingesterv2 lookout /app/
18+
COPY lookoutingester lookout /app/
1919

2020
WORKDIR /app

‎build/lookout/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ RUN yarn build
1818

1919
FROM ${BASE_IMAGE}
2020
RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
21-
LABEL org.opencontainers.image.title=lookoutv2
22-
LABEL org.opencontainers.image.description="Lookout V2"
23-
LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/lookoutv2
21+
LABEL org.opencontainers.image.title=lookout
22+
LABEL org.opencontainers.image.description="Lookout"
23+
LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/lookout
2424
USER armada
2525
COPY --from=NODE /lookoutui/build/ /app/internal/lookoutui/build
2626
COPY lookout /app/
2727
COPY config/lookout/config.yaml /app/config/lookout/config.yaml
28-
COPY lookoutingesterv2 /app/
29-
COPY config/lookoutingesterv2/ /app/config/lookoutingesterv2
28+
COPY lookoutingester /app/
29+
COPY config/lookoutingester/ /app/config/lookoutingester
3030
COPY config/logging.yaml /app/config/logging.yaml
3131
WORKDIR /app
3232
ENTRYPOINT ["./lookout"]

‎build/lookoutingester/Dockerfile‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
ARG BASE_IMAGE=alpine:3.21.0
2+
3+
FROM ${BASE_IMAGE}
4+
LABEL org.opencontainers.image.title=lookoutingester
5+
LABEL org.opencontainers.image.description="Lookout Ingester"
6+
LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/lookoutingester
7+
8+
RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
9+
USER armada
10+
11+
COPY lookoutingester /app/
12+
COPY config/lookoutingester/config.yaml /app/config/lookoutingester/config.yaml
13+
COPY config/logging.yaml /app/config/logging.yaml
14+
15+
WORKDIR /app
16+
17+
ENTRYPOINT ["./lookoutingester"]

‎build/lookoutingesterv2/Dockerfile‎

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

0 commit comments

Comments
 (0)