From 6b182e10f2163b993d73d6fc9fae022fcd571c90 Mon Sep 17 00:00:00 2001 From: Release Bot <107104610+sourcegraph-release-bot@users.noreply.github.com> Date: Tue, 24 Jun 2025 22:27:24 +0200 Subject: [PATCH 1/2] [Backport 6.5.x] Fix(release): promoteToPublic.finalize github:pr update main target bug (#287) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes REL-1069 ## Problem The release pipeline has been systematically failing in the `promoteToPublic.finalize` workflow with this error: ``` Warning: 1 uncommitted change must be on a branch named differently than 'promote/release-v6.4.3889-update-main' ``` ## Root Cause The final `github:pr` step in the `promoteToPublic.finalize` workflow was incorrectly trying to create a PR from the current branch to itself: - **Current branch**: `promote/release-{{version}}-update-main` - **Target branch**: `promote/release-{{version}}-update-main` ❌ (same branch!) - **Should target**: `main` ✅ This happened because the variable `internal_branch` was set to the current branch name instead of the intended target branch. ### Test plan This will have to be tested on a release
Backport 61f437607361d70d13ce74fc8ff5e9032b147dce from #286 Co-authored-by: Warren Gifford --- release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.yaml b/release.yaml index db0b1678..e323d6b9 100644 --- a/release.yaml +++ b/release.yaml @@ -398,11 +398,11 @@ promoteToPublic: - name: "github:pr" cmd: | set -eu - internal_branch="promote/release-{{version}}-update-main" + # Create PR to merge release updates into main branch gh pr create \ --fill \ --draft \ - --base "$internal_branch" \ + --base main \ --title "Update main: build {{version}}" \ --body "Test plan: automated release PR, CI will perform additional checks" echo "🚢 Please check the associated CI build to ensure the process completed". From e4d2198566065dbb71b6be1237835ed7050a6900 Mon Sep 17 00:00:00 2001 From: Jacob Pleiness Date: Wed, 25 Jun 2025 13:22:19 +0000 Subject: [PATCH 2/2] release_patch: v6.5.0 {"version":"v6.5.0","inputs":"server=v6.5.0","type":"patch"} --- base/monitoring/cadvisor/cadvisor.DaemonSet.yaml | 2 +- base/monitoring/grafana/grafana.StatefulSet.yaml | 2 +- base/monitoring/jaeger/jaeger.Deployment.yaml | 2 +- base/monitoring/node-exporter/node-exporter.DaemonSet.yaml | 2 +- base/monitoring/otel-collector/otel-agent.DaemonSet.yaml | 2 +- .../otel-collector/otel-collector.Deployment.yaml | 2 +- base/monitoring/prometheus/prometheus.Deployment.yaml | 2 +- base/sourcegraph/blobstore/blobstore.Deployment.yaml | 2 +- .../codeinsights-db/codeinsights-db.StatefulSet.yaml | 6 +++--- base/sourcegraph/codeintel-db/codeintel-db.StatefulSet.yaml | 6 +++--- .../frontend/sourcegraph-frontend.Deployment.yaml | 4 ++-- base/sourcegraph/gitserver/gitserver.StatefulSet.yaml | 2 +- .../indexed-search/indexed-search.StatefulSet.yaml | 4 ++-- base/sourcegraph/pgsql/pgsql.StatefulSet.yaml | 6 +++--- base/sourcegraph/precise-code-intel/worker.Deployment.yaml | 2 +- base/sourcegraph/redis/redis-cache.Deployment.yaml | 4 ++-- base/sourcegraph/redis/redis-store.Deployment.yaml | 4 ++-- base/sourcegraph/searcher/searcher.StatefulSet.yaml | 2 +- .../sourcegraph/syntactic-code-intel/worker.Deployment.yaml | 2 +- .../syntect-server/syntect-server.Deployment.yaml | 2 +- base/sourcegraph/worker/worker.Deployment.yaml | 2 +- components/executors/dind/executor.Deployment.yaml | 4 ++-- components/executors/k8s/executor.Deployment.yaml | 2 +- 23 files changed, 34 insertions(+), 34 deletions(-) diff --git a/base/monitoring/cadvisor/cadvisor.DaemonSet.yaml b/base/monitoring/cadvisor/cadvisor.DaemonSet.yaml index 38da1e2d..b2725359 100644 --- a/base/monitoring/cadvisor/cadvisor.DaemonSet.yaml +++ b/base/monitoring/cadvisor/cadvisor.DaemonSet.yaml @@ -26,7 +26,7 @@ spec: serviceAccountName: cadvisor containers: - name: cadvisor - image: index.docker.io/sourcegraph/cadvisor:6.2.1106@sha256:eaaec7063b5d692c77d7cb1e7e624b1ce2441db106b9ed4a478521406ae8d5bf + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/cadvisor:6.5.0@sha256:0f32689d4c255bdfa6d2707d2f6faebb234d2ba4b747469fa5d086373410b377 args: # Kubernetes-specific flags below (other flags are baked into the Docker image) # diff --git a/base/monitoring/grafana/grafana.StatefulSet.yaml b/base/monitoring/grafana/grafana.StatefulSet.yaml index dc2d154c..8b68b815 100644 --- a/base/monitoring/grafana/grafana.StatefulSet.yaml +++ b/base/monitoring/grafana/grafana.StatefulSet.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: grafana - image: index.docker.io/sourcegraph/grafana:6.2.1106@sha256:d0abf7879ffd0153394a1d5e2951ac23bc4138cabc0f0fd6ed2fd9eded7be215 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/grafana:6.5.0@sha256:6215785bf9c74964658ab559a5c2198c3462770482871f7e666ca1a8e0f719bb terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 3370 diff --git a/base/monitoring/jaeger/jaeger.Deployment.yaml b/base/monitoring/jaeger/jaeger.Deployment.yaml index 89796e7d..492e06e5 100644 --- a/base/monitoring/jaeger/jaeger.Deployment.yaml +++ b/base/monitoring/jaeger/jaeger.Deployment.yaml @@ -30,7 +30,7 @@ spec: spec: containers: - name: jaeger - image: index.docker.io/sourcegraph/jaeger-all-in-one:6.2.1106@sha256:c1ee8d613be75032066a9da24f54ebae19eacb63e42338e920abd6383ce168a6 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/jaeger-all-in-one:6.5.0@sha256:1587fbc95222b5810e8f946deeb9c0718b569af2c10fe8b681aaad07d2cfa610 args: ["--memory.max-traces=20000", "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json", "--collector.otlp.enabled"] ports: - containerPort: 5775 diff --git a/base/monitoring/node-exporter/node-exporter.DaemonSet.yaml b/base/monitoring/node-exporter/node-exporter.DaemonSet.yaml index bafea319..7e87ede1 100644 --- a/base/monitoring/node-exporter/node-exporter.DaemonSet.yaml +++ b/base/monitoring/node-exporter/node-exporter.DaemonSet.yaml @@ -24,7 +24,7 @@ spec: spec: containers: - name: node-exporter - image: index.docker.io/sourcegraph/node-exporter:6.2.1106@sha256:70f3e52fa04ae84cb865a4db9c9eacd4139e6988cc9775c3fac1e65063947661 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/node-exporter:6.5.0@sha256:e2ab2b6afc4f97f16c9a26915588e5c4858fd0632638753c76b2471a49166705 imagePullPolicy: IfNotPresent resources: limits: diff --git a/base/monitoring/otel-collector/otel-agent.DaemonSet.yaml b/base/monitoring/otel-collector/otel-agent.DaemonSet.yaml index 0c99ce1c..4f967073 100644 --- a/base/monitoring/otel-collector/otel-agent.DaemonSet.yaml +++ b/base/monitoring/otel-collector/otel-agent.DaemonSet.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: otel-agent - image: index.docker.io/sourcegraph/opentelemetry-collector:6.2.1106@sha256:7c748a36a25b165477f5633c2f92378c951d1f2310202b54da8725e97b4b77e4 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/opentelemetry-collector:6.5.0@sha256:e56c056bfac916eb8434d065c0a64ab981c31fe913f0ae5433067269d757bcf8 command: - "/bin/otelcol-sourcegraph" - "--config=/etc/otel-agent/config.yaml" diff --git a/base/monitoring/otel-collector/otel-collector.Deployment.yaml b/base/monitoring/otel-collector/otel-collector.Deployment.yaml index eb79f849..086fe9f4 100644 --- a/base/monitoring/otel-collector/otel-collector.Deployment.yaml +++ b/base/monitoring/otel-collector/otel-collector.Deployment.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: otel-collector - image: index.docker.io/sourcegraph/opentelemetry-collector:6.2.1106@sha256:7c748a36a25b165477f5633c2f92378c951d1f2310202b54da8725e97b4b77e4 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/opentelemetry-collector:6.5.0@sha256:e56c056bfac916eb8434d065c0a64ab981c31fe913f0ae5433067269d757bcf8 command: - "/bin/otelcol-sourcegraph" # To use a custom configuration, edit otel-collector.ConfigMap.yaml diff --git a/base/monitoring/prometheus/prometheus.Deployment.yaml b/base/monitoring/prometheus/prometheus.Deployment.yaml index f56bc83a..05ed78b2 100644 --- a/base/monitoring/prometheus/prometheus.Deployment.yaml +++ b/base/monitoring/prometheus/prometheus.Deployment.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: prometheus - image: index.docker.io/sourcegraph/prometheus:6.2.1106@sha256:9c0f2ad131654b2264736f34e7a291f69bfdf38c07bdc7e739ff58288d5898f7 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/prometheus:6.5.0@sha256:df361fb0c98513816b8e80bea52950bce63c4f38a96aa9e47b87176a0dec31e3 terminationMessagePolicy: FallbackToLogsOnError env: - name: SG_NAMESPACE diff --git a/base/sourcegraph/blobstore/blobstore.Deployment.yaml b/base/sourcegraph/blobstore/blobstore.Deployment.yaml index 134d301c..1658a0a6 100644 --- a/base/sourcegraph/blobstore/blobstore.Deployment.yaml +++ b/base/sourcegraph/blobstore/blobstore.Deployment.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: blobstore - image: index.docker.io/sourcegraph/blobstore:6.2.1106@sha256:65cbbc111884633406d0917e772924adaa53e122f4d67354179b51812beabbec + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/blobstore:6.5.0@sha256:4ce87fcdc809b55c7a3f52766d4d8fbc2a32368498a9ac4c602fed1f28c1143e livenessProbe: httpGet: path: / diff --git a/base/sourcegraph/codeinsights-db/codeinsights-db.StatefulSet.yaml b/base/sourcegraph/codeinsights-db/codeinsights-db.StatefulSet.yaml index a5b41669..74249d54 100644 --- a/base/sourcegraph/codeinsights-db/codeinsights-db.StatefulSet.yaml +++ b/base/sourcegraph/codeinsights-db/codeinsights-db.StatefulSet.yaml @@ -26,7 +26,7 @@ spec: spec: initContainers: - name: correct-data-dir-permissions - image: index.docker.io/sourcegraph/alpine-3.14:6.2.1106@sha256:9c9fef5b66e706103a6972feab18183f52c0efc8f1e2e32d8f4ffca196ef04fc + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/alpine-3.14:6.5.0@sha256:9c75ec365d3f104f1bb177e3ef68811c3c6271ae784ce1416505b31101a69e16 command: ["sh", "-c", "if [ -d /var/lib/postgresql/data/pgdata ]; then chmod 750 /var/lib/postgresql/data/pgdata; fi"] volumeMounts: - mountPath: /var/lib/postgresql/data/ @@ -45,7 +45,7 @@ spec: runAsUser: 70 containers: - name: codeinsights - image: index.docker.io/sourcegraph/postgresql-16-codeinsights:6.2.1106@sha256:5946147e89c36775a1b03a005db4cdd6b557fd01efca70a90ad8f28eaf6f6749 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16-codeinsights:6.5.0@sha256:9e1842aeef4d78d4b05f1299fdf62b323d5032f6768e69c6f49dcae0100f6bb2 env: - name: POSTGRES_DB value: postgres @@ -82,7 +82,7 @@ spec: value: postgres://postgres:@localhost:5432/?sslmode=disable - name: PG_EXPORTER_EXTEND_QUERY_PATH value: /config/code_insights_queries.yaml - image: index.docker.io/sourcegraph/postgres_exporter:6.2.1106@sha256:8b289f196018c54ead72552a02c3a29f14bf1e5e199065129f303db5d41aa653 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:6.5.0@sha256:57e4a3bd2e566afe31c23e7f802c75f782daf3e2360d16ad6d33ed6899799e1b terminationMessagePolicy: FallbackToLogsOnError name: pgsql-exporter ports: diff --git a/base/sourcegraph/codeintel-db/codeintel-db.StatefulSet.yaml b/base/sourcegraph/codeintel-db/codeintel-db.StatefulSet.yaml index 488dcdda..280a8746 100644 --- a/base/sourcegraph/codeintel-db/codeintel-db.StatefulSet.yaml +++ b/base/sourcegraph/codeintel-db/codeintel-db.StatefulSet.yaml @@ -27,7 +27,7 @@ spec: spec: initContainers: - name: correct-data-dir-permissions - image: index.docker.io/sourcegraph/alpine-3.14:6.2.1106@sha256:9c9fef5b66e706103a6972feab18183f52c0efc8f1e2e32d8f4ffca196ef04fc + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/alpine-3.14:6.5.0@sha256:9c75ec365d3f104f1bb177e3ef68811c3c6271ae784ce1416505b31101a69e16 command: ["sh", "-c", "if [ -d /data/pgdata-12 ]; then chmod 750 /data/pgdata-12; fi"] volumeMounts: - mountPath: /data @@ -45,7 +45,7 @@ spec: memory: "50Mi" containers: - name: pgsql - image: index.docker.io/sourcegraph/postgresql-16:6.2.1106@sha256:83bab9e63d9eaa7a9052e095af64983aab2c87fb11e6157f4f05fe95d8c22c32 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16:6.5.0@sha256:f243676c3222d9bd228cbbbde964ba84d996fe509cf55d1e4301b9f2863cbbbe terminationMessagePolicy: FallbackToLogsOnError readinessProbe: exec: @@ -87,7 +87,7 @@ spec: value: postgres://sg:@localhost:5432/?sslmode=disable - name: PG_EXPORTER_EXTEND_QUERY_PATH value: /config/code_intel_queries.yaml - image: index.docker.io/sourcegraph/postgres_exporter:6.2.1106@sha256:8b289f196018c54ead72552a02c3a29f14bf1e5e199065129f303db5d41aa653 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:6.5.0@sha256:57e4a3bd2e566afe31c23e7f802c75f782daf3e2360d16ad6d33ed6899799e1b terminationMessagePolicy: FallbackToLogsOnError name: pgsql-exporter ports: diff --git a/base/sourcegraph/frontend/sourcegraph-frontend.Deployment.yaml b/base/sourcegraph/frontend/sourcegraph-frontend.Deployment.yaml index e10ee28e..74685367 100644 --- a/base/sourcegraph/frontend/sourcegraph-frontend.Deployment.yaml +++ b/base/sourcegraph/frontend/sourcegraph-frontend.Deployment.yaml @@ -29,7 +29,7 @@ spec: spec: initContainers: - name: migrator - image: index.docker.io/sourcegraph/migrator:6.2.1106@sha256:ece1a5718e04ed24c08d6729bf3a017e395fa961a232bbcb1193104914e0c476 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/migrator:6.5.0@sha256:786740b87e837be672095b7002c28c53f3f479f3f47b780049c31d00f175ea5d args: ["up"] resources: limits: @@ -48,7 +48,7 @@ spec: name: sourcegraph-frontend-env containers: - name: frontend - image: index.docker.io/sourcegraph/frontend:6.2.1106@sha256:025a8f66d15cc33cc155dbb995d111a29e65d5fe338a62df8fe4cf012db06788 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/frontend:6.5.0@sha256:8035d2f1c3ac4a9cf57e747aebb0561c37181ac325bdb8fe63a896eaceda26a1 args: - serve envFrom: diff --git a/base/sourcegraph/gitserver/gitserver.StatefulSet.yaml b/base/sourcegraph/gitserver/gitserver.StatefulSet.yaml index f36d5238..1914c291 100644 --- a/base/sourcegraph/gitserver/gitserver.StatefulSet.yaml +++ b/base/sourcegraph/gitserver/gitserver.StatefulSet.yaml @@ -35,7 +35,7 @@ spec: fieldPath: status.hostIP - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_AGENT_HOST):4317 - image: index.docker.io/sourcegraph/gitserver:6.2.1106@sha256:386d08fa31656d91eda243211b8f3765e86891ba4c59b8d8f8c9675dc0154fee + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/gitserver:6.5.0@sha256:997005156097a5ebea570ff1843ce3c706715bce60fb7d46140729f5994ad956 terminationMessagePolicy: FallbackToLogsOnError # Temporary: when migrating from repo names to repo IDs on disk, # gitserver can take a little while to start up. To avoid killing the diff --git a/base/sourcegraph/indexed-search/indexed-search.StatefulSet.yaml b/base/sourcegraph/indexed-search/indexed-search.StatefulSet.yaml index 8e1b17ce..d6af22c1 100644 --- a/base/sourcegraph/indexed-search/indexed-search.StatefulSet.yaml +++ b/base/sourcegraph/indexed-search/indexed-search.StatefulSet.yaml @@ -33,7 +33,7 @@ spec: value: http://$(OTEL_AGENT_HOST):4317 - name: OPENTELEMETRY_DISABLED value: "false" - image: index.docker.io/sourcegraph/indexed-searcher:6.2.1106@sha256:8d65ad2ea2a5d96de2b97a1a44dba440c4ba86af8db23c347b9e2866a7e67f38 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/indexed-searcher:6.5.0@sha256:9118fab57ba899c810098bd910ee8d0e524546b98a1ab945941424353425b6c5 terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 6070 @@ -72,7 +72,7 @@ spec: value: http://$(OTEL_AGENT_HOST):4317 - name: OPENTELEMETRY_DISABLED value: "false" - image: index.docker.io/sourcegraph/search-indexer:6.2.1106@sha256:5fa8876a85928f4df48c9d86cd010d5a7d14df2c7fe3d48e49b7f9ca5f7e54a0 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/search-indexer:6.5.0@sha256:efac3d06e6fad1662c23e9171ed52998239438cf0cf08f5264fcaa15c462f2dd terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 6072 diff --git a/base/sourcegraph/pgsql/pgsql.StatefulSet.yaml b/base/sourcegraph/pgsql/pgsql.StatefulSet.yaml index 0e28ed1f..355d30d0 100644 --- a/base/sourcegraph/pgsql/pgsql.StatefulSet.yaml +++ b/base/sourcegraph/pgsql/pgsql.StatefulSet.yaml @@ -27,7 +27,7 @@ spec: spec: initContainers: - name: correct-data-dir-permissions - image: index.docker.io/sourcegraph/alpine-3.14:6.2.1106@sha256:9c9fef5b66e706103a6972feab18183f52c0efc8f1e2e32d8f4ffca196ef04fc + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/alpine-3.14:6.5.0@sha256:9c75ec365d3f104f1bb177e3ef68811c3c6271ae784ce1416505b31101a69e16 command: ["sh", "-c", "if [ -d /data/pgdata-12 ]; then chmod 750 /data/pgdata-12; fi"] volumeMounts: - mountPath: /data @@ -46,7 +46,7 @@ spec: memory: "50Mi" containers: - name: pgsql - image: index.docker.io/sourcegraph/postgresql-16:6.2.1106@sha256:83bab9e63d9eaa7a9052e095af64983aab2c87fb11e6157f4f05fe95d8c22c32 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16:6.5.0@sha256:f243676c3222d9bd228cbbbde964ba84d996fe509cf55d1e4301b9f2863cbbbe terminationMessagePolicy: FallbackToLogsOnError readinessProbe: exec: @@ -90,7 +90,7 @@ spec: value: postgres://sg:@localhost:5432/?sslmode=disable - name: PG_EXPORTER_EXTEND_QUERY_PATH value: /config/queries.yaml - image: index.docker.io/sourcegraph/postgres_exporter:6.2.1106@sha256:8b289f196018c54ead72552a02c3a29f14bf1e5e199065129f303db5d41aa653 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:6.5.0@sha256:57e4a3bd2e566afe31c23e7f802c75f782daf3e2360d16ad6d33ed6899799e1b terminationMessagePolicy: FallbackToLogsOnError name: pgsql-exporter ports: diff --git a/base/sourcegraph/precise-code-intel/worker.Deployment.yaml b/base/sourcegraph/precise-code-intel/worker.Deployment.yaml index 792d6de5..e3e388a3 100644 --- a/base/sourcegraph/precise-code-intel/worker.Deployment.yaml +++ b/base/sourcegraph/precise-code-intel/worker.Deployment.yaml @@ -46,7 +46,7 @@ spec: fieldPath: status.hostIP - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_AGENT_HOST):4317 - image: index.docker.io/sourcegraph/precise-code-intel-worker:6.2.1106@sha256:f43dad61709c87c02bc0d3b43f1419529d76d0035362b5859b79a284191fcbe6 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/precise-code-intel-worker:6.5.0@sha256:138f2e8278ec2180b334634a75bc494a17a8f0ad6fa07131ac83507ead167198 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/base/sourcegraph/redis/redis-cache.Deployment.yaml b/base/sourcegraph/redis/redis-cache.Deployment.yaml index a1bb201a..0d1d897f 100644 --- a/base/sourcegraph/redis/redis-cache.Deployment.yaml +++ b/base/sourcegraph/redis/redis-cache.Deployment.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: redis-cache - image: index.docker.io/sourcegraph/redis-cache:6.2.1106@sha256:57b3318d4587f66582bf9c02756c67460e6c3d809aa0763f30cac18609cdbecc + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-cache:6.5.0@sha256:ece3395b4bb5263be58fda8da466331e8a4b6cef970bfbd15a33e36835aae9bb terminationMessagePolicy: FallbackToLogsOnError livenessProbe: initialDelaySeconds: 30 @@ -70,7 +70,7 @@ spec: - mountPath: /redis-data name: redis-data - name: redis-exporter - image: index.docker.io/sourcegraph/redis_exporter:6.2.1106@sha256:5974c85aae470ecd7c565862a16592887f4d111a28ef0e3bb1e400323540a397 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis_exporter:6.5.0@sha256:a4513fb9f61d9440b089c5bc0c2a31b9c1c18cb96bfefd8c0ccd731ded3a680e terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 9121 diff --git a/base/sourcegraph/redis/redis-store.Deployment.yaml b/base/sourcegraph/redis/redis-store.Deployment.yaml index fc7d2281..9e37f81c 100644 --- a/base/sourcegraph/redis/redis-store.Deployment.yaml +++ b/base/sourcegraph/redis/redis-store.Deployment.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: redis-store - image: index.docker.io/sourcegraph/redis-store:6.2.1106@sha256:74ce6130fa0e11e4c853129f24bcba6a4044def3d18f86e389b3064ec2193175 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-store:6.5.0@sha256:a896db19bc41918853e4023b370bcfe93cfa4711834035bf76618da4e94e4185 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: initialDelaySeconds: 30 @@ -69,7 +69,7 @@ spec: - mountPath: /redis-data name: redis-data - name: redis-exporter - image: index.docker.io/sourcegraph/redis_exporter:6.2.1106@sha256:5974c85aae470ecd7c565862a16592887f4d111a28ef0e3bb1e400323540a397 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis_exporter:6.5.0@sha256:a4513fb9f61d9440b089c5bc0c2a31b9c1c18cb96bfefd8c0ccd731ded3a680e terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 9121 diff --git a/base/sourcegraph/searcher/searcher.StatefulSet.yaml b/base/sourcegraph/searcher/searcher.StatefulSet.yaml index 4c16d459..388ddc5a 100644 --- a/base/sourcegraph/searcher/searcher.StatefulSet.yaml +++ b/base/sourcegraph/searcher/searcher.StatefulSet.yaml @@ -46,7 +46,7 @@ spec: fieldPath: status.hostIP - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_AGENT_HOST):4317 - image: index.docker.io/sourcegraph/searcher:6.2.1106@sha256:026fca70bfe2f2a91e867877a01f962adf3948a1cc5512c216ec45a5e41f164b + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/searcher:6.5.0@sha256:a3f2f542fc41ad7a7330d8d748b8d0978e935e486f3740eb1afe8047fd08b821 terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 3181 diff --git a/base/sourcegraph/syntactic-code-intel/worker.Deployment.yaml b/base/sourcegraph/syntactic-code-intel/worker.Deployment.yaml index 4dd5b1d8..fbf53968 100644 --- a/base/sourcegraph/syntactic-code-intel/worker.Deployment.yaml +++ b/base/sourcegraph/syntactic-code-intel/worker.Deployment.yaml @@ -39,7 +39,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name - image: index.docker.io/sourcegraph/syntactic-code-intel-worker:6.0.0@sha256:50bdeb38b196f0fc21404969016bf8263f78144292e905867e93480f66c8251c + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/syntactic-code-intel-worker:6.5.0@sha256:22f85548fbaae57ff15040863d180ad4b727f98a02f415206bc5fd651630919b terminationMessagePath: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/base/sourcegraph/syntect-server/syntect-server.Deployment.yaml b/base/sourcegraph/syntect-server/syntect-server.Deployment.yaml index d4aada4f..994150b8 100644 --- a/base/sourcegraph/syntect-server/syntect-server.Deployment.yaml +++ b/base/sourcegraph/syntect-server/syntect-server.Deployment.yaml @@ -32,7 +32,7 @@ spec: allowPrivilegeEscalation: false runAsGroup: 101 runAsUser: 100 - image: index.docker.io/sourcegraph/syntax-highlighter:6.2.1106@sha256:d44d14de2484019ee2a4f0c31d4000613fb299fc9447ec71f0e164224c176cd5 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/syntax-highlighter:6.5.0@sha256:e902afe4dd0d73bd355a0e5dc6385e41ba698332e4702093ac6661e0a4f9b465 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/base/sourcegraph/worker/worker.Deployment.yaml b/base/sourcegraph/worker/worker.Deployment.yaml index 7abfc40d..0ddb8aee 100644 --- a/base/sourcegraph/worker/worker.Deployment.yaml +++ b/base/sourcegraph/worker/worker.Deployment.yaml @@ -48,7 +48,7 @@ spec: fieldPath: status.hostIP - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_AGENT_HOST):4317 - image: index.docker.io/sourcegraph/worker:6.2.1106@sha256:fd6be67ea22f842246dbe81f64a60db027e5202f0ce863a0be4a82b12f908620 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/worker:6.5.0@sha256:ecb7582d6eb77bf332d51f5f06afa3853a3004e810e3089ab6478b695066b8ad terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/components/executors/dind/executor.Deployment.yaml b/components/executors/dind/executor.Deployment.yaml index 624c6938..c1825ad3 100644 --- a/components/executors/dind/executor.Deployment.yaml +++ b/components/executors/dind/executor.Deployment.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: executor - image: index.docker.io/sourcegraph/executor:6.2.1106@sha256:1363cce32f2002594cad461380b223670e17de1f4466edee956a3404c7bbd172 + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/executor:6.5.0@sha256:f71acb94a11a9b4122424495ef9a5c260cd77677846a3b5122808a2d2da9fb84 imagePullPolicy: Always livenessProbe: exec: @@ -60,7 +60,7 @@ spec: - mountPath: /scratch name: executor-scratch - name: dind - image: index.docker.io/sourcegraph/dind:6.2.1106@sha256:c64b5efff14ccd82cd6957283b116ef195d374ec911ea7fe56787b93143810fd + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/dind:6.5.0@sha256:fcafb144744473ac4468090e7be033237d6d5ad1e0c1eb14bbd3f74abfd6a10c imagePullPolicy: Always securityContext: privileged: true diff --git a/components/executors/k8s/executor.Deployment.yaml b/components/executors/k8s/executor.Deployment.yaml index 1fc0277b..e3839361 100644 --- a/components/executors/k8s/executor.Deployment.yaml +++ b/components/executors/k8s/executor.Deployment.yaml @@ -29,7 +29,7 @@ spec: serviceAccountName: executor containers: - name: executor - image: index.docker.io/sourcegraph/executor-kubernetes:6.2.1106@sha256:6b9967ae0a57ccd54bb85347929692f709f921880e1ee4366f5114d8d6f0b59c + image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/executor-kubernetes:6.5.0@sha256:eacd42d652f6bc37edd669fea3fc5527e7c4ed8e1985c60e92b8d125762c7409 imagePullPolicy: Always livenessProbe: exec: