Skip to content

Commit 80efb7a

Browse files
authored
Merge branch 'main' into code-insights-revamp
2 parents 661a149 + 44da856 commit 80efb7a

File tree

8 files changed

+109
-28
lines changed

8 files changed

+109
-28
lines changed

docs/admin/executors/deploy_executors_kubernetes.mdx

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,48 @@ Executors interact with the Kubernetes API to manage the lifecycle of individual
1313
| `batch` | `jobs` | `create`, `delete` | Executors create Job pods to run processes. Once Jobs are completed, they are cleaned up. |
1414
| | `pods`, `pods/log` | `get`, `list`, `watch` | Executors need to look up and steam logs from the Job Pods. |
1515

16-
See the [example Role YAML](https://sourcegraph.com/github.com/sourcegraph/sourcegraph@main/-/blob/cmd/executor/kubernetes/batches/executor-batches.Role.yml) for more details on the exact RBAC requirements for native Kubernetes Executors.
16+
Here's an example Role YAML to demonstrate the RBAC requirements for native Kubernetes Executors:
17+
18+
```yaml
19+
apiVersion: rbac.authorization.k8s.io/v1
20+
kind: Role
21+
metadata:
22+
name: sg-executor-batches-role
23+
namespace: default
24+
rules:
25+
- apiGroups:
26+
- batch
27+
resources:
28+
- jobs
29+
verbs:
30+
- create
31+
- delete
32+
- apiGroups:
33+
- ""
34+
resources:
35+
- pods
36+
- pods/log
37+
verbs:
38+
- get
39+
- list
40+
- watch
41+
# Secrets are required post 5.5, when all pods run a single job
42+
- apiGroups:
43+
- ""
44+
resources:
45+
- secrets
46+
verbs:
47+
- create
48+
- delete
49+
# PVCs are required if KUBERNETES_JOB_VOLUME_TYPE is "pvc"
50+
# - apiGroups:
51+
# - ""
52+
# resources:
53+
# - persistentvolumeclaims
54+
# verbs:
55+
# - create
56+
# - delete
57+
```
1758

1859
## Deployment
1960

@@ -94,5 +135,5 @@ The Executor Docker image is available on Docker Hub at [`sourcegraph/executor-k
94135
### Example Configuration YAML
95136

96137
See
97-
the [local development YAMLs](https://sourcegraph.com/github.com/sourcegraph/sourcegraph@main/-/blob/cmd/executor/kubernetes)
98-
for an example of how to configure the Executor in Kubernetes.
138+
the [local development YAMLs](https://sourcegraph.com/github.com/sourcegraph/sourcegraph-public-snapshot@main/-/blob/cmd/executor/kubernetes)
139+
for an example of how to configure the Executor in Kubernetes.

docs/admin/permissions/index.mdx

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ To set up permissions by [syncing them from a code host](/admin/permissions/sync
3838
- [Gerrit](/admin/auth/#gerrit)
3939
- Bitbucket Server doesn't require an authentication provider, but has [other prerequisites](/admin/code_hosts/bitbucket_server#prerequisites)
4040
- Perforce doesn't need a separate authentication provider
41+
- [Azure DevOps](/admin/code_hosts/azuredevops)
4142
2. Configure the code host connection to use authorization:
4243
- [GitHub](/admin/code_hosts/github#repository-permissions)
4344
- [GitLab](/admin/code_hosts/gitlab#repository-permissions)
4445
- [Bitbucket Cloud](/admin/code_hosts/bitbucket_cloud#repository-permissions)
4546
- [Bitbucket Server](/admin/code_hosts/bitbucket_server#repository-permissions)
4647
- [Gerrit](/admin/code_hosts/gerrit#add-gerrit-as-an-authentication-provider)
4748
- [Perforce](/admin/repo/perforce#repository-permissions)
49+
- [Azure DevOps](/admin/code_hosts/azuredevops#permissions-syncing)
4850

4951
It's also possible to use other methods to get permission data from a code host into the Sourcegraph instance.
5052

@@ -61,16 +63,18 @@ To know more about each method that we support, please follow the link above.
6163
## Supported code hosts
6264

6365
Support for repository permissions accross different code hosts is different. The following table captures current state of support (ordered alphabetically):
64-
| Code host | [Permission Syncing](/admin/permissions/syncing) | [Webhooks for Permissions](/admin/permissions/webhooks) | [Explicit API](/admin/permissions/api) | [Scale supported](#supported-scale) |
65-
| -------- | -------- | -------- | -------- | -------- |
66-
| Bitbucket Cloud (Beta) |||| 10k users, 100k repositories |
67-
| Bitbucket Server |||| 10k users, 100k repositories |
68-
| Gerrit (Beta) |||| 10k users, 100k repositories |
69-
| GitHub |||| 40k users, 200k repositories |
70-
| GitHub Enterprise |||| 40k users, 200k repositories |
71-
| GitLab |||| 40k users, 200k repositories |
72-
| GitLab Self-Managed |||| 40k users, 200k repositories |
73-
| Perforce (Beta) | Yes (with file-level permissions) ||| 10k users, 250k repositories |
66+
67+
| Code host | [Permission Syncing](/admin/permissions/syncing) | [Webhooks for Permissions](/admin/permissions/webhooks) | [Explicit API](/admin/permissions/api) | [Scale supported](#supported-scale) |
68+
| ---------------------- | ------------------------------------------------ | ------------------------------------------------------- | -------------------------------------- | ----------------------------------- |
69+
| Bitbucket Cloud (Beta) |||| 10k users, 100k repositories |
70+
| Bitbucket Server |||| 10k users, 100k repositories |
71+
| Gerrit (Beta) |||| 10k users, 100k repositories |
72+
| GitHub |||| 40k users, 200k repositories |
73+
| GitHub Enterprise |||| 40k users, 200k repositories |
74+
| GitLab |||| 40k users, 200k repositories |
75+
| GitLab Self-Managed |||| 40k users, 200k repositories |
76+
| Perforce (Beta) | Yes (with file-level permissions) ||| 10k users, 250k repositories |
77+
| Azure Devops |||| 10k users, 100k repositories |
7478

7579
All the other code hosts only support [Explicit permissions API](/admin/permissions/api).
7680

@@ -92,6 +96,7 @@ in Sourcegraph.
9296
- [Permission syncing SLA](/admin/permissions/syncing#sla)
9397
- [Webhooks SLA](/admin/permissions/webhooks#sla)
9498
- [Explicit Permissions API SLA](/admin/permissions/api#sla)
99+
95100
## License requirements
96101

97102
To have permission syncing available, the Sourcegraph instance needs to be configured with

docs/admin/updates/automatic.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Automatic multi-version upgrades
22

3-
> Warning: Automatic upgrades to v5.10.0 will fail please upgrade to a v5.9.x version and perform a standard upgrade instead! See our [postgres 12 end of life](https://sourcegraph.com/docs/admin/postgres12_end_of_life_notice#postgres-12-end-of-life) notice!
3+
> Warning: Automatic upgrades to v5.10.0 will fail please upgrade to a v5.9.x version and perform a standard upgrade instead! See our [postgres 12 end of life](https://sourcegraph.com/docs/admin/postgres12_end_of_life_notice#postgres-12-end-of-life) notice! This is one of the reasons the "Auto Upgrade" toggle is automatically turned off after a version change. This behavior is intentional—it’s designed to prevent users from unintentionally performing multi-version upgrades (MVUs) that span critical changes, such as major infrastructure updates like a PostgreSQL version upgrade.
44
55
From **Sourcegraph 5.1 and later**, multi-version upgrades can be performed **automatically** as if they were a standard upgrade for the same deployment type. Automatic multi-version upgrades take the following general form:
66

docs/code-search/code-navigation/precise_code_navigation.mdx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Precise code navigation relies on the open source [SCIP Code Intelligence Protoc
2222

2323
## Setting up code navigation for your codebase
2424

25-
<Callout type="info">There are several options for setting up precise code navigation listed below. However, we always recommend you start by manually indexing your repo locally using the [approriate indexer](/code-navigation/writing_an_indexer#quick-reference) for your language. Code and build systems can vary by project and ensuring you can first succesfully run the indexer locally leads to a smoother experience since it is vastly easier to debug and iterate on any issues locally before trying to do so in CI/CD or in Auto-Indexing.</Callout>
25+
<Callout type="info">There are several options for setting up precise code navigation listed below. However, we always recommend you start by manually indexing your repo locally using the [approriate indexer](/code-search/code-navigation/writing_an_indexer#quick-reference) for your language. Code and build systems can vary by project and ensuring you can first succesfully run the indexer locally leads to a smoother experience since it is vastly easier to debug and iterate on any issues locally before trying to do so in CI/CD or in Auto-Indexing.</Callout>
2626

2727
1. **Manual indexing**. Index a repository and upload it to your Sourcegraph instance:
2828

@@ -32,12 +32,8 @@ Precise code navigation relies on the open source [SCIP Code Intelligence Protoc
3232
- [Index a Python repository](https://sourcegraph.com/github.com/sourcegraph/scip-python)
3333
- [Index a Ruby repository](https://sourcegraph.com/github.com/sourcegraph/scip-ruby)
3434

35-
2. [**Automate indexing via CI**](/code_navigation/how-to/adding_scip_to_workflows): Add indexing and uploading to your CI setup.
35+
2. [**Automate indexing via CI**](/code-search/code-navigation/how-to/adding_scip_to_workflows): Add indexing and uploading to your CI setup.
3636
3. [**Auto-indexing**](/code-search/code-navigation/auto_indexing#enable-auto-indexing): Sourcegraph will automatically index your repositories and enable precise code navigation for them.
37-
4. Set up **auto-dependency indexing** to navigate and search through the dependencies your code uses:
38-
- **Go**: Enable [auto-indexing](/code-search/code-navigation/auto_indexing) and Sourcegraph will start indexing your dependencies.
39-
- **JavaScript, TypeScript**: Enable [auto-indexing](/code-search/code-navigation/auto_indexing#enable-auto-indexing) and set up an [npm dependencies code host](/integration/npm).
40-
- **Java, Scala, Kotlin**: Enable [auto-indexing](/code-search/code-navigation/auto_indexing) and set up a [JVM dependencies code host](/integration/jvm).
4137

4238
## Supported languages and indexers
4339

docs/cody/clients/feature-reference.mdx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@
2424
| Access to prompts and Prompt library ||||||
2525
| Promoted Prompts ||||||
2626

27-
## Code Autocomplete
28-
29-
| **Feature** | **VS Code** | **JetBrains** | **Visual Studio** |
30-
| --------------------------------------------- | ----------- | ------------- | ----------------- |
31-
| Single and multi-line autocompletion ||||
32-
| Cycle through multiple completion suggestions ||||
33-
| Accept suggestions word-by-word ||||
27+
## Code Autocomplete and Auto-edit
28+
29+
| **Feature** | **VS Code** | **JetBrains** | **Visual Studio** |
30+
| ------------------------------------------------------ | ----------- | ------------- | ----------------- |
31+
| Single and multi-line autocompletion ||||
32+
| Cycle through multiple completion suggestions ||||
33+
| Accept suggestions word-by-word ||||
34+
| Auto-edit suggestions via cursor movements and typing ||||
3435

3536
Few exceptions that apply to Cody Pro and Cody Enterprise users:
3637

docs/cody/prompts-guide.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ This prompt can help you if you want to generate unit tests for your code based
270270

271271
>You're working with Golang and need Cody to generate unit tests that comply with your team’s conventions. Your organization follows a specific structure for tests, including table-driven tests and `require` from the `testify` package for assertions. However, Cody might provide a simple test that does not align with your standards.
272272
273-
While you can use the default `generate-unit-tests` prompt but to get the desired output, you can customize e the prompt to include the following:
273+
While you can use the default `generate-unit-tests` prompt but to get the desired output, you can customize the prompt to include the following:
274274

275275
```
276276
Please generate Golang unit tests that adhere to the following conventions:

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+
| 6.3 Patch 1 | May 2025 || [Notes](https://sourcegraph.com/docs/technical-changelog#v632692) | [Install](https://sourcegraph.com/docs/admin/deploy) |
1516
| 6.3 Patch 0 | April 2025 || [Notes](https://sourcegraph.com/docs/technical-changelog#v630) | [Install](https://sourcegraph.com/docs/admin/deploy) |
1617
| 6.2 Patch 3 | April 2025 || [Notes](https://sourcegraph.com/docs/technical-changelog#v623841) | [Install](https://sourcegraph.com/docs/admin/deploy) |
1718
| 6.2 Patch 2 | April 2025 || [Notes](https://sourcegraph.com/docs/technical-changelog#v622553) | [Install](https://sourcegraph.com/docs/admin/deploy) |

docs/technical-changelog.mdx

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

55
{/* CHANGELOG_START */}
66

7+
# 6.3 Patch 1
8+
9+
## v6.3.2692
10+
11+
- [sourcegraph](https://github.com/sourcegraph/sourcegraph/releases/tag/v6.3.2692)
12+
13+
- [docker-compose](https://github.com/sourcegraph/deploy-sourcegraph-docker/releases/tag/v6.3.2692)
14+
15+
- [helm](https://github.com/sourcegraph/deploy-sourcegraph-helm/releases/tag/v6.3.2692)
16+
17+
- [kustomize](https://github.com/sourcegraph/deploy-sourcegraph-k8s/releases/tag/v6.3.2692)
18+
19+
### Features
20+
21+
#### Code Intelligence
22+
23+
- Add env var to disable precise code intel `(PR #5357)`
24+
25+
#### Tenant/Reconciler
26+
27+
- Ignore deleted workspaces when reporting instance status `(PR #5161)`
28+
29+
### Reverts
30+
31+
There were no reverts for this release
32+
33+
### Uncategorized
34+
35+
#### Others
36+
37+
- [Backport 6.3.x] authz: Reduce updates on pending perms tables `(PR #5365)`
38+
- [Backport 6.3.x] openaicompatible: support custom headers && pure inference through /chat/completions `(PR #5361)`
39+
- [Backport 6.3.x] workspaces: clarify that deletion does not affect Sourcegraph Account `(PR #5273)`
40+
41+
{/* RSS={"version":"v6.3.2692", "releasedAt": "2025-05-14"} */}
42+
43+
744
# 6.3 Patch 0
845

946
## v6.3.0

0 commit comments

Comments
 (0)