Skip to content

Commit

Permalink
Release: update changelog and cherrypick release commit (#370)
Browse files Browse the repository at this point in the history
  • Loading branch information
camdencheek authored Nov 2, 2023
1 parent 5bb1390 commit 19b5838
Show file tree
Hide file tree
Showing 14 changed files with 77 additions and 74 deletions.
4 changes: 2 additions & 2 deletions charts/sourcegraph-executor/dind/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ icon: https://sourcegraph.com/favicon.ico
type: application

# Chart version, separate from Sourcegraph
version: "5.2.1"
version: "5.2.2"

# Version of Sourcegraph release
appVersion: "5.2.1"
appVersion: "5.2.2"
2 changes: 1 addition & 1 deletion charts/sourcegraph-executor/dind/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ In addition to the documented values, the `executor` and `private-docker-registr
| executor.env.EXECUTOR_FRONTEND_URL | object | `{"value":""}` | The external URL of the Sourcegraph instance. Required. |
| executor.env.EXECUTOR_QUEUE_NAME | object | `{"value":""}` | The name of the queue to pull jobs from to. Possible values: batches and codeintel. **Either this or EXECUTOR_QUEUE_NAMES is required.** |
| executor.env.EXECUTOR_QUEUE_NAMES | object | `{"value":""}` | The comma-separated list of names of multiple queues to pull jobs from to. Possible values: batches and codeintel. **Either this or EXECUTOR_QUEUE_NAME is required.** |
| executor.image.defaultTag | string | `"5.2.1@sha256:0dc5630f6fb68aef43d7c5a31e75c4c7146d2bb05b57ed7ab356b78fe54c6b65"` | |
| executor.image.defaultTag | string | `"5.2.2@sha256:37b04018114059fd8651efde2165f3800720e7cfce37584f24d06d02ad7607c6"` | |
| executor.image.name | string | `"executor"` | |
| executor.replicaCount | int | `1` | |
| privateDockerRegistry.enabled | bool | `true` | Whether to deploy the private registry. Only one registry is needed when deploying multiple executors. More information: https://docs.sourcegraph.com/admin/executors/deploy_executors#using-private-registries |
Expand Down
2 changes: 1 addition & 1 deletion charts/sourcegraph-executor/dind/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ storageClass:
executor:
enabled: true
image:
defaultTag: 5.2.1@sha256:0dc5630f6fb68aef43d7c5a31e75c4c7146d2bb05b57ed7ab356b78fe54c6b65
defaultTag: 5.2.2@sha256:37b04018114059fd8651efde2165f3800720e7cfce37584f24d06d02ad7607c6
name: "executor"
replicaCount: 1
env:
Expand Down
4 changes: 2 additions & 2 deletions charts/sourcegraph-executor/k8s/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ icon: https://sourcegraph.com/favicon.ico
type: application

# Chart version, separate from Sourcegraph
version: "5.2.1"
version: "5.2.2"

# Version of Sourcegraph release
appVersion: "5.2.1"
appVersion: "5.2.2"
2 changes: 1 addition & 1 deletion charts/sourcegraph-executor/k8s/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ In addition to the documented values, the `executor` and `private-docker-registr
| executor.extraEnv | string | `nil` | Sets extra environment variables on the executor deployment. See `values.yaml` for the format. |
| executor.frontendPassword | string | `""` | The shared secret configured in the Sourcegraph instance site config under executors.accessToken. Required. |
| executor.frontendUrl | string | `""` | The external URL of the Sourcegraph instance. Required. **Recommended:** set to the internal service endpoint (e.g. `http://sourcegraph-frontend.sourcegraph.svc.cluster.local:30080` if Sourcegraph is deployed in the `sourcegraph` namespace). This will avoid unnecessary network charges as traffic will stay within the local network. |
| executor.image.defaultTag | string | `"5.2.1@sha256:f8262493086be3641252955fb2b958cfefe50305d7091225da022e644e7443eb"` | |
| executor.image.defaultTag | string | `"5.2.2@sha256:1b616050b86131a6f1ce694c221585c9800029858d75e0c4973776fc8cc0c3cd"` | |
| executor.image.name | string | `"executor-kubernetes"` | |
| executor.kubeconfigPath | string | `""` | The path to the kubeconfig file. If not specified, the in-cluster config is used. |
| executor.kubernetesJob.deadline | string | `"1200"` | The number of seconds after which a Kubernetes job will be terminated. |
Expand Down
2 changes: 1 addition & 1 deletion charts/sourcegraph-executor/k8s/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ executor:
replicas: 1
enabled: true
image:
defaultTag: 5.2.1@sha256:f8262493086be3641252955fb2b958cfefe50305d7091225da022e644e7443eb
defaultTag: 5.2.2@sha256:1b616050b86131a6f1ce694c221585c9800029858d75e0c4973776fc8cc0c3cd
name: "executor-kubernetes"
# -- The external URL of the Sourcegraph instance. Required. **Recommended:** set to the internal service endpoint (e.g. `http://sourcegraph-frontend.sourcegraph.svc.cluster.local:30080` if Sourcegraph is deployed in the `sourcegraph` namespace).
# This will avoid unnecessary network charges as traffic will stay within the local network.
Expand Down
4 changes: 2 additions & 2 deletions charts/sourcegraph-migrator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ icon: https://sourcegraph.com/favicon.ico
type: application

# Chart version, separate from Sourcegraph
version: "5.2.1"
version: "5.2.2"

# Version of Sourcegraph release
appVersion: "5.2.1"
appVersion: "5.2.2"
6 changes: 3 additions & 3 deletions charts/sourcegraph-migrator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ You should consult the list of available [migrator commands]. Below is some exam
- Perform initial migrations against external PostgreSQL databases prior to the Sourcegraph deployment

```sh
helm upgrade --install -f <your-override-file.yaml> --version 5.2.1 sg-migrator sourcegraph/sourcegraph-migrator
helm upgrade --install -f <your-override-file.yaml> --version 5.2.2 sg-migrator sourcegraph/sourcegraph-migrator
```

### Add a migration log entry
Expand All @@ -52,7 +52,7 @@ helm upgrade --install -f <your-override-file.yaml> --version 5.2.1 sg-migrator
Add an entry to the migration log after a site administrator has explicitly applied the contents of a migration file, learn more about troubleshooting a [dirty database].

```sh
helm upgrade --install -f <your-override-file.yaml> --set "migrator.args={add-log,-db=frontend,-version=1528395834}" --version 5.2.1 sg-migrator sourcegraph/sourcegraph-migrator
helm upgrade --install -f <your-override-file.yaml> --set "migrator.args={add-log,-db=frontend,-version=1528395834}" --version 5.2.2 sg-migrator sourcegraph/sourcegraph-migrator
```

## Rendering manifests for kubectl deployment
Expand Down Expand Up @@ -80,7 +80,7 @@ In addition to the documented values, the `migrator` service also supports the f
| migrator.args | list | `["up","-db=all"]` | Override default `migrator` container args Available commands can be found at https://docs.sourcegraph.com/admin/how-to/manual_database_migrations |
| migrator.containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":101,"runAsUser":100}` | Security context for the `migrator` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
| migrator.env | object | `{}` | Environment variables for the `migrator` container |
| migrator.image.defaultTag | string | `"5.2.1@sha256:283ed72b8757c9a4ed5136a88ab6dbf2904cbcea537f7778e8c6d5e4b2dd46e9"` | Docker image tag for the `migrator` image |
| migrator.image.defaultTag | string | `"5.2.2@sha256:24eb266b0f73d65c2dd249c110a415a027f8992433f6c07f2578b14e329a1b4c"` | Docker image tag for the `migrator` image |
| migrator.image.name | string | `"migrator"` | Docker image name for the `migrator` image |
| migrator.resources | object | `{"limits":{"cpu":"500m","memory":"100M"},"requests":{"cpu":"100m","memory":"50M"}}` | Resource requests & limits for the `migrator` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
| pgsql.auth.existingSecret | string | `""` | Name of existing secret to use for pgsql credentials This should match the setting in the sourcegraph chart values |
Expand Down
2 changes: 1 addition & 1 deletion charts/sourcegraph-migrator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ pgsql:
migrator:
image:
# -- Docker image tag for the `migrator` image
defaultTag: 5.2.1@sha256:283ed72b8757c9a4ed5136a88ab6dbf2904cbcea537f7778e8c6d5e4b2dd46e9
defaultTag: 5.2.2@sha256:24eb266b0f73d65c2dd249c110a415a027f8992433f6c07f2578b14e329a1b4c
# -- Docker image name for the `migrator` image
name: "migrator"
# -- Environment variables for the `migrator` container
Expand Down
3 changes: 3 additions & 0 deletions charts/sourcegraph/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ Use `**BREAKING**:` to denote a breaking change

## Unreleased

## 5.2.2

- Sourcegraph 5.2.2 is now available

## 5.2.1

Expand Down
4 changes: 2 additions & 2 deletions charts/sourcegraph/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ icon: https://sourcegraph.com/favicon.ico
type: application

# Chart version, separate from Sourcegraph
version: "5.2.1"
version: "5.2.2"

# Version of Sourcegraph release
appVersion: "5.2.1"
appVersion: "5.2.2"
Loading

0 comments on commit 19b5838

Please sign in to comment.