Skip to content

Commit ecf954c

Browse files
authored
[CHORE] Remove from k8s anything relating to go logservice. (#5441)
## Description of changes It's deprecated and migrated. Time to clean up. That's what this PR does. It erases the k8s manifests for go logservice. ## Test plan CI ## Migration plan N/A ## Observability plan N/A ## Documentation Changes N/A
1 parent 56d3b39 commit ecf954c

File tree

9 files changed

+5
-239
lines changed

9 files changed

+5
-239
lines changed

.github/actions/tilt-setup-prebuild/docker-bake.hcl

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
target "log-service" {
2-
dockerfile = "go/Dockerfile"
3-
target = "logservice"
4-
tags = [ "log-service:ci" ]
5-
}
6-
7-
target "log-service-migration" {
8-
dockerfile = "go/Dockerfile.migration"
9-
target = "logservice-migration"
10-
tags = [ "log-service-migration:ci" ]
11-
}
12-
131
target "rust-log-service" {
142
dockerfile = "rust/Dockerfile"
153
target = "log_service"
@@ -61,8 +49,6 @@ target "load-service" {
6149

6250
group "default" {
6351
targets = [
64-
"log-service",
65-
"log-service-migration",
6652
"rust-log-service",
6753
"sysdb",
6854
"sysdb-migration",

.github/actions/tilt/action.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ runs:
1414
# tilt ci does not forward ports
1515
# https://github.com/tilt-dev/tilt/issues/5964
1616
kubectl -n chroma port-forward svc/sysdb 50051:50051 &
17-
kubectl -n chroma port-forward svc/logservice 50052:50051 &
1817
kubectl -n chroma port-forward svc/rust-log-service 50054:50051 &
1918
kubectl -n chroma port-forward svc/query-service 50053:50051 &
2019
kubectl -n chroma port-forward svc/rust-frontend-service 8000:8000 &

Tiltfile

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,6 @@ else:
1616
dockerfile='./k8s/test/postgres/Dockerfile'
1717
)
1818

19-
20-
if config.tilt_subcommand == "ci":
21-
custom_build(
22-
'logservice',
23-
'docker image tag log-service:ci $EXPECTED_REF',
24-
['./go/', './idl/'],
25-
disable_push=True
26-
)
27-
else:
28-
docker_build(
29-
'logservice',
30-
'.',
31-
only=['go/', 'idl/'],
32-
dockerfile='./go/Dockerfile',
33-
target='logservice'
34-
)
35-
36-
if config.tilt_subcommand == "ci":
37-
custom_build(
38-
'logservice-migration',
39-
'docker image tag log-service-migration:ci $EXPECTED_REF',
40-
['./go/'],
41-
disable_push=True
42-
)
43-
else:
44-
docker_build(
45-
'logservice-migration',
46-
'.',
47-
only=['go/'],
48-
dockerfile='./go/Dockerfile.migration',
49-
target="logservice-migration"
50-
)
51-
5219
if config.tilt_subcommand == "ci":
5320
custom_build(
5421
'rust-log-service',
@@ -228,8 +195,6 @@ k8s_resource(
228195
'sysdb-query-service-memberlist-binding:clusterrolebinding',
229196
'sysdb-compaction-service-memberlist-binding:clusterrolebinding',
230197

231-
'logservice-serviceaccount:serviceaccount',
232-
233198
'query-service-serviceaccount:serviceaccount',
234199
'query-service-serviceaccount-rolebinding:RoleBinding',
235200
'query-service-memberlist-readerwriter:ClusterRole',
@@ -246,7 +211,6 @@ k8s_resource(
246211
'test-memberlist-reader:ClusterRole',
247212
'test-memberlist-reader-binding:ClusterRoleBinding',
248213
'lease-watcher:role',
249-
'logservice-serviceaccount-rolebinding:rolebinding',
250214
'rust-frontend-service-config:ConfigMap',
251215
],
252216
new_name='k8s_setup',
@@ -257,18 +221,16 @@ k8s_resource(
257221
k8s_resource('postgres', resource_deps=['k8s_setup'], labels=["infrastructure"], port_forwards='5432:5432')
258222
# Jobs are suffixed with the image tag to ensure they are unique. In this context, the image tag is defined in k8s/distributed-chroma/values.yaml.
259223
k8s_resource('sysdb-migration-latest', resource_deps=['postgres'], labels=["infrastructure"])
260-
k8s_resource('logservice-migration-latest', resource_deps=['postgres'], labels=["infrastructure"])
261-
k8s_resource('logservice', resource_deps=['sysdb-migration-latest'], labels=["chroma"], port_forwards='50052:50051')
262-
k8s_resource('rust-log-service', labels=["chroma"], port_forwards='50054:50051', resource_deps=['logservice'])
224+
k8s_resource('rust-log-service', labels=["chroma"], port_forwards='50054:50051')
263225
k8s_resource('sysdb', resource_deps=['sysdb-migration-latest'], labels=["chroma"], port_forwards='50051:50051')
264-
k8s_resource('rust-frontend-service', resource_deps=['sysdb', 'logservice', 'rust-log-service'], labels=["chroma"], port_forwards='8000:8000')
265-
k8s_resource('query-service', resource_deps=['sysdb', 'logservice'], labels=["chroma"], port_forwards='50053:50051')
226+
k8s_resource('rust-frontend-service', resource_deps=['sysdb', 'rust-log-service'], labels=["chroma"], port_forwards='8000:8000')
227+
k8s_resource('query-service', resource_deps=['sysdb'], labels=["chroma"], port_forwards='50053:50051')
266228
k8s_resource('compaction-service', resource_deps=['sysdb'], labels=["chroma"])
267229
k8s_resource('load-service', resource_deps=['k8s_setup'], labels=["infrastructure"], port_forwards='3001:3001')
268230
k8s_resource('jaeger', resource_deps=['k8s_setup'], labels=["observability"])
269231
k8s_resource('grafana', resource_deps=['k8s_setup'], labels=["observability"])
270232
k8s_resource('prometheus', resource_deps=['k8s_setup'], labels=["observability"])
271233
k8s_resource('otel-collector', resource_deps=['k8s_setup'], labels=["observability"])
272-
k8s_resource('garbage-collector', resource_deps=['k8s_setup', 'minio-deployment', 'logservice'], labels=["chroma"], port_forwards='50055:50055')
234+
k8s_resource('garbage-collector', resource_deps=['k8s_setup', 'minio-deployment'], labels=["chroma"], port_forwards='50055:50055')
273235
# Local S3
274236
k8s_resource('minio-deployment', resource_deps=['k8s_setup'], labels=["debug"], port_forwards=['9000:9000', '9005:9005'])

k8s/distributed-chroma/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ apiVersion: v2
1616
name: distributed-chroma
1717
description: A helm chart for distributed Chroma
1818
type: application
19-
version: 0.1.57
19+
version: 0.1.58
2020
appVersion: "0.4.24"
2121
keywords:
2222
- chroma

k8s/distributed-chroma/templates/log-migration.yaml

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

k8s/distributed-chroma/templates/logservice.yaml

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

k8s/distributed-chroma/values.yaml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,6 @@ sysdb:
2929
cpu: '1000m'
3030
memory: '512Mi'
3131
flags:
32-
logService:
33-
image:
34-
repository: 'logservice'
35-
tag: 'latest'
36-
env:
37-
- name: OPTL_TRACING_ENDPOINT
38-
value: 'value: "otel-collector:4317"'
39-
- name: SYSDB_CONN
40-
value: 'value: "sysdb.chroma:50051"'
41-
flags:
42-
replicaCount: 1
4332
rustLogService:
4433
image:
4534
repository: 'rust-log-service'
@@ -75,13 +64,6 @@ sysdbMigration:
7564
port: 5432
7665
dbName: sysdb
7766
sslmode: disable
78-
logServiceMigration:
79-
image:
80-
repository: 'logservice-migration'
81-
tag: 'latest'
82-
env:
83-
- name: CHROMA_DB_LOG_URL
84-
value: 'value: "postgresql://chroma:[email protected]:5432/log?sslmode=disable"'
8567
# Add the garbage collector configuration
8668
garbageCollector:
8769
image:

rust/log/tests/log-offsets.rs

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

rust/worker/chroma_config.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,6 @@ log_service:
205205
batch_size_bytes: 8388608 # 8MiB
206206
throughput: 3300
207207
headroom: 200
208-
proxy_to:
209-
host: "logservice.chroma"
210-
port: 50051
211-
connect_timeout_ms: 5000
212-
request_timeout_ms: 60000 # 1 minute
213208
garbage_collector:
214209
service_name: "garbage-collector"
215210
otel_endpoint: "http://otel-collector:4317"

0 commit comments

Comments
 (0)