Skip to content

Commit 0cf1b21

Browse files
DaedalusGDaedalusG
committed
missed in merge
1 parent 15ce2c0 commit 0cf1b21

File tree

13 files changed

+0
-284
lines changed

13 files changed

+0
-284
lines changed

‎charts/sourcegraph-executor/dind/Chart.yaml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ icon: https://sourcegraph.com/favicon.ico
55
type: application
66

77
# Chart version, separate from Sourcegraph
8-
<<<<<<< HEAD
98
version: "5.10.3940"
109

1110
# Version of Sourcegraph release
1211
appVersion: "5.10.3940"
13-
=======
14-
version: "5.10.2832"
15-
16-
# Version of Sourcegraph release
17-
appVersion: "5.10.2832"
18-
>>>>>>> main

‎charts/sourcegraph-executor/dind/README.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ In addition to the documented values, the `executor` and `private-docker-registr
6060
| executor.env.EXECUTOR_FRONTEND_URL | object | `{"value":""}` | The external URL of the Sourcegraph instance. Required. |
6161
| 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.** |
6262
| 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.** |
63-
<<<<<<< HEAD
6463
| executor.image.defaultTag | string | `"5.10.3940@sha256:80c08159abe59e5c914c8038533a93cb78c90b3f9285d5319431fb334506eaa0"` | |
65-
=======
66-
| executor.image.defaultTag | string | `"5.10.2832@sha256:f47dfe9663f316cb224f401f6be3bbf96ae4f3bbd379fb4322f5ff5fca31b40b"` | |
67-
>>>>>>> main
6864
| executor.image.name | string | `"executor"` | |
6965
| executor.replicaCount | int | `1` | |
7066
| 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 |

‎charts/sourcegraph-executor/dind/values.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,7 @@ storageClass:
5555
executor:
5656
enabled: true
5757
image:
58-
<<<<<<< HEAD
5958
defaultTag: 5.10.3940@sha256:80c08159abe59e5c914c8038533a93cb78c90b3f9285d5319431fb334506eaa0
60-
=======
61-
defaultTag: 5.10.2832@sha256:f47dfe9663f316cb224f401f6be3bbf96ae4f3bbd379fb4322f5ff5fca31b40b
62-
>>>>>>> main
6359
name: "executor"
6460
replicaCount: 1
6561
env:

‎charts/sourcegraph-executor/k8s/Chart.yaml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ icon: https://sourcegraph.com/favicon.ico
55
type: application
66

77
# Chart version, separate from Sourcegraph
8-
<<<<<<< HEAD
98
version: "5.10.3940"
109

1110
# Version of Sourcegraph release
1211
appVersion: "5.10.3940"
13-
=======
14-
version: "5.10.2832"
15-
16-
# Version of Sourcegraph release
17-
appVersion: "5.10.2832"
18-
>>>>>>> main

‎charts/sourcegraph-executor/k8s/README.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ In addition to the documented values, the `executor` and `private-docker-registr
6161
| executor.frontendExistingSecret | string | `""` | Name of existing k8s Secret to use for frontend password The name of the secret must match `executor.name`, i.e., the name of the helm release used to deploy the helm chart. The k8s Secret must contain the key `EXECUTOR_FRONTEND_PASSWORD` matching the site config `executors.accessToken` value. `executor.frontendPassword` is ignored if this is enabled. |
6262
| executor.frontendPassword | string | `""` | The shared secret configured in the Sourcegraph instance site config under executors.accessToken. Required if `executor.frontendExistingSecret`` is not configured. |
6363
| 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. |
64-
<<<<<<< HEAD
6564
| executor.image.defaultTag | string | `"5.10.3940@sha256:23cc0391d590136dbddc45c1f446cc1dad5364dc916428470b5e184535ad7716"` | |
66-
=======
67-
| executor.image.defaultTag | string | `"5.10.2832@sha256:abf9c89453bf0a603cb0ba293e32e35e1550504f21a5bf93007f902bef7ff313"` | |
68-
>>>>>>> main
6965
| executor.image.name | string | `"executor-kubernetes"` | |
7066
| executor.kubeconfigPath | string | `""` | The path to the kubeconfig file. If not specified, the in-cluster config is used. |
7167
| executor.kubernetesJob.deadline | string | `"1200"` | The number of seconds after which a Kubernetes job will be terminated. |

‎charts/sourcegraph-executor/k8s/values.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ executor:
5757
configureRbac: true
5858
replicas: 1
5959
image:
60-
<<<<<<< HEAD
6160
defaultTag: 5.10.3940@sha256:23cc0391d590136dbddc45c1f446cc1dad5364dc916428470b5e184535ad7716
62-
=======
63-
defaultTag: 5.10.2832@sha256:abf9c89453bf0a603cb0ba293e32e35e1550504f21a5bf93007f902bef7ff313
64-
>>>>>>> main
6561
name: "executor-kubernetes"
6662
# -- 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).
6763
# This will avoid unnecessary network charges as traffic will stay within the local network.

‎charts/sourcegraph-migrator/Chart.yaml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ icon: https://sourcegraph.com/favicon.ico
55
type: application
66

77
# Chart version, separate from Sourcegraph
8-
<<<<<<< HEAD
98
version: "5.10.3940"
109

1110
# Version of Sourcegraph release
1211
appVersion: "5.10.3940"
13-
=======
14-
version: "5.10.2832"
15-
16-
# Version of Sourcegraph release
17-
appVersion: "5.10.2832"
18-
>>>>>>> main

‎charts/sourcegraph-migrator/README.md‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ You should consult the list of available [migrator commands]. Below is some exam
4242
- Perform initial migrations against external PostgreSQL databases prior to the Sourcegraph deployment
4343

4444
```sh
45-
<<<<<<< HEAD
4645
helm upgrade --install -f <your-override-file.yaml> --version 5.10.3940 sg-migrator sourcegraph/sourcegraph-migrator
47-
=======
48-
helm upgrade --install -f <your-override-file.yaml> --version 5.10.2832 sg-migrator sourcegraph/sourcegraph-migrator
49-
>>>>>>> main
5046
```
5147

5248
### Add a migration log entry
@@ -56,11 +52,7 @@ helm upgrade --install -f <your-override-file.yaml> --version 5.10.2832 sg-migra
5652
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].
5753

5854
```sh
59-
<<<<<<< HEAD
6055
helm upgrade --install -f <your-override-file.yaml> --set "migrator.args={add-log,-db=frontend,-version=1528395834}" --version 5.10.3940 sg-migrator sourcegraph/sourcegraph-migrator
61-
=======
62-
helm upgrade --install -f <your-override-file.yaml> --set "migrator.args={add-log,-db=frontend,-version=1528395834}" --version 5.10.2832 sg-migrator sourcegraph/sourcegraph-migrator
63-
>>>>>>> main
6456
```
6557

6658
## Rendering manifests for kubectl deployment
@@ -88,11 +80,7 @@ In addition to the documented values, the `migrator` service also supports the f
8880
| 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 |
8981
| 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) |
9082
| migrator.env | object | `{}` | Environment variables for the `migrator` container |
91-
<<<<<<< HEAD
9283
| migrator.image.defaultTag | string | `"5.10.3940@sha256:18bc4067db041fc645fdadc8f21aed7e15ebd1a1fc976b3bb5365ef757ce9cd4"` | Docker image tag for the `migrator` image |
93-
=======
94-
| migrator.image.defaultTag | string | `"5.10.2832@sha256:4f5e69016f947211ef7d14e88df091550a6472f5281b025f08d234d8acc0d993"` | Docker image tag for the `migrator` image |
95-
>>>>>>> main
9684
| migrator.image.name | string | `"migrator"` | Docker image name for the `migrator` image |
9785
| 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/) |
9886
| pgsql.auth.existingSecret | string | `""` | Name of existing secret to use for pgsql credentials This should match the setting in the sourcegraph chart values |

‎charts/sourcegraph-migrator/values.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,7 @@ pgsql:
102102
migrator:
103103
image:
104104
# -- Docker image tag for the `migrator` image
105-
<<<<<<< HEAD
106105
defaultTag: 5.10.3940@sha256:18bc4067db041fc645fdadc8f21aed7e15ebd1a1fc976b3bb5365ef757ce9cd4
107-
=======
108-
defaultTag: 5.10.2832@sha256:4f5e69016f947211ef7d14e88df091550a6472f5281b025f08d234d8acc0d993
109-
>>>>>>> main
110106
# -- Docker image name for the `migrator` image
111107
name: "migrator"
112108
# -- Environment variables for the `migrator` container

‎charts/sourcegraph/Chart.yaml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ icon: https://sourcegraph.com/favicon.ico
55
type: application
66

77
# Chart version, separate from Sourcegraph
8-
<<<<<<< HEAD
98
version: "5.10.3940"
109

1110
# Version of Sourcegraph release
1211
appVersion: "5.10.3940"
13-
=======
14-
version: "5.10.2832"
15-
16-
# Version of Sourcegraph release
17-
appVersion: "5.10.2832"
18-
>>>>>>> main

0 commit comments

Comments
 (0)