Skip to content

Commit cd140a6

Browse files
authored
Remove Lookout V1 from armada-operator (#293)
Also, correct some outdated goreleaser usage options, update many image versions with recent Armada images from Docker Hub. Signed-off-by: Rich Scott <richscott@sent.com>
1 parent a596f28 commit cd140a6

17 files changed

+31
-325
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ run-no-webhook: manifests generate fmt vet ## Run a controller from your host wi
120120
# Go Release Build
121121
.PHONY: go-release-build
122122
go-release-build: goreleaser
123-
$(GORELEASER) release --skip-publish --skip-sign --skip-sbom --clean --snapshot
123+
$(GORELEASER) release --skip=publish --skip=sign --skip=sbom --clean --snapshot
124124
# If you wish built the manager image targeting other platforms you can use the --platform flag.
125125
# (i.e. docker build --platform linux/arm64 ). However, you must enable docker buildKit for it.
126126
# More info: https://docs.docker.com/develop/develop-images/build_enhancements/
@@ -321,6 +321,7 @@ endif
321321
create-dev-cluster:
322322
kind create cluster --name $(KIND_DEV_CLUSTER_NAME) --config hack/kind-config.yaml
323323
kubectl create namespace armada
324+
kubectl create namespace data
324325

325326
# Setup dependencies for a local development environment
326327
.PHONY: dev-setup

charts/armada-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ controllerManager:
1212
- ALL
1313
image:
1414
repository: gcr.io/kubebuilder/kube-rbac-proxy
15-
tag: v0.13.0
15+
tag: 0.13.0
1616
resources:
1717
limits:
1818
cpu: 500m

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
44
kind: Kustomization
55
images:
66
- name: controller
7-
newName: gresearch/armada-operator
7+
newName: armada-operator
88
newTag: latest

config/samples/deploy_armada.yaml

Lines changed: 7 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spec:
1212
replicas: 1
1313
image:
1414
repository: gresearch/armada-server
15-
tag: b292be39d6f960fcf20a8de26657ce79019abef5
15+
tag: 0.3.103
1616
applicationConfig:
1717
server: localhost:50051
1818
forceNoTls: true
@@ -105,7 +105,7 @@ spec:
105105
replicas: 1
106106
image:
107107
repository: gresearch/armada-event-ingester
108-
tag: b292be39d6f960fcf20a8de26657ce79019abef5
108+
tag: 0.3.103
109109
applicationConfig:
110110
redis:
111111
addrs:
@@ -129,116 +129,6 @@ spec:
129129
---
130130
apiVersion: install.armadaproject.io/v1alpha1
131131
kind: Lookout
132-
metadata:
133-
name: lookout-sample
134-
namespace: armada
135-
spec:
136-
ingress:
137-
ingressClass: "nginx"
138-
labels:
139-
hello: "world"
140-
annotations:
141-
hello: "world2"
142-
clusterIssuer: "k8s-cluster-issuer"
143-
hostNames: [localhost-lookout]
144-
replicas: 2
145-
image:
146-
repository: gresearch/armada-lookout
147-
tag: b292be39d6f960fcf20a8de26657ce79019abef5
148-
resources:
149-
limits:
150-
memory: 1Gi
151-
cpu: "0.5"
152-
requests:
153-
memory: 500Mi
154-
cpu: "0.3"
155-
156-
environment:
157-
- name: LOG_FORMAT
158-
value: json
159-
160-
prometheus:
161-
enabled: false
162-
labels:
163-
metrics: "true"
164-
prometheus: armada
165-
role: prometheus-rulefiles
166-
167-
applicationConfig:
168-
# See https://github.com/armadaproject/armada/blob/master/config/lookout/config.yaml
169-
# for the full list of configuration options.
170-
# See https://github.com/armadaproject/armada/blob/master/config/lookout/config.yaml
171-
# for the full list of configuration options.
172-
grpcPort: 50059
173-
httpPort: 8080
174-
metricsPort: 9000
175-
grpc:
176-
keepaliveParams:
177-
maxConnectionIdle: 5m
178-
time: 2h
179-
timeout: 20s
180-
keepaliveEnforcementPolicy:
181-
minTime: 5m
182-
permitWithoutStream: false
183-
uiConfig:
184-
armadaApiBaseUrl: "http://localhost:8080"
185-
userAnnotationPrefix: "armadaproject.io/"
186-
binocularsEnabled: true
187-
binocularsBaseUrlPattern: "http://localhost:8082"
188-
overviewAutoRefreshMs: 15000
189-
jobSetsAutoRefreshMs: 15000
190-
jobsAutoRefreshMs: 30000
191-
lookoutV2ApiBaseUrl: "http://localhost:10000"
192-
postgres:
193-
maxOpenConns: 100
194-
maxIdleConns: 25
195-
connMaxLifetime: 30m
196-
connection:
197-
host: postgresql.armada.svc.cluster.local
198-
port: 5432
199-
user: postgres
200-
password: psw
201-
dbname: lookout
202-
sslmode: disable
203-
---
204-
apiVersion: install.armadaproject.io/v1alpha1
205-
kind: LookoutIngester
206-
metadata:
207-
namespace: armada
208-
name: lookoutingester-sample
209-
spec:
210-
image:
211-
repository: gresearch/armada-lookout-ingester
212-
tag: b292be39d6f960fcf20a8de26657ce79019abef5
213-
applicationConfig:
214-
postgres:
215-
maxOpenConns: 100
216-
maxIdleConns: 25
217-
connMaxLifetime: 30m
218-
connection:
219-
host: postgresql.armada.svc.cluster.local
220-
port: 5432
221-
user: postgres
222-
password: psw
223-
dbname: lookout
224-
sslmode: disable
225-
metrics:
226-
port: 9000
227-
pulsar:
228-
enabled: true
229-
URL: "pulsar://pulsar-broker.armada.svc.cluster.local:6650"
230-
jobsetEventsTopic: "events"
231-
receiveTimeout: 5s
232-
backoffTime: 1s
233-
paralellism: 1
234-
subscriptionName: "lookout-ingester"
235-
batchSize: 10000
236-
batchDuration: 500ms
237-
minJobSpecCompressionSize: 1024
238-
userAnnotationPrefix: "armadaproject.io/"
239-
---
240-
apiVersion: install.armadaproject.io/v1alpha1
241-
kind: Lookout
242132
metadata:
243133
name: lookoutv2-sample
244134
namespace: armada
@@ -254,7 +144,7 @@ spec:
254144
replicas: 2
255145
image:
256146
repository: gresearch/armada-lookout-v2
257-
tag: 2a9b6e8cef1c0a1851ec34d0808a3ecfdcc9c926
147+
tag: 0.3.103
258148
resources:
259149
limits:
260150
memory: 1Gi
@@ -304,7 +194,7 @@ metadata:
304194
spec:
305195
image:
306196
repository: gresearch/armada-lookout-ingester-v2
307-
tag: 2a9b6e8cef1c0a1851ec34d0808a3ecfdcc9c926
197+
tag: 0.3.103
308198
applicationConfig:
309199
postgres:
310200
maxOpenConns: 100
@@ -347,7 +237,7 @@ spec:
347237
replicas: 1
348238
image:
349239
repository: gresearch/armada-scheduler-ingester
350-
tag: "70a27e91003a32b90cfb8d8bfd736c65556daae9"
240+
tag: 0.3.103
351241
applicationConfig:
352242
postgres:
353243
maxOpenConns: 100
@@ -408,8 +298,8 @@ spec:
408298
hostNames: [localhost]
409299
replicas: 2
410300
image:
411-
repository: gresearchdev/armada-scheduler
412-
tag: v0.3.47
301+
repository: gresearch/armada-scheduler
302+
tag: 0.3.103
413303
resources:
414304
limits:
415305
memory: 1Gi

config/samples/deploy_executor_cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ spec:
1414
hostNames: [localhost-binoculars]
1515
replicas: 2
1616
image:
17-
tag: b292be39d6f960fcf20a8de26657ce79019abef5
1817
repository: gresearch/armada-binoculars
18+
tag: 0.3.103
1919
resources:
2020
limits:
2121
memory: 1Gi
@@ -54,7 +54,7 @@ metadata:
5454
spec:
5555
image:
5656
repository: gresearch/armada-executor
57-
tag: b292be39d6f960fcf20a8de26657ce79019abef5
57+
tag: 0.3.103
5858
applicationConfig:
5959
apiConnection:
6060
armadaUrl: armadaserver-sample.armada.svc.cluster.local:50051

config/samples/install_v1alpha1_armadaserver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
replicas: 1
2424
image:
2525
repository: gresearch/armada-server
26-
tag: f0102f1ba985a289e97e990b822d457a45a4ef73
26+
tag: 0.3.103
2727
applicationConfig:
2828
server: example.com:443
2929
prometheusRule:

config/samples/install_v1alpha1_binoculars.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ spec:
1414
hostNames: [localhost]
1515
replicas: 2
1616
image:
17-
tag: 8f1aa7314e32a071975502fc8127848369fe006a
1817
repository: gresearch/armada-binoculars
18+
tag: 0.3.103
1919
resources:
2020
limits:
2121
memory: 1Gi

config/samples/install_v1alpha1_eventingester.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spec:
77
replicas: 1
88
image:
99
repository: gresearch/armada-event-ingester
10-
tag: 6141171b8bde8a03113090a819d728511c2dc39f
10+
tag: 0.3.103
1111
applicationConfig:
1212
redis:
1313
addrs:

config/samples/install_v1alpha1_executor.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ metadata:
1111
namespace: default
1212
spec:
1313
image:
14-
repository: gresearchdev/armada-executor
15-
tag: v0.3.44
14+
repository: gresearch/armada-executor
15+
tag: 0.3.103
1616
applicationConfig:
1717
apiConnection:
1818
armadaUrl: armada.demo.armadaproject.io:443

config/samples/install_v1alpha1_lookout.yaml

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)