Merge branch 'main' into sg-next-jan1-2025

sourcegraph · Jan 20, 2025 · 56eb3bc · 56eb3bc
2 parents c61b503 + 4076bea
commit 56eb3bc
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 0 deletions.
diff --git a/docs/admin/deploy/kubernetes/index.mdx b/docs/admin/deploy/kubernetes/index.mdx
@@ -103,6 +103,7 @@ data:
   password: ""
   port: ""
   user: ""
+  pgsslmode: "require" # optional, enable if using SSL
 ---
 apiVersion: v1
 kind: Secret
@@ -115,6 +116,7 @@ data:
   password: ""
   port: ""
   user: ""
+  pgsslmode: "require" # optional, enable if using SSL
 ---
 apiVersion: v1
 kind: Secret
@@ -127,6 +129,7 @@ data:
   password: ""
   port: ""
   user: ""
+  pgsslmode: "require" # optional, enable if using SSL
 ```
 
 The above Secrets should be deployed to the same namespace as the existing Sourcegraph deployment.
@@ -163,6 +166,7 @@ pgsql:
     user: "new-user"
     password: "new-password"
     port: "5432"
+    pgsslmode: "require" # optional, enable if using SSL
 ```
 
 #### Using external Redis instances

diff --git a/docs/admin/executors/executors_troubleshooting.mdx b/docs/admin/executors/executors_troubleshooting.mdx
@@ -242,3 +242,22 @@ Tells us that the Pod cannot be scheduled because the pod affinity rules (`EXECU
 configured do not match any nodes.
 
 In this case, the `EXECUTOR_KUBERNETES_POD_AFFINITY` needs to be modified to correctly target the node.
+
+### Executor Job failure issues
+
+If you see below errors for executor jobs:
+
+Codeintel
+```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".```
+
+Batch Changes
+```"step.kubernetes.step.0.pre": job sg-executor-job-batches-91562 failed: Usage of EmptyDir volume "job-data" exceeds the limit "5Gi".```
+
+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.
+
+```
+- name: KUBERNETES_JOB_VOLUME_TYPE          value: emptyDir        
+- name: KUBERNETES_JOB_VOLUME_SIZE          value: 20Gi
+```
+
+```KUBERNETES_JOB_VOLUME_TYPE``` can be either set to ```emptyDir``` or ```pvc``` and if it’s not set, the default is ```emptyDir```
diff --git a/docs/releases.mdx b/docs/releases.mdx
@@ -12,6 +12,7 @@ Currently supported versions of Sourcegraph:
 
 | **Release**  | **General Availability Date** | **Supported** | **Release Notes**                                                  | **Install**                                          |
 |--------------|-------------------------------|---------------|--------------------------------------------------------------------|------------------------------------------------------|
+| 5.11 Patch 4 | January 2025                  | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v5114013) | [Install](https://sourcegraph.com/docs/admin/deploy) |
 | 5.11 Patch 3 | January 2025                  | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v5114013) | [Install](https://sourcegraph.com/docs/admin/deploy) |
 | 5.11 Patch 2 | January 2025                  | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v5113601) | [Install](https://sourcegraph.com/docs/admin/deploy) |
 | 5.11 Patch 1 | January 2025                  | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v5112732) | [Install](https://sourcegraph.com/docs/admin/deploy) |

diff --git a/docs/technical-changelog.mdx b/docs/technical-changelog.mdx
@@ -4,6 +4,44 @@ This page documents all notable changes to Sourcegraph. For more detailed change
 
 {/* CHANGELOG_START */}
 
+# 5.11 Patch 4
+
+## v5.11.5234
+
+- [sourcegraph](https://github.com/sourcegraph/sourcegraph/releases/tag/v5.11.5234)
+
+- [docker-compose](https://github.com/sourcegraph/deploy-sourcegraph-docker/releases/tag/v5.11.5234)
+
+- [helm](https://github.com/sourcegraph/deploy-sourcegraph-helm/releases/tag/v5.11.5234)
+
+- [kustomize](https://github.com/sourcegraph/deploy-sourcegraph-k8s/releases/tag/v5.11.5234)
+
+### Features
+
+#### Perforce
+
+- Use depot name for label cache `(PR #2805)`
+
+### Fix
+
+#### Source
+
+- Possible Perforce changelists are now converted to their respective git commit during ResolveRevision `(PR #2825)`
+
+### Reverts
+
+  There were no reverts for this release
+
+### Uncategorized
+
+#### Others
+
+- [Manual Backport]: update shellcheck to 0.10.0 `(PR #2838)`
+  - NA
+
+{/* RSS={"version":"v5.11.5234", "releasedAt": "2025-01-17"} */}
+
+
 # 5.11 Patch 3
 
 ## v5.11.4013