Merge branch 'master' into scheduler-tests-internaltypes-resourcelist

armadaproject · Jan 3, 2025 · f43508a · f43508a
2 parents b00d603 + df5401c
commit f43508a
Show file tree

Hide file tree

Showing 50 changed files with 565 additions and 477 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -186,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.20.3
+      - --label=org.opencontainers.image.base.name=alpine:3.21.0
       - --label=org.opencontainers.image.licenses=Apache-2.0
       - --label=org.opencontainers.image.vendor=G-Research
     ids:

diff --git a/build/armada-load-tester/Dockerfile b/build/armada-load-tester/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20.3
+FROM alpine:3.21.0
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

diff --git a/build/armadactl/Dockerfile b/build/armadactl/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 FROM ${BASE_IMAGE}
 
 LABEL org.opencontainers.image.title=armadactl

diff --git a/build/binoculars/Dockerfile b/build/binoculars/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=binoculars
 LABEL org.opencontainers.image.description="binoculars"

diff --git a/build/bundles/armada/Dockerfile b/build/bundles/armada/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=armada
 LABEL org.opencontainers.image.description="Armada Bundle"

diff --git a/build/bundles/full/Dockerfile b/build/bundles/full/Dockerfile
@@ -1,6 +1,6 @@
 ARG NODE_BUILD_IMAGE=node:22.12-bullseye
 ARG OPENAPI_BUILD_IMAGE=openapitools/openapi-generator-cli:v5.4.0
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 
 FROM ${OPENAPI_BUILD_IMAGE} AS OPENAPI
 LABEL org.opencontainers.image.title=armada-full-bundle

diff --git a/build/bundles/lookout/Dockerfile b/build/bundles/lookout/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=armada-lookout-bundle

diff --git a/build/eventingester/Dockerfile b/build/eventingester/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=eventingester

diff --git a/build/executor/Dockerfile b/build/executor/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=executor

diff --git a/build/fakeexecutor/Dockerfile b/build/fakeexecutor/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=fakeexecutor
 LABEL org.opencontainers.image.description="Fake Executor"

diff --git a/build/loadtester/Dockerfile b/build/loadtester/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=loadtester

diff --git a/build/lookoutingesterv2/Dockerfile b/build/lookoutingesterv2/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=lookoutingesterv2

diff --git a/build/lookoutv2/Dockerfile b/build/lookoutv2/Dockerfile
@@ -1,6 +1,6 @@
 ARG NODE_BUILD_IMAGE=node:22.12-bullseye
 ARG OPENAPI_BUILD_IMAGE=openapitools/openapi-generator-cli:v5.4.0
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 
 FROM ${OPENAPI_BUILD_IMAGE} AS OPENAPI
 

diff --git a/build/scheduler/Dockerfile b/build/scheduler/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=scheduler

diff --git a/build/scheduleringester/Dockerfile b/build/scheduleringester/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=scheduleringester

diff --git a/build/server/Dockerfile b/build/server/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=armada-server

diff --git a/build/testsuite/Dockerfile b/build/testsuite/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.20.3
+ARG BASE_IMAGE=alpine:3.21.0
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=testsuite
 LABEL org.opencontainers.image.description="Test Suite"

diff --git a/cmd/armada-load-tester/cmd/loadtest.go b/cmd/armada-load-tester/cmd/loadtest.go
@@ -52,7 +52,7 @@ var loadtestCmd = &cobra.Command{
 			  containers:
 				- name: sleep
 				  imagePullPolicy: IfNotPresent
-				  image: alpine:3.20.3
+				  image: alpine:3.21.0
 				  command:
 					- sh
 				  args:

diff --git a/e2e/armadactl_test/armadactl_test.go b/e2e/armadactl_test/armadactl_test.go
@@ -175,7 +175,7 @@ jobs:
       containers:
         - name: ls
           imagePullPolicy: IfNotPresent
-          image: alpine:3.20.3
+          image: alpine:3.21.0
           command:
             - sh
             - -c

diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ toolchain go1.23.1
 replace github.com/AthenZ/athenz v1.10.39 => github.com/AthenZ/athenz v1.10.4
 
 require (
-	github.com/apache/pulsar-client-go v0.11.0
+	github.com/apache/pulsar-client-go v0.14.0
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/go-openapi/analysis v0.22.2
 	github.com/go-openapi/jsonreference v0.20.4
@@ -71,7 +71,6 @@ require (
 	github.com/go-openapi/validate v0.22.6
 	github.com/go-playground/validator/v10 v10.15.4
 	github.com/gogo/status v1.1.1
-	github.com/golang/mock v1.6.0
 	github.com/goreleaser/goreleaser v1.24.0
 	github.com/jackc/pgx/v5 v5.5.4
 	github.com/jessevdk/go-flags v1.5.0
@@ -83,6 +82,7 @@ require (
 	github.com/redis/go-redis/v9 v9.7.0
 	github.com/segmentio/fasthash v1.0.3
 	github.com/xitongsys/parquet-go v1.6.2
+	go.uber.org/mock v0.5.0
 	golang.org/x/term v0.25.0
 	golang.org/x/time v0.5.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142
@@ -129,8 +129,8 @@ require (
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a // indirect
-	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang/snappy v0.0.3 // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/btree v1.0.1 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
@@ -140,6 +140,7 @@ require (
 	github.com/gorilla/css v1.0.0 // indirect
 	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
 	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
+	github.com/hamba/avro/v2 v2.22.2-0.20240625062549-66aad10411d9 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
@@ -156,7 +157,6 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
-	github.com/linkedin/goavro/v2 v2.9.8 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect