[pull] master from armadaproject:master

.github/workflows/airflow-operator.yml

@@ -13,10 +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-airflow-operator.sh'
       - 'scripts/build-python-client.sh'
       - 'third_party/airflow/**'
       - './magefiles/tests.go'
@@ -34,10 +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-airflow-operator.sh'
       - 'scripts/build-python-client.sh'
       - 'third_party/airflow/**'
 

.github/workflows/build.yml

@@ -32,16 +32,16 @@ jobs:
           DOCKER_BUILDX_BUILDER: "${{ steps.buildx.outputs.name }}"
 
       - name: Output full commit sha
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/patch/v')) }}
         run: echo "sha_full=$(git rev-parse HEAD)" >> $GITHUB_ENV
 
       - name: Save Docker image tarballs
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/patch/v')) }}
         run: |
           scripts/docker-save.sh -t ${{ env.sha_full }} -o /tmp/imgs
 
       - name: Save Docker image tarballs as artifacts
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/patch/v')) }}
         uses: actions/upload-artifact@v4
         with:
           name: armada-image-tarballs

.github/workflows/release-rc.yml

@@ -6,6 +6,7 @@ on:
     workflows: [CI]
     branches:
       - master
+      - patch/v*
 
 permissions:
   contents: write
@@ -30,11 +31,20 @@ jobs:
           ref='${{ github.event.workflow_run.head_branch }}'
           sha='${{ github.event.workflow_run.head_sha }}'
 
-          [ "$ref" == "master" ] &&
-          [ $(git branch --contains=$sha master | wc -l) -eq 1 ] &&
-          [ $(git rev-list --count $sha..master) -le 2 ]
+          if [[ "$ref" == "master" ]]; then
+            [ $(git branch --contains=$sha master | wc -l) -eq 1 ] &&
+            [ $(git rev-list --count $sha..master) -le 2 ]
+          elif [[ "$ref" =~ ^patch/v[0-9]+\.[0-9]+\.[0-9]+-patch[0-9]+$ ]]; then
+            [ $(git branch --contains=$sha "$ref" | wc -l) -eq 1 ] &&
+            base_tag=${ref#patch/}
+            base_tag=${base_tag%-*}
+            [ $(git rev-list --count $sha..$base_tag) -le 5 ]
+          else
+            false
+          fi
+
           if [ $? -ne 0 ]; then
-            echo "::error ::Invalid ref $ref $sha: must be a merge to master branch and not more than 2 commits away"
+            echo "::error ::Invalid ref $ref $sha: must be a merge to master branch (not more than 2 commits away) or a patch branch (not more than 5 commits away from base tag)"
             exit 1
           fi
   release:

.github/workflows/release.yml

@@ -30,13 +30,32 @@ jobs:
           ref='${{ github.event.workflow_run.head_branch }}'
           sha='${{ github.event.workflow_run.head_sha }}'
 
-          [[ $ref =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] &&
-          [ $(git tag --points-at $sha | grep -E "^$ref\$" | wc -l) -eq 1 ] &&
-          [ $(git branch --contains=$sha master | wc -l) -eq 1 ]
-          if [ $? -ne 0 ]; then
-            echo "::error ::Invalid ref $ref $sha: must be a tag, belong to the master branch and match the semver regex"
+          echo "Validating ref: $ref, sha: $sha"
+
+          # Check if it's a valid tag format
+          if [[ ! $ref =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-patch[0-9]+)?$ ]]; then
+            echo "::error::Invalid tag format: $ref"
+            exit 1
+          fi
+
+          # Check if the tag points to the current SHA
+          if [ $(git tag --points-at $sha | grep -E "^$ref\$" | wc -l) -ne 1 ]; then
+            echo "::error::Tag $ref does not point to the current SHA $sha"
+            exit 1
+          fi
+
+          # Fetch all branches to ensure we have the necessary information
+          git fetch --all
+
+          # Check if it's from master branch or a patch branch
+          if [ $(git branch -r --contains=$sha | grep -E "origin/(master|patch/v[0-9]+\.[0-9]+\.[0-9]+-patch[0-9]+)$" | wc -l) -eq 0 ]; then
+            echo "::error::$sha is not in master or any patch branch"
+            echo "Branches containing this SHA:"
+            git branch -r --contains=$sha
             exit 1
           fi
+
+          echo "Validation successful"
   release:
     name: "Release"
     needs: validate
@@ -76,7 +95,22 @@ jobs:
         run: |
           current_tag='${{ github.event.workflow_run.head_branch }}'
           echo "GORELEASER_CURRENT_TAG=$current_tag" >> $GITHUB_ENV
-          previous_tag=$(git -c 'versionsort.suffix=-rc' tag --list --sort=version:refname | grep -Eo '^v[0-9]{1,}.[0-9]{1,}.[0-9]{1,}$' | tail -n 2 | head -n 1)
+
+          # Function to extract base version
+          get_base_version() {
+            echo "$1" | sed -E 's/^v?([0-9]+\.[0-9]+\.[0-9]+).*$/\1/'
+          }
+
+          # Check if current tag is a patch release
+          if [[ $current_tag =~ ^v?[0-9]+\.[0-9]+\.[0-9]+-patch[0-9]+$ ]]; then
+            # For patch releases, find the previous patch or the base version
+            base_version=$(get_base_version "$current_tag")
+            previous_tag=$(git tag --list "v${base_version}*" --sort=-v:refname | grep -v "$current_tag" | head -n1)
+          else
+            # For master releases, find the previous master release
+            previous_tag=$(git tag --list 'v*' --sort=-v:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | grep -v "$current_tag" | head -n1)
+          fi
+
           echo "GORELEASER_PREVIOUS_TAG=$previous_tag" >> $GITHUB_ENV
 
       - name: Run GoReleaser

.gitignore

@@ -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

.goreleaser.yml

@@ -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
@@ -195,7 +186,7 @@ dockers:
       - --label=org.opencontainers.image.version={{ .Version }}
       - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
       - --label=org.opencontainers.image.revision={{ .FullCommit }}
-      - --label=org.opencontainers.image.base.name=alpine:3.18.3
+      - --label=org.opencontainers.image.base.name=alpine:3.20.1
       - --label=org.opencontainers.image.licenses=Apache-2.0
       - --label=org.opencontainers.image.vendor=G-Research
     ids:
@@ -246,7 +237,6 @@ dockers:
       - executor
       - binoculars
       - eventingester
-      - jobservice
       - armadactl
       - scheduler
       - scheduleringester
@@ -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
@@ -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
@@ -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`

.mergify.yml

@@ -9,6 +9,6 @@ pull_request_rules:
           - "#approved-reviews-by>=2"
           - and: 
             - "#approved-reviews-by>=1"
-            - "author~=^(d80tb7|dave[-]gantenbein|dejanzele|JamesMurkin|msumner91|masipauskas|mijovicmia|MustafaI|zuqq|richscott|robertdavidsmith|samclark)"
+            - "author~=^(d80tb7|dave[-]gantenbein|dejanzele|JamesMurkin|msumner91|masipauskas|mijovicmia|MustafaI|zuqq|richscott|robertdavidsmith|samclark|suprjinx)"
         title:
           Two are checks required.

MAINTAINERS.md

@@ -16,6 +16,7 @@
 | Rich Scott           | [richscott](https://github.com/richscott)               | G-Research  |
 | Robert Smith         | [robertdavidsmith](https://github.com/robertdavidsmith) | G-Research  |
 | Sam Clark            | [samclark](https://github.com/samclark)                 | G-Research  |
+| Geoffrey Wilson      | [suprjinx](https://github.com/suprjinx)                 | G-Research  |
 
 ## Past
 
@@ -26,6 +27,5 @@
 | Carlo Camurri        | [carlocamurri](https://github.com/carlocamurri)         | G-Research  |
 | Clifton Houck        | [ClifHouck](https://github.com/ClifHouck)               | G-Research  |
 | Daniel Rastelli      | [theAntiYeti](https://github.com/theAntiYeti)           | G-Research  |
-| Geoffrey Wilson      | [suprjinx](https://github.com/suprjinx)                 | G-Research  |
 | Jamie Poole          | [jimbobby5](https://github.com/jimbobby5)               | G-Research  |
 | Kevin Hannon         | [kannon92](https://github.com/kannon92)                 | G-Research  |

README.md

@@ -1,10 +1,12 @@
 <div align="center">
-<img src="./logo.svg" width="200"/>
-
-<p><a href="https://circleci.com/gh/armadaproject/armada"><img src="https://circleci.com/gh/helm/helm.svg?style=shield" alt="CircleCI"></a>
-<a href="https://goreportcard.com/report/github.com/armadaproject/armada"><img src="https://goreportcard.com/badge/github.com/armadaproject/armada" alt="Go Report Card"></a>
-<a href="https://insights.lfx.linuxfoundation.org/foundation/cncf/overview?project=armada" title="Click to view project insights and health checks"><img src="https://img.shields.io/badge/LFX%20Insights-0094FF" alt="LFX Insights Dashboard"></a>
-</p></div>
+ <img src="./logo.svg" alt="Armada logo" width="200"/>
+ <p>
+  <a href="https://circleci.com/gh/armadaproject/armada"><img src="https://circleci.com/gh/helm/helm.svg?style=shield" alt="CircleCI"></a>
+  <a href="https://goreportcard.com/report/github.com/armadaproject/armada"><img src="https://goreportcard.com/badge/github.com/armadaproject/armada" alt="Go Report Card"></a>
+  <a href="https://artifacthub.io/packages/helm/gresearch/armada" title="Go to Artifact Hub"><img src="https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/armada" alt="Artifact Hub"></a>        
+  <a href="https://insights.lfx.linuxfoundation.org/foundation/cncf/overview?project=armada" title="Click to view project insights and health checks"><img src="https://img.shields.io/badge/LFX%20Insights-0094FF" alt="LFX Insights Dashboard"></a>
+ </p>
+</div>
 
 # Armada
 

build/airflow-operator/Dockerfile

@@ -1,5 +1,5 @@
 ARG PLATFORM=x86_64
-ARG BASE_IMAGE=python:3.8.18-bookworm
+ARG BASE_IMAGE=python:3.10.14-bookworm
 FROM --platform=$PLATFORM ${BASE_IMAGE}
 
 RUN mkdir /proto

build/armada-load-tester/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.3
+FROM alpine:3.20.1
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

build/armada/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.3
+FROM alpine:3.20.1
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

build/armadactl/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.3
+FROM alpine:3.20.1
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

build/binoculars/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.3
+FROM alpine:3.20.1
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

build/eventingester/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.3
+FROM alpine:3.20.1
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

build/executor/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.3
+FROM alpine:3.20.1
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

build/fakeexecutor/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.3
+FROM alpine:3.20.1
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

build/lookoutingesterv2/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.3
+FROM alpine:3.20.1
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

build/lookoutv2/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.3
+FROM alpine:3.20.1
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

build/scheduler/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.3
+FROM alpine:3.20.1
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

build/scheduleringester/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.3
+FROM alpine:3.20.1
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

build/testsuite/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.3
+FROM alpine:3.20.1
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

build_goreleaser/armadactl/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.18.3
+ARG BASE_IMAGE=alpine:3.20.1
 FROM ${BASE_IMAGE}
 
 LABEL org.opencontainers.image.title=armadactl

build_goreleaser/binoculars/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.18.3
+ARG BASE_IMAGE=alpine:3.20.1
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=binoculars
 LABEL org.opencontainers.image.description="binoculars"

build_goreleaser/bundles/armada/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.18.3
+ARG BASE_IMAGE=alpine:3.20.1
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=armada
 LABEL org.opencontainers.image.description="Armada Bundle"

build_goreleaser/bundles/full/Dockerfile

@@ -1,6 +1,6 @@
 ARG NODE_BUILD_IMAGE=node:16.14-buster
 ARG OPENAPI_BUILD_IMAGE=openapitools/openapi-generator-cli:v5.4.0
-ARG BASE_IMAGE=alpine:3.18.3
+ARG BASE_IMAGE=alpine:3.20.1
 
 FROM ${OPENAPI_BUILD_IMAGE} AS OPENAPI
 LABEL org.opencontainers.image.title=armada-full-bundle
@@ -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

build_goreleaser/bundles/lookout/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.18.3
+ARG BASE_IMAGE=alpine:3.20.1
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=armada-lookout-bundle