Skip to content

Commit 1ac4f11

Browse files
authored
Remove symbols statefulset (#271)
Starting in Sourcegraph 6.4, the Symbols and Searcher services are now combined, for easier operation, simplified architecture, and better resource utilization. Customers can delete the service if not deleted automatically, and may want to consider reallocating resources previously given to symbols to searcher. Environment variables should be copied over from symbols to searcher. Test plan: This deployment ran for ~2 weeks on S2 and dotcom already and has signoff from team-product-platform. ## Checklist <!-- Kubernetes, both Kustomize and Helm, and Docker Compose MUST be kept in sync. You should not merge a change here without a corresponding change in the other repositories, unless it is specific to this deployment type. If uneeded, add link or explanation of why it is not needed here. --> - [ ] Update [CHANGELOG.md](https://github.com/sourcegraph/deploy-sourcegraph-k8s/blob/main/CHANGELOG.md) - [x] Update [K8s Upgrade notes](https://github.com/sourcegraph/sourcegraph/blob/main/doc/admin/updates/kubernetes.md): sourcegraph/docs#1117 - [x] Kustomiz-specific changes - [x] Update sister repository: [deploy-sourcegraph-helm](https://github.com/sourcegraph/deploy-sourcegraph-helm) - [x] Update sister repository: [deploy-sourcegraph-docker](https://github.com/sourcegraph/deploy-sourcegraph-docker) - [x] Verify all images have a valid tag and SHA256 sum
1 parent b548f58 commit 1ac4f11

File tree

58 files changed

+119
-658
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+119
-658
lines changed

base/monitoring/prometheus/prometheus.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ scrape_configs: # Configure targets to scrape
5555
- job_name: "sourcegraph-statefulsets"
5656
dns_sd_configs:
5757
- names:
58-
- "symbols.default.svc.cluster.local"
59-
- "symbols.ns-sourcegraph.svc.cluster.local"
60-
- "symbols.$SG_NAMESPACE.svc.cluster.local"
6158
- "searcher.default.svc.cluster.local"
6259
- "searcher.ns-sourcegraph.svc.cluster.local"
6360
- "searcher.$SG_NAMESPACE.svc.cluster.local"

base/sourcegraph/frontend/sourcegraph-frontend.ConfigMap.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,4 @@ data:
2424
PROMETHEUS_URL: http://prometheus:30090
2525
SRC_GIT_SERVERS: gitserver-0.gitserver:3178
2626
SEARCHER_URL: http://searcher-0.searcher:3181
27-
SYMBOLS_URL: http://symbols:3184
2827
INDEXED_SEARCH_SERVERS: indexed-search-0.indexed-search:6070

base/sourcegraph/kustomization.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ resources:
1111
- precise-code-intel
1212
- redis
1313
- searcher
14-
- symbols
1514
- syntactic-code-intel
1615
- syntect-server
1716
- worker

base/sourcegraph/symbols/kustomization.yaml

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

base/sourcegraph/symbols/symbols.Service.yaml

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

base/sourcegraph/symbols/symbols.StatefulSet.yaml

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

components/clusters/old-base/kustomization.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,20 @@ components:
55
- ../../monitoring/cadvisor
66
- ../../monitoring/rbacs
77
- ../../services/searcher/deployment
8-
- ../../services/symbols/deployment
98
- ../../services/pgsql
109
- ../../services/codeinsights-db
1110
- ../../services/codeintel-db
1211
# Add sourcegraph as default storage class name
1312
- ../../storage-class/sourcegraph
1413
- ../../enable/service-discovery
1514
patches:
16-
# To support searcher and symbols as both statefulset and deployment
15+
# To support searcher as both statefulset and deployment
1716
- path: patches/searcher/searcher.patchesJson6902.yaml
1817
target:
1918
group: apps
2019
kind: StatefulSet|Deployment
2120
name: searcher
2221
version: v1
23-
- path: patches/symbols/symbols.patchesJson6902.yaml
24-
target:
25-
group: apps
26-
kind: StatefulSet|Deployment
27-
name: symbols
28-
version: v1
2922
- path: patches/remove/securityContext-container-0.yaml
3023
target:
3124
group: apps

components/clusters/old-base/patches/symbols/symbols.patchesJson6902.yaml

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

components/custom/replica/kustomization.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ replicas:
1616
# count: 1
1717
# - name: searcher
1818
# count: 1
19-
# - name: symbols
20-
# count: 1
2119
# - name: sourcegraph-frontend
2220
# count: 2
2321
# - name: precise-code-intel-worker

components/custom/resources/kustomization.yaml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -348,26 +348,6 @@ patches:
348348
# memory: 500M
349349
# - patch: |-
350350
# apiVersion: apps/v1
351-
# kind: StatefulSet
352-
# metadata:
353-
# name: symbols
354-
# spec:
355-
# replicas: 1
356-
# template:
357-
# spec:
358-
# containers:
359-
# - name: symbols
360-
# resources:
361-
# limits:
362-
# cpu: "2"
363-
# ephemeral-storage: "12G"
364-
# memory: 2G
365-
# requests:
366-
# cpu: 500m
367-
# ephemeral-storage: "10G"
368-
# memory: 500M
369-
# - patch: |-
370-
# apiVersion: apps/v1
371351
# kind: Deployment
372352
# metadata:
373353
# name: searcher
@@ -390,26 +370,6 @@ patches:
390370
# apiVersion: apps/v1
391371
# kind: Deployment
392372
# metadata:
393-
# name: symbols
394-
# spec:
395-
# replicas: 1
396-
# template:
397-
# spec:
398-
# containers:
399-
# - name: symbols
400-
# resources:
401-
# limits:
402-
# cpu: "2"
403-
# ephemeral-storage: "12G"
404-
# memory: 2G
405-
# requests:
406-
# cpu: 500m
407-
# ephemeral-storage: "10G"
408-
# memory: 500M
409-
# - patch: |-
410-
# apiVersion: apps/v1
411-
# kind: Deployment
412-
# metadata:
413373
# name: syntect-server
414374
# spec:
415375
# replicas: 1

0 commit comments

Comments
 (0)