Skip to content

Commit

Permalink
Remove Lookout V1 from armada-operator (#293)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
richscott authored Nov 13, 2023
1 parent a596f28 commit cd140a6
Show file tree
Hide file tree
Showing 17 changed files with 31 additions and 325 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ run-no-webhook: manifests generate fmt vet ## Run a controller from your host wi
# Go Release Build
.PHONY: go-release-build
go-release-build: goreleaser
$(GORELEASER) release --skip-publish --skip-sign --skip-sbom --clean --snapshot
$(GORELEASER) release --skip=publish --skip=sign --skip=sbom --clean --snapshot
# If you wish built the manager image targeting other platforms you can use the --platform flag.
# (i.e. docker build --platform linux/arm64 ). However, you must enable docker buildKit for it.
# More info: https://docs.docker.com/develop/develop-images/build_enhancements/
Expand Down Expand Up @@ -321,6 +321,7 @@ endif
create-dev-cluster:
kind create cluster --name $(KIND_DEV_CLUSTER_NAME) --config hack/kind-config.yaml
kubectl create namespace armada
kubectl create namespace data

# Setup dependencies for a local development environment
.PHONY: dev-setup
Expand Down
2 changes: 1 addition & 1 deletion charts/armada-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ controllerManager:
- ALL
image:
repository: gcr.io/kubebuilder/kube-rbac-proxy
tag: v0.13.0
tag: 0.13.0
resources:
limits:
cpu: 500m
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: gresearch/armada-operator
newName: armada-operator
newTag: latest
124 changes: 7 additions & 117 deletions config/samples/deploy_armada.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
replicas: 1
image:
repository: gresearch/armada-server
tag: b292be39d6f960fcf20a8de26657ce79019abef5
tag: 0.3.103
applicationConfig:
server: localhost:50051
forceNoTls: true
Expand Down Expand Up @@ -105,7 +105,7 @@ spec:
replicas: 1
image:
repository: gresearch/armada-event-ingester
tag: b292be39d6f960fcf20a8de26657ce79019abef5
tag: 0.3.103
applicationConfig:
redis:
addrs:
Expand All @@ -129,116 +129,6 @@ spec:
---
apiVersion: install.armadaproject.io/v1alpha1
kind: Lookout
metadata:
name: lookout-sample
namespace: armada
spec:
ingress:
ingressClass: "nginx"
labels:
hello: "world"
annotations:
hello: "world2"
clusterIssuer: "k8s-cluster-issuer"
hostNames: [localhost-lookout]
replicas: 2
image:
repository: gresearch/armada-lookout
tag: b292be39d6f960fcf20a8de26657ce79019abef5
resources:
limits:
memory: 1Gi
cpu: "0.5"
requests:
memory: 500Mi
cpu: "0.3"

environment:
- name: LOG_FORMAT
value: json

prometheus:
enabled: false
labels:
metrics: "true"
prometheus: armada
role: prometheus-rulefiles

applicationConfig:
# See https://github.com/armadaproject/armada/blob/master/config/lookout/config.yaml
# for the full list of configuration options.
# See https://github.com/armadaproject/armada/blob/master/config/lookout/config.yaml
# for the full list of configuration options.
grpcPort: 50059
httpPort: 8080
metricsPort: 9000
grpc:
keepaliveParams:
maxConnectionIdle: 5m
time: 2h
timeout: 20s
keepaliveEnforcementPolicy:
minTime: 5m
permitWithoutStream: false
uiConfig:
armadaApiBaseUrl: "http://localhost:8080"
userAnnotationPrefix: "armadaproject.io/"
binocularsEnabled: true
binocularsBaseUrlPattern: "http://localhost:8082"
overviewAutoRefreshMs: 15000
jobSetsAutoRefreshMs: 15000
jobsAutoRefreshMs: 30000
lookoutV2ApiBaseUrl: "http://localhost:10000"
postgres:
maxOpenConns: 100
maxIdleConns: 25
connMaxLifetime: 30m
connection:
host: postgresql.armada.svc.cluster.local
port: 5432
user: postgres
password: psw
dbname: lookout
sslmode: disable
---
apiVersion: install.armadaproject.io/v1alpha1
kind: LookoutIngester
metadata:
namespace: armada
name: lookoutingester-sample
spec:
image:
repository: gresearch/armada-lookout-ingester
tag: b292be39d6f960fcf20a8de26657ce79019abef5
applicationConfig:
postgres:
maxOpenConns: 100
maxIdleConns: 25
connMaxLifetime: 30m
connection:
host: postgresql.armada.svc.cluster.local
port: 5432
user: postgres
password: psw
dbname: lookout
sslmode: disable
metrics:
port: 9000
pulsar:
enabled: true
URL: "pulsar://pulsar-broker.armada.svc.cluster.local:6650"
jobsetEventsTopic: "events"
receiveTimeout: 5s
backoffTime: 1s
paralellism: 1
subscriptionName: "lookout-ingester"
batchSize: 10000
batchDuration: 500ms
minJobSpecCompressionSize: 1024
userAnnotationPrefix: "armadaproject.io/"
---
apiVersion: install.armadaproject.io/v1alpha1
kind: Lookout
metadata:
name: lookoutv2-sample
namespace: armada
Expand All @@ -254,7 +144,7 @@ spec:
replicas: 2
image:
repository: gresearch/armada-lookout-v2
tag: 2a9b6e8cef1c0a1851ec34d0808a3ecfdcc9c926
tag: 0.3.103
resources:
limits:
memory: 1Gi
Expand Down Expand Up @@ -304,7 +194,7 @@ metadata:
spec:
image:
repository: gresearch/armada-lookout-ingester-v2
tag: 2a9b6e8cef1c0a1851ec34d0808a3ecfdcc9c926
tag: 0.3.103
applicationConfig:
postgres:
maxOpenConns: 100
Expand Down Expand Up @@ -347,7 +237,7 @@ spec:
replicas: 1
image:
repository: gresearch/armada-scheduler-ingester
tag: "70a27e91003a32b90cfb8d8bfd736c65556daae9"
tag: 0.3.103
applicationConfig:
postgres:
maxOpenConns: 100
Expand Down Expand Up @@ -408,8 +298,8 @@ spec:
hostNames: [localhost]
replicas: 2
image:
repository: gresearchdev/armada-scheduler
tag: v0.3.47
repository: gresearch/armada-scheduler
tag: 0.3.103
resources:
limits:
memory: 1Gi
Expand Down
4 changes: 2 additions & 2 deletions config/samples/deploy_executor_cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ spec:
hostNames: [localhost-binoculars]
replicas: 2
image:
tag: b292be39d6f960fcf20a8de26657ce79019abef5
repository: gresearch/armada-binoculars
tag: 0.3.103
resources:
limits:
memory: 1Gi
Expand Down Expand Up @@ -54,7 +54,7 @@ metadata:
spec:
image:
repository: gresearch/armada-executor
tag: b292be39d6f960fcf20a8de26657ce79019abef5
tag: 0.3.103
applicationConfig:
apiConnection:
armadaUrl: armadaserver-sample.armada.svc.cluster.local:50051
Expand Down
2 changes: 1 addition & 1 deletion config/samples/install_v1alpha1_armadaserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
replicas: 1
image:
repository: gresearch/armada-server
tag: f0102f1ba985a289e97e990b822d457a45a4ef73
tag: 0.3.103
applicationConfig:
server: example.com:443
prometheusRule:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/install_v1alpha1_binoculars.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ spec:
hostNames: [localhost]
replicas: 2
image:
tag: 8f1aa7314e32a071975502fc8127848369fe006a
repository: gresearch/armada-binoculars
tag: 0.3.103
resources:
limits:
memory: 1Gi
Expand Down
2 changes: 1 addition & 1 deletion config/samples/install_v1alpha1_eventingester.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
replicas: 1
image:
repository: gresearch/armada-event-ingester
tag: 6141171b8bde8a03113090a819d728511c2dc39f
tag: 0.3.103
applicationConfig:
redis:
addrs:
Expand Down
4 changes: 2 additions & 2 deletions config/samples/install_v1alpha1_executor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ metadata:
namespace: default
spec:
image:
repository: gresearchdev/armada-executor
tag: v0.3.44
repository: gresearch/armada-executor
tag: 0.3.103
applicationConfig:
apiConnection:
armadaUrl: armada.demo.armadaproject.io:443
Expand Down
87 changes: 0 additions & 87 deletions config/samples/install_v1alpha1_lookout.yaml

This file was deleted.

41 changes: 0 additions & 41 deletions config/samples/install_v1alpha1_lookoutingester.yaml

This file was deleted.

Loading

0 comments on commit cd140a6

Please sign in to comment.