Reconcile config (#2002)

* Add gresearch org to images built with goreleaser

* Use standard ports for binoculars

* Remove values from chart

* Refactor magefile

* Add worker bundle helm chart

* Add server bundle chart

* Refactor

* Update

* Update

* Use standard nats port

* Use standard nats port

* Use K8s 1.24 in Kind

* Update charts

* Build ingesters into lookout images

* Add .goattributes

* Normalize all the line endings

* Add to docs that protoc must be installed

* Reconcile config

* Update charts

* Remove annoying printline

* Remove charts

* Whitespace

* Lint

* go mod tidy

.gitattributes

@@ -0,0 +1,9 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Declare files that will always have LF line endings on checkout.
+*.sh text eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary

.gitignore

@@ -23,6 +23,12 @@ proto
 protoc
 protoc.zip
 
+# Helm
+charts/armada-server-bundle/charts/postgresql-*.tgz
+charts/armada-server-bundle/charts/pulsar-*.tgz
+charts/armada-server-bundle/charts/redis-ha-*.tgz
+charts/armada-server-bundle/charts/stan-*.tgz
+
 # Binaries for programs and plugins
 *.exe
 *.exe~

.goreleaser.yml

@@ -130,7 +130,7 @@ sboms:
 env:
   # If set, BASE_IMAGE determines the base image used for all containers.
   - BASE_IMAGE_ARG={{ if index .Env "BASE_IMAGE"  }}BASE_IMAGE={{ .Env.BASE_IMAGE }}{{ else }}{{ end }}
-  - DOCKER_REPO={{ if index .Env "DOCKER_REPO"  }}{{ .Env.DOCKER_REPO }}/{{ else }}{{ end }}
+  - DOCKER_REPO={{ if index .Env "DOCKER_REPO"  }}{{ .Env.DOCKER_REPO }}/{{ else }}gresearch/{{ end }}
   # Goreleaser always uses the docker buildx builder with name "default"; see
   # https://github.com/goreleaser/goreleaser/pull/3199
   # To use a builder other than "default", set this variable.
@@ -316,12 +316,14 @@ dockers:
       - --label=org.opencontainers.image.vendor=G-Research
     ids:
       - lookout
+      - lookoutingester
     extra_files:
       - internal\lookout\ui
       - pkg/api/api.swagger.json
       - pkg/api/lookout/api.swagger.json
       - pkg/api/binoculars/api.swagger.json
       - config/lookout/config.yaml
+      - config/lookoutingester/config.yaml
     dockerfile: ./build_goreleaser/lookout/Dockerfile
   - id: lookoutv2
     use: buildx
@@ -348,8 +350,10 @@ dockers:
       - --label=org.opencontainers.image.vendor=G-Research
     ids:
       - lookoutv2
+      - lookoutingesterv2
     extra_files:
       - config/lookoutv2/config.yaml
+      - config/lookoutingesterv2/config.yaml
     dockerfile: ./build_goreleaser/lookoutv2/Dockerfile
   - id: eventingester
     use: buildx

build_goreleaser/lookout/Dockerfile

@@ -21,5 +21,7 @@ USER armada
 COPY --from=NODE /ui/build/ /app/internal/lookout/ui/build
 COPY lookout /app/
 COPY config/lookout/ /app/config/lookout
+COPY lookoutingester /app/
+COPY config/lookoutingester/ /app/config/lookoutingester
 WORKDIR /app
 ENTRYPOINT ["./lookout"]

build_goreleaser/lookoutv2/Dockerfile

@@ -1,12 +1,10 @@
 ARG BASE_IMAGE=alpine:3.17.0
 FROM ${BASE_IMAGE}
-
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 USER armada
-
 COPY lookoutv2 /app/
 COPY config/lookoutv2/config.yaml /app/config/lookoutv2/config.yaml
-
+COPY lookoutingesterv2 /app/
+COPY config/lookoutingesterv2/ /app/config/lookoutingesterv2
 WORKDIR /app
-
 ENTRYPOINT ["./lookoutv2"]

config/armada/config.yaml

@@ -120,8 +120,8 @@ eventsNats:
   subject: "ArmadaTest"
   timeout: 10s
   servers:
-    - "nats://localhost:4223"
-    - "nats://stan:4223"
+    - "nats://localhost:4222"
+    - "nats://stan:4222"
 databaseRetention:
   jobRetentionDuration: 168h
 eventRetention:

config/binoculars/config.yaml

@@ -1,9 +1,9 @@
-grpcPort: 50052
-httpPort: 8082
-metricsPort: 9002
+grpcPort: 50051
+httpPort: 8080
+metricsPort: 9000
 corsAllowedOrigins: 
   - http://localhost:3000
-  - http://localhost:8089
+  - http://localhost:8080
 auth:
   basicAuth:
     enableAuthentication: false
@@ -19,4 +19,4 @@ grpc:
     timeout: 20s
   keepaliveEnforcementPolicy:
     minTime: 5m
-    permitWithoutStream: false
+    permitWithoutStream: false

config/lookout/config.yaml

@@ -1,7 +1,6 @@
 grpcPort: 50059
-httpPort: 8089
-metricsPort: 9009
-
+httpPort: 8080
+metricsPort: 9000
 grpc:
   keepaliveParams:
     maxConnectionIdle: 5m
@@ -10,36 +9,27 @@ grpc:
   keepaliveEnforcementPolicy:
     minTime: 5m
     permitWithoutStream: false
-
 uiConfig:
-  armadaApiBaseUrl: "http://localhost:8080"
+  armadaApiBaseUrl: "http://armada-server:8080"
   userAnnotationPrefix: "armadaproject.io/"
   binocularsEnabled: true
-  binocularsBaseUrlPattern: "http://localhost:8082" # {CLUSTER_ID} gets replaced by appropriate cluster id
+  binocularsBaseUrlPattern: "http://armada-binoculars:8080"
   overviewAutoRefreshMs: 15000
   jobSetsAutoRefreshMs: 15000
   jobsAutoRefreshMs: 30000
-  lookoutV2ApiBaseUrl: "http://localhost:10000"
-
+  lookoutV2ApiBaseUrl: "http://armada-lookout-v2:10000"
 postgres:
   maxOpenConns: 100
   maxIdleConns: 25
   connMaxLifetime: 30m
   connection:
-    host: localhost
+    host: postgres
     port: 5432
     user: postgres
     password: psw
     dbname: postgres
     sslmode: disable
-
-eventQueue: "ArmadaLookoutEventProcessor"
-nats:
-  Servers:
-    - "nats://localhost:4223"
-  ClusterID: "test-cluster"
-  Subject: "ArmadaTest"
-
+disableEventProcessing: true
 prunerConfig:
   daysToKeep: 42
   batchSize: 1000

config/lookoutingester/config.yaml

@@ -3,23 +3,20 @@ postgres:
   maxIdleConns: 25
   connMaxLifetime: 30m
   connection:
-    host: localhost
+    host: postgres
     port: 5432
     user: postgres
     password: psw
     dbname: postgres
     sslmode: disable
-
 metrics:
-  port: 9003
-
+  port: 9000
 pulsar:
   enabled: true
-  URL: "pulsar://localhost:6650"
+  URL: "pulsar://pulsar:6650"
   jobsetEventsTopic: "events"
   receiveTimeout: 5s
   backoffTime: 1s
-
 paralellism: 1
 subscriptionName: "lookout-ingester"
 batchSize: 10000

config/lookoutingesterv2/config.yaml

@@ -3,23 +3,20 @@ postgres:
   maxIdleConns: 25
   connMaxLifetime: 30m
   connection:
-    host: localhost
+    host: postgres
     port: 5433
     user: postgres
     password: psw
     dbname: postgres
     sslmode: disable
-
 metrics:
-  port: 9004
-
+  port: 9000
 pulsar:
   enabled: true
-  URL: "pulsar://localhost:6650"
-  jobsetEventsTopic: "persistent://armada/armada/events"
+  URL: "pulsar://pulsar:6650"
+  jobsetEventsTopic: "events"
   receiveTimeout: 5s
   backoffTime: 1s
-
 subscriptionName: "lookout-ingester-v2"
 batchSize: 10000
 batchDuration: 500ms

config/lookoutv2/config.yaml

@@ -3,13 +3,12 @@ corsAllowedOrigins:
   - "http://localhost:3000"
   - "http://localhost:8089"
   - "http://localhost:10000"
-
 postgres:
   maxOpenConns: 100
   maxIdleConns: 25
   connMaxLifetime: 30m
   connection:
-    host: localhost
+    host: postgres
     port: 5433
     user: postgres
     password: psw

deployment/executor/Chart.yaml

@@ -3,11 +3,3 @@ description: A helm chart for armada-executor component
 name: armada-executor
 version: LATEST
 appVersion: LATEST
-
-priorityClasses:
-  - name: armada-default
-    value: 1000
-    description: "Default priority class for pods created by Armada."
-  - name: armada-preemptible
-    value: 900
-    description: "Priority class to be used for preemptible jobs."

docker-compose.yaml

@@ -42,9 +42,9 @@ services:
   stan:
     container_name: stan
     image: nats-streaming
-    command: "-p 4223 -m 8223"
+    command: "-p 4222 -m 8223"
     ports:
-      - 4223:4223
+      - 4222:4222
       - 8223:8223
     networks:
       - kind
@@ -54,7 +54,7 @@ services:
   #
   server:
     container_name: server
-    image: ${ARMADA_IMAGE:-armada}:${ARMADA_IMAGE_TAG:-latest}
+    image: ${ARMADA_IMAGE:-gresearch/armada}:${ARMADA_IMAGE_TAG:-latest}
     networks:
       - kind
     ports:
@@ -67,14 +67,12 @@ services:
       - postgres
       - pulsar
       - stan
-      - eventingester
-    working_dir: /app
-    entrypoint: ./server
-    command: --config /config/insecure-armada-auth-config.yaml
+      - eventingester      
+    command: ./server --config /config/insecure-armada-auth-config.yaml
 
   executor:
     container_name: executor
-    image: ${ARMADA_IMAGE:-armada}:${ARMADA_IMAGE_TAG:-latest}
+    image: ${ARMADA_IMAGE:-gresearch/armada}:${ARMADA_IMAGE_TAG:-latest}
     networks:
       - kind
     ports:
@@ -86,13 +84,11 @@ services:
       - ./.kube/internal:/.kube
     environment:
       - KUBECONFIG=/.kube/config
-    working_dir: /app
-    entrypoint: ./executor
-    command: --config /config/insecure-executor-config.yaml
+    command: ./executor --config /config/insecure-executor-config.yaml
 
   binoculars:
     container_name: binoculars
-    image: ${ARMADA_IMAGE:-armada}:${ARMADA_IMAGE_TAG:-latest}
+    image: ${ARMADA_IMAGE:-gresearch/armada}:${ARMADA_IMAGE_TAG:-latest}
     networks:
       - kind
     ports:
@@ -101,42 +97,36 @@ services:
       - ./.kube/internal:/.kube
     environment:
       - KUBECONFIG=/.kube/config
-    working_dir: /app
-    entrypoint: ./binoculars
+    command: ./binoculars
 
   jobservice:
     container_name: jobservice
-    image: ${ARMADA_IMAGE:-armada}:${ARMADA_IMAGE_TAG:-latest}
+    image: ${ARMADA_IMAGE:-gresearch/armada}:${ARMADA_IMAGE_TAG:-latest}
     networks:
       - kind
     ports:
       - 60003:60003
     depends_on:
       - server
-    working_dir: "/app"
-    entrypoint: ./jobservice
+    command: ./jobservice
 
   lookoutingester:
     container_name: lookoutingester
-    image: ${ARMADA_IMAGE:-armada}:${ARMADA_IMAGE_TAG:-latest}
+    image: ${ARMADA_IMAGE:-gresearch/armada}:${ARMADA_IMAGE_TAG:-latest}
     networks:
       - kind
     depends_on:
       - postgres
       - pulsar
     volumes:
       - ./localdev/config:/config
-    working_dir: /app
-    entrypoint: ./lookoutingester
-    command: --config /config/lookoutingester/config.yaml
+    command: ./lookoutingester --config /config/lookoutingester/config.yaml
 
   eventingester:
     container_name: eventingester
-    image: ${ARMADA_IMAGE:-armada}:${ARMADA_IMAGE_TAG:-latest}
+    image: ${ARMADA_IMAGE:-gresearch/armada}:${ARMADA_IMAGE_TAG:-latest}
     networks:
       - kind
     depends_on:
       - redis
-      - pulsar
-    working_dir: /app
-    entrypoint: ./eventingester
+    command: ./eventingester