Skip to content

Commit

Permalink
[WIP] remove jobservice (#3757)
Browse files Browse the repository at this point in the history
* remove jobservice

Signed-off-by: Chris Martin <[email protected]>

* go mod tidy

Signed-off-by: Chris Martin <[email protected]>

* remove grpc pool

Signed-off-by: Chris Martin <[email protected]>

* remove json marshaller

Signed-off-by: Chris Martin <[email protected]>

* Removing remaining jobservice references

* Using built in JSON marshaller to avoid compile errors

* Go mod tidy

---------

Signed-off-by: Chris Martin <[email protected]>
Co-authored-by: Chris Martin <[email protected]>
Co-authored-by: Mustafa <[email protected]>
  • Loading branch information
3 people authored Jul 18, 2024
1 parent 03ddfb4 commit 68dcc3e
Show file tree
Hide file tree
Showing 71 changed files with 170 additions and 7,062 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/airflow-operator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ on:
- 'client/python/**'
- 'docs/python_airflow_operator.md'
- 'docs/python_armada_client.md'
- 'internal/jobservice/*'
- 'pkg/api/*.proto'
- 'pkg/api/jobservice/*.proto'
- 'scripts/build-python-client.sh'
- 'third_party/airflow/**'
- './magefiles/tests.go'
Expand All @@ -33,9 +31,7 @@ on:
- 'client/python/**'
- 'docs/python_airflow_operator.md'
- 'docs/python_armada_client.md'
- 'internal/jobservice/*'
- 'pkg/api/*.proto'
- 'pkg/api/jobservice/*.proto'
- 'scripts/build-python-client.sh'
- 'third_party/airflow/**'

Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ armadactl.yaml
loadtest.yaml
test_reports
code_reports
/jobservice
jobservice.db
jobservice.db-shm
jobservice.db-wal
/armadactl
junit.xml
docker-compose.dev.yaml
Expand Down
28 changes: 0 additions & 28 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,6 @@ builds:
- linux
goarch:
- amd64
- env: [CGO_ENABLED=0]
id: jobservice
binary: jobservice
main: ./cmd/jobservice/main.go
mod_timestamp: '{{ .CommitTimestamp }}'
goos:
- linux
goarch:
- amd64
- env: [CGO_ENABLED=0]
id: fakeexecutor
binary: fakeexecutor
Expand Down Expand Up @@ -246,7 +237,6 @@ dockers:
- executor
- binoculars
- eventingester
- jobservice
- armadactl
- scheduler
- scheduleringester
Expand All @@ -262,7 +252,6 @@ dockers:
- config/scheduleringester/config.yaml
- config/lookoutv2/config.yaml
- config/lookoutingesterv2/config.yaml
- config/jobservice/config.yaml
- internal/lookout/ui
- pkg/api/api.swagger.json
- pkg/api/binoculars/api.swagger.json
Expand Down Expand Up @@ -423,20 +412,6 @@ dockers:
- config/binoculars/config.yaml
dockerfile: ./build_goreleaser/binoculars/Dockerfile

- id: jobservice
use: buildx
goos: linux
goarch: amd64
image_templates:
- "{{ .Env.DOCKER_REPO }}armada-jobservice:latest"
- "{{ .Env.DOCKER_REPO }}armada-jobservice:{{ .Version }}"
build_flag_templates: *BUILD_FLAG_TEMPLATES
ids:
- jobservice
extra_files:
- config/jobservice/config.yaml
dockerfile: ./build_goreleaser/jobservice/Dockerfile

- id: armadactl
use: buildx
goos: linux
Expand Down Expand Up @@ -528,9 +503,6 @@ release:
#### Armada Binoculars
- `docker pull {{ .Env.DOCKER_REPO }}armada-binoculars:{{ .Version }}`
- `docker pull {{ .Env.DOCKER_REPO }}armada-binoculars:latest`
#### Armada Job Service
- `docker pull {{ .Env.DOCKER_REPO }}armada-jobservice:{{ .Version }}`
- `docker pull {{ .Env.DOCKER_REPO }}armada-jobservice:latest`
#### armadactl
- `docker pull {{ .Env.DOCKER_REPO }}armadactl:{{ .Version }}`
- `docker pull {{ .Env.DOCKER_REPO }}armadactl:latest`
Expand Down
14 changes: 0 additions & 14 deletions build/jobservice/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion build_goreleaser/bundles/full/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
USER armada
COPY --from=NODE /ui/build/ /app/internal/lookout/ui/build

COPY server executor binoculars eventingester lookoutingesterv2 lookoutv2 jobservice scheduler scheduleringester armadactl /app/
COPY server executor binoculars eventingester lookoutingesterv2 lookoutv2 scheduler scheduleringester armadactl /app/
COPY config/ /app/config/

WORKDIR /app
16 changes: 0 additions & 16 deletions build_goreleaser/jobservice/Dockerfile

This file was deleted.

2 changes: 0 additions & 2 deletions client/python/examples/general.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ def wait_for_job_event(client, event_stream, job_id: str, event_state: EventType
Wait for a job event to occur.
Will automatically return if the event is considered terminal.
A list of terminal events can be found here:
https://github.com/armadaproject/armada/blob/master/internal/jobservice/eventstojobs/event_job_response_test.go
Please note that this is shown for demonstration purposes only.
Subscribing to events like this to watch individual events like
Expand Down
25 changes: 0 additions & 25 deletions cmd/jobservice/cmd/root.go

This file was deleted.

66 changes: 0 additions & 66 deletions cmd/jobservice/cmd/run.go

This file was deleted.

16 changes: 0 additions & 16 deletions cmd/jobservice/main.go

This file was deleted.

42 changes: 0 additions & 42 deletions config/jobservice/config.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions deployment/jobservice/Chart.yaml

This file was deleted.

33 changes: 0 additions & 33 deletions deployment/jobservice/README.md

This file was deleted.

43 changes: 0 additions & 43 deletions deployment/jobservice/templates/_helpers.tpl

This file was deleted.

Loading

0 comments on commit 68dcc3e

Please sign in to comment.