Skip to content

Commit 0e1bbe5

Browse files
Merge branch 'main' into internal/release-v6.3.4167
2 parents c0c9c26 + 05b8f2c commit 0e1bbe5

File tree

16 files changed

+17
-423
lines changed

16 files changed

+17
-423
lines changed

charts/sourcegraph/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Use `**BREAKING**:` to denote a breaking change
1010

1111
- Fix Pod Disruption Budget for sourcegraph-frontend
1212
- Added a startup probe to the gitserver statefulset to give it time to run the on-disk migration from repo names to repo IDs
13+
- The repo-updater service is no longer needed and has been removed from the chart.
14+
- The symbols service is no longer needed and has been removed from the chart. Consider merging env vars and resource overrides given to symbols into searcher before upgrading.
1315

1416
## 5.10.0
1517

charts/sourcegraph/README.md

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -289,14 +289,6 @@ In addition to the documented values, all services also support the following va
289289
| redisStore.serviceAccount.create | bool | `false` | Enable creation of ServiceAccount for `redis-store` |
290290
| redisStore.serviceAccount.name | string | `""` | Name of the ServiceAccount to be created or an existing ServiceAccount |
291291
| redisStore.storageSize | string | `"100Gi"` | PVC Storage Request for `redis-store` data volume |
292-
| repoUpdater.containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":101,"runAsUser":100}` | Security context for the `repo-updater` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
293-
| repoUpdater.image.defaultTag | string | `"6.0.0@sha256:238702dde17eaa41f9dc5b5f379c08a9e57940587128ceda6008d7f06e72cccc"` | Docker image tag for the `repo-updater` image |
294-
| repoUpdater.image.name | string | `"repo-updater"` | Docker image name for the `repo-updater` image |
295-
| repoUpdater.name | string | `"repo-updater"` | Name used by resources. Does not affect service names or PVCs. |
296-
| repoUpdater.podSecurityContext | object | `{}` | Security context for the `repo-updater` pod, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) |
297-
| repoUpdater.resources | object | `{"limits":{"cpu":"1","memory":"2Gi"},"requests":{"cpu":"1","memory":"500Mi"}}` | Resource requests & limits for the `repo-updater` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
298-
| repoUpdater.serviceAccount.create | bool | `false` | Enable creation of ServiceAccount for `repo-updater` |
299-
| repoUpdater.serviceAccount.name | string | `""` | Name of the ServiceAccount to be created or an existing ServiceAccount |
300292
| searcher.containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":101,"runAsUser":100}` | Security context for the `searcher` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
301293
| searcher.image.defaultTag | string | `"6.3.4167@sha256:f61f14afd4cb95368c1f7de151e96a8136c7231412bb49948cc7d50434ac4c79"` | Docker image tag for the `searcher` image |
302294
| searcher.image.name | string | `"searcher"` | Docker image name for the `searcher` image |
@@ -328,16 +320,6 @@ In addition to the documented values, all services also support the following va
328320
| storageClass.parameters | object | `{}` | Extra parameters of storageClass, consult your cloud provider persistent storage documentation |
329321
| storageClass.provisioner | string | `"kubernetes.io/gce-pd"` | Name of the storageClass provisioner, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/storage/storage-classes/#provisioner) and consult your cloud provider persistent storage documentation |
330322
| storageClass.type | string | `"pd-ssd"` | Value of `type` key in storageClass `parameters`, consult your cloud provider persistent storage documentation |
331-
| symbols.containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":101,"runAsUser":100}` | Security context for the `symbols` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
332-
| symbols.image.defaultTag | string | `"6.0.0@sha256:7f91048d1966add54b199755c77a5c3ca84b7f57bb5d2ffb65113da7f100b051"` | Docker image tag for the `symbols` image |
333-
| symbols.image.name | string | `"symbols"` | Docker image name for the `symbols` image |
334-
| symbols.name | string | `"symbols"` | Name used by resources. Does not affect service names or PVCs. |
335-
| symbols.podSecurityContext | object | `{"fsGroup":101,"fsGroupChangePolicy":"OnRootMismatch","runAsUser":100}` | Security context for the `symbols` pod, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) |
336-
| symbols.replicaCount | int | `1` | Number of `symbols` pod |
337-
| symbols.resources | object | `{"limits":{"cpu":"2","memory":"2G"},"requests":{"cpu":"500m","memory":"500M"}}` | Resource requests & limits for the `symbols` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
338-
| symbols.serviceAccount.create | bool | `false` | Enable creation of ServiceAccount for `symbols` |
339-
| symbols.serviceAccount.name | string | `""` | Name of the ServiceAccount to be created or an existing ServiceAccount |
340-
| symbols.storageSize | string | `"12Gi"` | Size of the PVC for symbols pods to store cache data |
341323
| syntacticCodeIntel.containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":101,"runAsUser":100}` | Security context for the `syntactic-code-intel-worker` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
342324
| syntacticCodeIntel.enabled | bool | `false` | |
343325
| syntacticCodeIntel.image.defaultTag | string | `"6.3.4167@sha256:6362fe7a783878a340fdaf4d59f1b0da023ae9eae8e0e352850891fc79821aeb"` | Docker image tag for the `syntactic-code-intel-worker` image |

charts/sourcegraph/examples/advanced-scheduling/override.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,6 @@ searcher:
9393
app: searcher
9494
weight: 100
9595

96-
symbols:
97-
replicaCount: 3
98-
affinity:
99-
podAntiAffinity:
100-
preferredDuringSchedulingIgnoredDuringExecution:
101-
- podAffinityTerm:
102-
topologyKey: kubernetes.io/hostname
103-
labelSelector:
104-
matchLabels:
105-
<<: *commonSelectorLabels
106-
app: symbols
107-
weight: 100
108-
10996
worker:
11097
replicaCount: 3
11198
affinity:

charts/sourcegraph/examples/aws/override.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ frontend:
1010

1111
storageClass:
1212
create: true
13-
type: gp2 # This configures SSDs (recommended).
13+
type: gp3 # This configures SSDs (recommended).
1414
provisioner: ebs.csi.aws.com
1515
volumeBindingMode: WaitForFirstConsumer
1616
reclaimPolicy: Retain

charts/sourcegraph/examples/basic/override.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,3 @@ searcher:
6464
requests:
6565
cpu: 500m
6666
memory: 1G
67-
68-
symbols:
69-
resources:
70-
limits:
71-
cpu: "4"
72-
memory: 4G
73-
ephemeral-storage: "10G"
74-
requests:
75-
cpu: "1"
76-
memory: 1G
77-
ephemeral-storage: "10G"

charts/sourcegraph/examples/common-modifications/override.yaml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,6 @@ redisStore:
171171
memory: 7Gi
172172
storageSize: 100Gi
173173

174-
repoUpdater:
175-
resources:
176-
limits:
177-
cpu: "1"
178-
memory: 2Gi
179-
requests:
180-
cpu: "1"
181-
memory: 500Mi
182-
183174
searcher:
184175
replicaCount: 2
185176
resources:
@@ -192,19 +183,6 @@ searcher:
192183
ephemeral-storage: 25G
193184
memory: 500M
194185

195-
196-
symbols:
197-
replicaCount: 1
198-
resources:
199-
limits:
200-
cpu: "2"
201-
ephemeral-storage: 12G
202-
memory: 2G
203-
requests:
204-
cpu: 500m
205-
ephemeral-storage: 10G
206-
memory: 500M
207-
208186
syntectServer:
209187
replicaCount: 1
210188
resources:

charts/sourcegraph/examples/gcp/override.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,11 @@ preciseCodeIntel:
6969
SRC_LOG_FORMAT:
7070
value: json_gcp
7171

72-
repoUpdater:
73-
env:
74-
SRC_LOG_FORMAT:
75-
value: json_gcp
76-
7772
searcher:
7873
env:
7974
SRC_LOG_FORMAT:
8075
value: json_gcp
8176

82-
symbols:
83-
env:
84-
SRC_LOG_FORMAT:
85-
value: json_gcp
86-
8777
syntectServer:
8878
env:
8979
SRC_LOG_FORMAT:

charts/sourcegraph/templates/repo-updater/repo-updater.Deployment.yaml

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

charts/sourcegraph/templates/repo-updater/repo-updater.Service.yaml

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

charts/sourcegraph/templates/repo-updater/repo-updater.ServiceAccount.yaml

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

0 commit comments

Comments
 (0)