Skip to content
This repository was archived by the owner on Jun 9, 2025. It is now read-only.

Commit 49857cc

Browse files
DaedalusGDaedalusG
committed
resolve merge conflicts
2 parents 20d223d + cc6bfea commit 49857cc

20 files changed

+114
-0
lines changed

‎.github/workflows/backport.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Backport
2+
on:
3+
pull_request_target:
4+
types:
5+
- closed
6+
- labeled
7+
8+
jobs:
9+
backport:
10+
name: Backport
11+
runs-on: ubuntu-latest
12+
# Only react to merged PRs for security reasons.
13+
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
14+
if: >
15+
github.event.pull_request.merged
16+
&& (
17+
github.event.action == 'closed'
18+
|| (
19+
github.event.action == 'labeled'
20+
&& contains(github.event.label.name, 'backport')
21+
)
22+
)
23+
steps:
24+
- uses: sourcegraph/backport@v2
25+
with:
26+
github_token: ${{ secrets.BACKPORT_GITHUB_TOKEN }}

‎base/redis/redis-cache.Deployment.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ spec:
2626
spec:
2727
containers:
2828
- name: redis-cache
29+
<<<<<<< HEAD
2930
image: index.docker.io/sourcegraph/redis-cache:5.9.1590@sha256:aca0a5616ef20c955aeca2e71034e0d4dd65e899716cdc08d72ef1ce1fa9564f
31+
=======
32+
image: index.docker.io/sourcegraph/redis-cache:5.9.347@sha256:a9ff1251eb3c4e8934516bb7266eb131b8ef2a8cc715a1841baea4bedce75341
33+
>>>>>>> main
3034
terminationMessagePolicy: FallbackToLogsOnError
3135
livenessProbe:
3236
initialDelaySeconds: 30
@@ -66,7 +70,11 @@ spec:
6670
- mountPath: /redis-data
6771
name: redis-data
6872
- name: redis-exporter
73+
<<<<<<< HEAD
6974
image: index.docker.io/sourcegraph/redis_exporter:5.9.1590@sha256:8b05fb7f8ff16aa68d05ef6750672fe2a4a9c2358d9b91a10db1327bd5d0cac1
75+
=======
76+
image: index.docker.io/sourcegraph/redis_exporter:5.9.347@sha256:f5f1b1e78c6812b91185418c38497930eed16fd5d0633518ef5c73d6a98c1f1f
77+
>>>>>>> main
7078
terminationMessagePolicy: FallbackToLogsOnError
7179
ports:
7280
- containerPort: 9121

‎base/redis/redis-store.Deployment.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ spec:
2525
spec:
2626
containers:
2727
- name: redis-store
28+
<<<<<<< HEAD
2829
image: index.docker.io/sourcegraph/redis-store:5.9.1590@sha256:d7d8b5cd4d784b6f8025941701f6db95e0d3ea263e165b611295d30bdc0e6e60
30+
=======
31+
image: index.docker.io/sourcegraph/redis-store:5.9.347@sha256:2364359b9fdeb53e25831e0ff3783867a74333c6cc4df4f5d272e3eb87356cd1
32+
>>>>>>> main
2933
terminationMessagePolicy: FallbackToLogsOnError
3034
livenessProbe:
3135
initialDelaySeconds: 30
@@ -65,7 +69,11 @@ spec:
6569
- mountPath: /redis-data
6670
name: redis-data
6771
- name: redis-exporter
72+
<<<<<<< HEAD
6873
image: index.docker.io/sourcegraph/redis_exporter:5.9.1590@sha256:8b05fb7f8ff16aa68d05ef6750672fe2a4a9c2358d9b91a10db1327bd5d0cac1
74+
=======
75+
image: index.docker.io/sourcegraph/redis_exporter:5.9.347@sha256:f5f1b1e78c6812b91185418c38497930eed16fd5d0633518ef5c73d6a98c1f1f
76+
>>>>>>> main
6977
terminationMessagePolicy: FallbackToLogsOnError
7078
ports:
7179
- containerPort: 9121

‎base/repo-updater/repo-updater.Deployment.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ spec:
2929
spec:
3030
containers:
3131
- name: repo-updater
32+
<<<<<<< HEAD
3233
image: index.docker.io/sourcegraph/repo-updater:5.9.1590@sha256:d8ec1e1487ed803d07f9fb0dfa2db0a4a637871fa7ba778378749a398de724d9
34+
=======
35+
image: index.docker.io/sourcegraph/repo-updater:5.9.347@sha256:093e0e0e9f717bd26b3309a59d69238e5ae8caf60b84f11c4d49a4ffb5437db5
36+
>>>>>>> main
3337
env:
3438
# OTEL_AGENT_HOST must be defined before OTEL_EXPORTER_OTLP_ENDPOINT to substitute the node IP on which the DaemonSet pod instance runs in the latter variable
3539
- name: OTEL_AGENT_HOST

‎base/searcher/searcher.Deployment.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ spec:
4949
fieldPath: status.hostIP
5050
- name: OTEL_EXPORTER_OTLP_ENDPOINT
5151
value: http://$(OTEL_AGENT_HOST):4317
52+
<<<<<<< HEAD
5253
image: index.docker.io/sourcegraph/searcher:5.9.1590@sha256:76173ca0542622c390c5ae2af2cf8e40a9b175f01dc4a9c931285ac2cfd88854
54+
=======
55+
image: index.docker.io/sourcegraph/searcher:5.9.347@sha256:6ef2e798c158a8129f1a6a4206ec4eff31b6f4bbf2a52ef22ecdd6e64fa013b7
56+
>>>>>>> main
5357
terminationMessagePolicy: FallbackToLogsOnError
5458
ports:
5559
- containerPort: 3181

‎base/symbols/symbols.Deployment.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ spec:
4949
fieldPath: status.hostIP
5050
- name: OTEL_EXPORTER_OTLP_ENDPOINT
5151
value: http://$(OTEL_AGENT_HOST):4317
52+
<<<<<<< HEAD
5253
image: index.docker.io/sourcegraph/symbols:5.9.1590@sha256:f4c570b42fbdedc132010c94f1d20fa286c09b255b4bc57e51885b41dd4ea886
54+
=======
55+
image: index.docker.io/sourcegraph/symbols:5.9.347@sha256:ed5f4c5db70dd0f256f332f30a93b91c0d32de0686b531c7b377f1da33d3bc42
56+
>>>>>>> main
5357
terminationMessagePolicy: FallbackToLogsOnError
5458
livenessProbe:
5559
httpGet:

‎base/syntect-server/syntect-server.Deployment.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ spec:
2929
containers:
3030
- name: syntect-server
3131
env:
32+
<<<<<<< HEAD
3233
image: index.docker.io/sourcegraph/syntax-highlighter:5.9.1590@sha256:7a15d6fd63d0d6a39f9066209f3c406674b41cf1d365e172cc30cd877e7c0885
34+
=======
35+
image: index.docker.io/sourcegraph/syntax-highlighter:5.9.347@sha256:068144989c8afa62db3dcb45bc86697f6da84e376ac42d4c25b794c2b8b3c97c
36+
>>>>>>> main
3337
terminationMessagePolicy: FallbackToLogsOnError
3438
livenessProbe:
3539
httpGet:

‎base/worker/worker.Deployment.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ spec:
4444
fieldPath: status.hostIP
4545
- name: OTEL_EXPORTER_OTLP_ENDPOINT
4646
value: http://$(OTEL_AGENT_HOST):4317
47+
<<<<<<< HEAD
4748
image: index.docker.io/sourcegraph/worker:5.9.1590@sha256:b258021d297a7a562982a5606507d4e4ddb27ebe010f3fdbbda20ab7f0a9f4fc
49+
=======
50+
image: index.docker.io/sourcegraph/worker:5.9.347@sha256:b4b01b6ee35420743ac2c7492d19e0479d151be84b850c96bc96a52a88e2f1dd
51+
>>>>>>> main
4852
envFrom:
4953
- configMapRef:
5054
name: embeddings-backend

‎configure/executors/dind/executor.Deployment.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ spec:
2828
spec:
2929
containers:
3030
- name: executor
31+
<<<<<<< HEAD
3132
image: index.docker.io/sourcegraph/executor:5.9.1590@sha256:131141c304cceadcfe7afbe73f909d1202c39140225e3e9476963ffbd9eb3214
33+
=======
34+
image: index.docker.io/sourcegraph/executor:5.9.347@sha256:1fd0a18a6ee868f683f7307489c872650f21fb0894a83aef203702ad68d959fc
35+
>>>>>>> main
3236
imagePullPolicy: Always
3337
livenessProbe:
3438
exec:
@@ -67,7 +71,11 @@ spec:
6771
- mountPath: /scratch
6872
name: executor-scratch
6973
- name: dind
74+
<<<<<<< HEAD
7075
image: index.docker.io/sourcegraph/dind:5.9.1590@sha256:c62ec47598121a42d0fd58ed03b38e564616db19b2bbb205d55e2d604e3b9a67
76+
=======
77+
image: index.docker.io/sourcegraph/dind:5.9.347@sha256:767c8e7b60ab71957a500745155ca0a3c6f5e96083e101c6497526413314d07f
78+
>>>>>>> main
7179
imagePullPolicy: Always
7280
securityContext:
7381
privileged: true

‎configure/executors/k8s/executor.Deployment.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ spec:
2929
serviceAccountName: executor
3030
containers:
3131
- name: executor
32+
<<<<<<< HEAD
3233
image: index.docker.io/sourcegraph/executor-kubernetes:5.9.1590@sha256:0100406b8647f1f1f7959168871ab78ed6cfbf1d7df62bf201de0bd58bf835f9
34+
=======
35+
image: index.docker.io/sourcegraph/executor-kubernetes:5.9.347@sha256:f393592d65e5058fb265e281ca8acb8e9f2bddc8d91b48d28d78490515505797
36+
>>>>>>> main
3337
imagePullPolicy: Always
3438
livenessProbe:
3539
exec:

0 commit comments

Comments
 (0)