Skip to content

Commit 56eb3bc

Browse files
authored
Merge branch 'main' into sg-next-jan1-2025
2 parents c61b503 + 4076bea commit 56eb3bc

File tree

4 files changed

+62
-0
lines changed

4 files changed

+62
-0
lines changed

docs/admin/deploy/kubernetes/index.mdx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ data:
103103
password: ""
104104
port: ""
105105
user: ""
106+
pgsslmode: "require" # optional, enable if using SSL
106107
---
107108
apiVersion: v1
108109
kind: Secret
@@ -115,6 +116,7 @@ data:
115116
password: ""
116117
port: ""
117118
user: ""
119+
pgsslmode: "require" # optional, enable if using SSL
118120
---
119121
apiVersion: v1
120122
kind: Secret
@@ -127,6 +129,7 @@ data:
127129
password: ""
128130
port: ""
129131
user: ""
132+
pgsslmode: "require" # optional, enable if using SSL
130133
```
131134
132135
The above Secrets should be deployed to the same namespace as the existing Sourcegraph deployment.
@@ -163,6 +166,7 @@ pgsql:
163166
user: "new-user"
164167
password: "new-password"
165168
port: "5432"
169+
pgsslmode: "require" # optional, enable if using SSL
166170
```
167171

168172
#### Using external Redis instances

docs/admin/executors/executors_troubleshooting.mdx

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,3 +242,22 @@ Tells us that the Pod cannot be scheduled because the pod affinity rules (`EXECU
242242
configured do not match any nodes.
243243

244244
In this case, the `EXECUTOR_KUBERNETES_POD_AFFINITY` needs to be modified to correctly target the node.
245+
246+
### Executor Job failure issues
247+
248+
If you see below errors for executor jobs:
249+
250+
Codeintel
251+
```Index failed to index: Running command "step.kubernetes.pre-index.0": job sg-executor-job-codeintel-111877 failed: Usage of EmptyDir volume "job-data" exceeds the limit "5Gi".```
252+
253+
Batch Changes
254+
```"step.kubernetes.step.0.pre": job sg-executor-job-batches-91562 failed: Usage of EmptyDir volume "job-data" exceeds the limit "5Gi".```
255+
256+
Update the below variables in the respective executor's deployment file to increase EmptyDir volume "job-data" storage. In this example, ```KUBERNETES_JOB_VOLUME_SIZE``` is set to 20Gi, but you can tweak it as per your requirement.
257+
258+
```
259+
- name: KUBERNETES_JOB_VOLUME_TYPE value: emptyDir
260+
- name: KUBERNETES_JOB_VOLUME_SIZE value: 20Gi
261+
```
262+
263+
```KUBERNETES_JOB_VOLUME_TYPE``` can be either set to ```emptyDir``` or ```pvc``` and if it’s not set, the default is ```emptyDir```

docs/releases.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Currently supported versions of Sourcegraph:
1212

1313
| **Release** | **General Availability Date** | **Supported** | **Release Notes** | **Install** |
1414
|--------------|-------------------------------|---------------|--------------------------------------------------------------------|------------------------------------------------------|
15+
| 5.11 Patch 4 | January 2025 || [Notes](https://sourcegraph.com/docs/technical-changelog#v5114013) | [Install](https://sourcegraph.com/docs/admin/deploy) |
1516
| 5.11 Patch 3 | January 2025 || [Notes](https://sourcegraph.com/docs/technical-changelog#v5114013) | [Install](https://sourcegraph.com/docs/admin/deploy) |
1617
| 5.11 Patch 2 | January 2025 || [Notes](https://sourcegraph.com/docs/technical-changelog#v5113601) | [Install](https://sourcegraph.com/docs/admin/deploy) |
1718
| 5.11 Patch 1 | January 2025 || [Notes](https://sourcegraph.com/docs/technical-changelog#v5112732) | [Install](https://sourcegraph.com/docs/admin/deploy) |

docs/technical-changelog.mdx

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,44 @@ This page documents all notable changes to Sourcegraph. For more detailed change
44

55
{/* CHANGELOG_START */}
66

7+
# 5.11 Patch 4
8+
9+
## v5.11.5234
10+
11+
- [sourcegraph](https://github.com/sourcegraph/sourcegraph/releases/tag/v5.11.5234)
12+
13+
- [docker-compose](https://github.com/sourcegraph/deploy-sourcegraph-docker/releases/tag/v5.11.5234)
14+
15+
- [helm](https://github.com/sourcegraph/deploy-sourcegraph-helm/releases/tag/v5.11.5234)
16+
17+
- [kustomize](https://github.com/sourcegraph/deploy-sourcegraph-k8s/releases/tag/v5.11.5234)
18+
19+
### Features
20+
21+
#### Perforce
22+
23+
- Use depot name for label cache `(PR #2805)`
24+
25+
### Fix
26+
27+
#### Source
28+
29+
- Possible Perforce changelists are now converted to their respective git commit during ResolveRevision `(PR #2825)`
30+
31+
### Reverts
32+
33+
There were no reverts for this release
34+
35+
### Uncategorized
36+
37+
#### Others
38+
39+
- [Manual Backport]: update shellcheck to 0.10.0 `(PR #2838)`
40+
- NA
41+
42+
{/* RSS={"version":"v5.11.5234", "releasedAt": "2025-01-17"} */}
43+
44+
745
# 5.11 Patch 3
846

947
## v5.11.4013

0 commit comments

Comments
 (0)