Merge branch 'master' into rich/scala-funcs-test

richscott · Jan 8, 2025 · ef0ff38 · ef0ff38
2 parents d533d7d + 33f3a27
commit ef0ff38
Show file tree

Hide file tree

Showing 134 changed files with 3,177 additions and 2,515 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/deployment/armada/templates/secret.yaml → deployment/armada/templates/configmap.yaml b/deployment/armada/templates/secret.yaml → deployment/armada/templates/configmap.yaml
@@ -1,13 +1,12 @@
 apiVersion: v1
-kind: Secret
+kind: ConfigMap
 metadata:
   name: {{ include "armada.config.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "armada.labels.all" . | nindent 4 }}
-type: Opaque
 data:
   {{ include "armada.config.filename" . }}: |
 {{- if .Values.applicationConfig }}
-{{ toYaml .Values.applicationConfig | b64enc | indent 4 }}
+{{ toYaml .Values.applicationConfig | indent 4 }}
 {{- end }}
diff --git a/deployment/armada/templates/deployment.yaml b/deployment/armada/templates/deployment.yaml
@@ -18,7 +18,7 @@ spec:
     metadata:
       name: {{ include "armada.name" . }}
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
       labels:
         {{- include "armada.labels.all" . | nindent 8 }}
     spec:
@@ -131,8 +131,8 @@ spec:
                 topologyKey: kubernetes.io/hostname
       volumes:
         - name: user-config
-          secret:
-            secretName: {{ include "armada.config.name" . }}
+          configMap:
+            name: {{ include "armada.config.name" . }}
         {{- if .Values.applicationConfig.pulsar.authenticationEnabled }}
         - name: pulsar-token
           secret:

diff --git a/deployment/binoculars/templates/secret.yaml → ...yment/binoculars/templates/configmap.yaml b/deployment/binoculars/templates/secret.yaml → ...yment/binoculars/templates/configmap.yaml
@@ -1,13 +1,12 @@
 apiVersion: v1
-kind: Secret
+kind: ConfigMap
 metadata:
   name: {{ include "binoculars.config.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "binoculars.labels.all" . | nindent 4 }}
-type: Opaque
 data:
   {{ include "binoculars.config.filename" . }}: |
 {{- if .Values.applicationConfig }}
-{{ toYaml .Values.applicationConfig | b64enc | indent 4 }}
+{{ toYaml .Values.applicationConfig | indent 4 }}
 {{- end }}
diff --git a/deployment/binoculars/templates/deployment.yaml b/deployment/binoculars/templates/deployment.yaml
@@ -18,7 +18,7 @@ spec:
     metadata:
       name: {{ include "binoculars.name" . }}
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
       labels:
         {{- include "binoculars.labels.all" . | nindent 8 }}
     spec:
@@ -102,8 +102,8 @@ spec:
                 topologyKey: kubernetes.io/hostname
       volumes:
         - name: user-config
-          secret:
-            secretName: {{ include "binoculars.config.name" . }}
+          configMap:
+            name: {{ include "binoculars.config.name" . }}
         {{- if .Values.applicationConfig.grpc.tls.enabled }}
         - name: tls-certs
           secret:

diff --git a/...ment/event-ingester/templates/secret.yaml → ...t/event-ingester/templates/configmap.yaml b/...ment/event-ingester/templates/secret.yaml → ...t/event-ingester/templates/configmap.yaml
@@ -1,13 +1,12 @@
 apiVersion: v1
-kind: Secret
+kind: ConfigMap
 metadata:
   name: {{ include "event_ingester.config.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "event_ingester.labels.all" . | nindent 4 }}
-type: Opaque
 data:
   {{ include "event_ingester.config.filename" . }}: |
 {{- if .Values.applicationConfig }}
-{{ toYaml .Values.applicationConfig | b64enc | indent 4 }}
+{{ toYaml .Values.applicationConfig | indent 4 }}
 {{- end }}
diff --git a/deployment/event-ingester/templates/deployment.yaml b/deployment/event-ingester/templates/deployment.yaml
@@ -18,7 +18,7 @@ spec:
     metadata:
       name: {{ include "event_ingester.name" . }}
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
       labels:
         {{- include "event_ingester.labels.all" . | nindent 8 }}
     spec:
@@ -87,8 +87,8 @@ spec:
                 topologyKey: kubernetes.io/hostname
       volumes:
         - name: user-config
-          secret:
-            secretName: {{ include "event_ingester.config.name" . }}
+          configMap:
+            name: {{ include "event_ingester.config.name" . }}
         {{- if .Values.applicationConfig.pulsar.authenticationEnabled }}
         - name: pulsar-token
           secret:

diff --git a/deployment/executor/templates/secret.yaml → deployment/executor/templates/configmap.yaml b/deployment/executor/templates/secret.yaml → deployment/executor/templates/configmap.yaml
@@ -1,13 +1,12 @@
 apiVersion: v1
-kind: Secret
+kind: ConfigMap
 metadata:
   name: {{ include "executor.config.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "executor.labels.all" . | nindent 4 }}
-type: Opaque
 data:
   {{ include "executor.config.filename" . }}: |
-  {{- if .Values.applicationConfig }}
-  {{ toYaml .Values.applicationConfig | b64enc | indent 4 }}
-  {{- end }}
+{{- if .Values.applicationConfig }}
+{{ toYaml .Values.applicationConfig | indent 4 }}
+{{- end }}
diff --git a/deployment/executor/templates/deployment.yaml b/deployment/executor/templates/deployment.yaml
@@ -14,7 +14,7 @@ spec:
     metadata:
       name: {{ include "executor.name" . }}
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
       labels:
         {{- include "executor.labels.all" . | nindent 8 }}
     spec:
@@ -88,12 +88,10 @@ spec:
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}
-      tolerations:
-        {{- toYaml .Values.tolerations | nindent 8 }}
       volumes:
         - name: user-config
-          secret:
-            secretName: {{ include "executor.config.name" . }}
+          configMap:
+            name: {{ include "executor.config.name" . }}
         {{- if .Values.additionalVolumes }}
         {{- toYaml .Values.additionalVolumes | nindent 8 }}
         {{- end }}
diff --git a/...lookout-ingester-v2/templates/secret.yaml → ...kout-ingester-v2/templates/configmap.yaml b/...lookout-ingester-v2/templates/secret.yaml → ...kout-ingester-v2/templates/configmap.yaml
@@ -1,13 +1,12 @@
 apiVersion: v1
-kind: Secret
+kind: ConfigMap
 metadata:
   name: {{ include "lookout_ingester_v2.config.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "lookout_ingester_v2.labels.all" . | nindent 4 }}
-type: Opaque
 data:
   {{ include "lookout_ingester_v2.config.filename" . }}: |
 {{- if .Values.applicationConfig }}
-{{ toYaml .Values.applicationConfig | b64enc | indent 4 }}
+{{ toYaml .Values.applicationConfig | indent 4 }}
 {{- end }}
diff --git a/deployment/lookout-ingester-v2/templates/deployment.yaml b/deployment/lookout-ingester-v2/templates/deployment.yaml
@@ -18,7 +18,7 @@ spec:
     metadata:
       name: {{ include "lookout_ingester_v2.name" . }}
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
       labels:
         {{- include "lookout_ingester_v2.labels.all" . | nindent 8 }}
     spec:
@@ -87,8 +87,8 @@ spec:
                 topologyKey: kubernetes.io/hostname
       volumes:
         - name: user-config
-          secret:
-            secretName: {{ include "lookout_ingester_v2.config.name" . }}
+          configMap:
+            name: {{ include "lookout_ingester_v2.config.name" . }}
         {{- if .Values.applicationConfig.pulsar.authenticationEnabled }}
         - name: pulsar-token
           secret:

diff --git a/deployment/lookout-v2/templates/secret.yaml → ...out-migration-v2/templates/configmap.yaml b/deployment/lookout-v2/templates/secret.yaml → ...out-migration-v2/templates/configmap.yaml
@@ -1,13 +1,12 @@
 apiVersion: v1
-kind: Secret
+kind: ConfigMap
 metadata:
   name: {{ include "lookout_v2.config.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "lookout_v2.labels.all" . | nindent 4 }}
-type: Opaque
 data:
   {{ include "lookout_v2.config.filename" . }}: |
 {{- if .Values.applicationConfig }}
-{{ toYaml .Values.applicationConfig | b64enc | indent 4 }}
+{{ toYaml .Values.applicationConfig | indent 4 }}
 {{- end }}
diff --git a/deployment/lookout-migration-v2/templates/job.yaml b/deployment/lookout-migration-v2/templates/job.yaml
@@ -49,8 +49,8 @@ spec:
             allowPrivilegeEscalation: false
       volumes:
         - name: user-config
-          secret:
-            secretName: {{ include "lookout_v2.config.name" . }}
+          configMap:
+            name: {{ include "lookout_v2.config.name" . }}
         {{- if .Values.additionalVolumes }}
         {{- toYaml .Values.additionalVolumes | nindent 8 }}
         {{- end }}
diff --git a/...ookout-migration-v2/templates/secret.yaml → ...yment/lookout-v2/templates/configmap.yaml b/...ookout-migration-v2/templates/secret.yaml → ...yment/lookout-v2/templates/configmap.yaml
@@ -1,13 +1,12 @@
 apiVersion: v1
-kind: Secret
+kind: ConfigMap
 metadata:
   name: {{ include "lookout_v2.config.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "lookout_v2.labels.all" . | nindent 4 }}
-type: Opaque
 data:
   {{ include "lookout_v2.config.filename" . }}: |
 {{- if .Values.applicationConfig }}
-{{ toYaml .Values.applicationConfig | b64enc | indent 4 }}
+{{ toYaml .Values.applicationConfig | indent 4 }}
 {{- end }}
diff --git a/deployment/lookout-v2/templates/deployment.yaml b/deployment/lookout-v2/templates/deployment.yaml
@@ -18,7 +18,7 @@ spec:
     metadata:
       name: {{ include "lookout_v2.name" . }}
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
       labels:
         {{- include "lookout_v2.labels.all" . | nindent 8 }}
     spec:
@@ -101,8 +101,8 @@ spec:
                 topologyKey: kubernetes.io/hostname
       volumes:
         - name: user-config
-          secret:
-            secretName: {{ include "lookout_v2.config.name" . }}
+          configMap:
+            name: {{ include "lookout_v2.config.name" . }}
         {{- if .Values.applicationConfig.tls.enabled }}
         - name: tls-certs
           secret:

diff --git a/...scheduler-migration/templates/secret.yaml → ...eduler-migration/templates/configmap.yaml b/...scheduler-migration/templates/secret.yaml → ...eduler-migration/templates/configmap.yaml
@@ -1,13 +1,12 @@
 apiVersion: v1
-kind: Secret
+kind: ConfigMap
 metadata:
   name: {{ include "armada-scheduler.config.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "armada-scheduler.labels.all" . | nindent 4 }}
-type: Opaque
 data:
   {{ include "armada-scheduler.config.filename" . }}: |
 {{- if .Values.applicationConfig }}
-{{ toYaml .Values.applicationConfig | b64enc | indent 4 }}
+{{ toYaml .Values.applicationConfig | indent 4 }}
 {{- end }}
diff --git a/deployment/scheduler-migration/templates/job.yaml b/deployment/scheduler-migration/templates/job.yaml
@@ -49,8 +49,8 @@ spec:
             allowPrivilegeEscalation: false
       volumes:
         - name: user-config
-          secret:
-            secretName: {{ include "armada-scheduler.config.name" . }}
+          configMap:
+            name: {{ include "armada-scheduler.config.name" . }}
         {{- if .Values.additionalVolumes }}
         {{- toYaml .Values.additionalVolumes | nindent 8 }}
         {{- end }}