From ede98af1f6308b6d9c50e7bd2686a7cb23f59cf7 Mon Sep 17 00:00:00 2001 From: Adi Ranjan Date: Wed, 5 Mar 2025 22:39:16 +0000 Subject: [PATCH] promote-release: v6.1.2889 {"version":"v6.1.2889","inputs":"server=6.1.2889","type":"patch"} --- base/blobstore/blobstore.Deployment.yaml | 2 +- base/cadvisor/cadvisor.DaemonSet.yaml | 2 +- base/codeinsights-db/codeinsights-db.Deployment.yaml | 6 +++--- base/codeintel-db/codeintel-db.Deployment.yaml | 6 +++--- base/frontend/sourcegraph-frontend.Deployment.yaml | 4 ++-- base/gitserver/gitserver.StatefulSet.yaml | 2 +- base/grafana/grafana.StatefulSet.yaml | 2 +- base/indexed-search/indexed-search.StatefulSet.yaml | 4 ++-- base/node-exporter/node-exporter.DaemonSet.yaml | 2 +- base/otel-collector/otel-agent.DaemonSet.yaml | 2 +- base/otel-collector/otel-collector.Deployment.yaml | 2 +- base/pgsql/pgsql.Deployment.yaml | 6 +++--- base/precise-code-intel/worker.Deployment.yaml | 2 +- base/prometheus/prometheus.Deployment.yaml | 2 +- base/redis/redis-cache.Deployment.yaml | 4 ++-- base/redis/redis-store.Deployment.yaml | 4 ++-- base/repo-updater/repo-updater.Deployment.yaml | 2 +- base/searcher/searcher.Deployment.yaml | 2 +- base/symbols/symbols.Deployment.yaml | 2 +- base/syntect-server/syntect-server.Deployment.yaml | 2 +- base/worker/worker.Deployment.yaml | 2 +- configure/executors/dind/executor.Deployment.yaml | 4 ++-- configure/executors/k8s/executor.Deployment.yaml | 2 +- configure/migrator/migrator.Job.yaml | 2 +- overlays/jaeger/jaeger.Deployment.yaml | 2 +- .../blobstore/blobstore.Deployment.yaml | 2 +- .../gitserver/gitserver.StatefulSet.yaml | 2 +- .../grafana/grafana.StatefulSet.yaml | 2 +- .../indexed-search/indexed-search.StatefulSet.yaml | 2 +- .../prometheus/prometheus.Deployment.yaml | 2 +- .../redis/redis-cache.Deployment.yaml | 2 +- .../redis/redis-store.Deployment.yaml | 2 +- .../searcher/searcher.Deployment.yaml | 2 +- 33 files changed, 44 insertions(+), 44 deletions(-) diff --git a/base/blobstore/blobstore.Deployment.yaml b/base/blobstore/blobstore.Deployment.yaml index 4f27c4b9c1be..c625812c6c7f 100644 --- a/base/blobstore/blobstore.Deployment.yaml +++ b/base/blobstore/blobstore.Deployment.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: blobstore - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/blobstore:6.1.2889@sha256:3fc5222e72111357c3cfb851be5aa379f0b9b1a0e4e93cb1594f4125a4cf65ed + image: index.docker.io/sourcegraph/blobstore:6.1.2889@sha256:8f49a897d7f7ad4655df9cd79959620ddb73406adccccd567c4846aa24ec4a01 terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 9000 diff --git a/base/cadvisor/cadvisor.DaemonSet.yaml b/base/cadvisor/cadvisor.DaemonSet.yaml index d74e330c1131..23f53a4a0687 100644 --- a/base/cadvisor/cadvisor.DaemonSet.yaml +++ b/base/cadvisor/cadvisor.DaemonSet.yaml @@ -26,7 +26,7 @@ spec: serviceAccountName: cadvisor containers: - name: cadvisor - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/cadvisor:6.1.2889@sha256:d6c2803b8f4dab82c30f4d7f07448f7adffe977a6e143ae11ab7530afd8b1076 + image: index.docker.io/sourcegraph/cadvisor:6.1.2889@sha256:c13394cf2de03154dd48e78129bf3d4cc31854ab98dedafd3901b413d54b4822 args: # Kubernetes-specific flags below (other flags are baked into the Docker image) # diff --git a/base/codeinsights-db/codeinsights-db.Deployment.yaml b/base/codeinsights-db/codeinsights-db.Deployment.yaml index 29dcfdbf8972..96bce48e8ad8 100644 --- a/base/codeinsights-db/codeinsights-db.Deployment.yaml +++ b/base/codeinsights-db/codeinsights-db.Deployment.yaml @@ -26,7 +26,7 @@ spec: spec: initContainers: - name: correct-data-dir-permissions - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/alpine-3.14:6.1.2889@sha256:03f4342b207142adf886fec10a09bed9e13b5c02680f2dc60f4eeb8a8e9195a2 + image: index.docker.io/sourcegraph/alpine-3.14:6.1.2889@sha256:1098432c2c1f36e291313bc610f290097bf065fc9d82882baf8dbd32c2bd14e4 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/ @@ -42,7 +42,7 @@ spec: memory: "50Mi" containers: - name: codeinsights - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16-codeinsights:6.1.2889@sha256:522eb90f640d3ed60c29895dd1e4cdac9dc9b5b80895ba5f5a636ee7e2854496 + image: index.docker.io/sourcegraph/postgresql-16-codeinsights:6.1.2889@sha256:7d84febae82181e096f79e26f6459e86fa66a40ccbe30ff0f37cb118707e4e2a env: - name: POSTGRES_DB value: postgres @@ -75,7 +75,7 @@ spec: value: postgres://postgres:@localhost:5432/?sslmode=disable - name: PG_EXPORTER_EXTEND_QUERY_PATH value: /config/code_insights_queries.yaml - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:6.1.2889@sha256:b76b6b6ff7703cb8d77c8de089a3ee669a9a0eea41a786d3c8382c66e246fdbe + image: index.docker.io/sourcegraph/postgres_exporter:6.1.2889@sha256:a2fedb3d4aa845375d3c60f37e2813d095c6718c2afa96c2bcc8c17dc8b73991 terminationMessagePolicy: FallbackToLogsOnError name: pgsql-exporter resources: diff --git a/base/codeintel-db/codeintel-db.Deployment.yaml b/base/codeintel-db/codeintel-db.Deployment.yaml index 8889b37d9f1e..512639305532 100644 --- a/base/codeintel-db/codeintel-db.Deployment.yaml +++ b/base/codeintel-db/codeintel-db.Deployment.yaml @@ -27,7 +27,7 @@ spec: spec: initContainers: - name: correct-data-dir-permissions - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/alpine-3.14:6.1.2889@sha256:03f4342b207142adf886fec10a09bed9e13b5c02680f2dc60f4eeb8a8e9195a2 + image: index.docker.io/sourcegraph/alpine-3.14:6.1.2889@sha256:1098432c2c1f36e291313bc610f290097bf065fc9d82882baf8dbd32c2bd14e4 command: ["sh", "-c", "if [ -d /data/pgdata-12 ]; then chmod 750 /data/pgdata-12; fi"] volumeMounts: - mountPath: /data @@ -43,7 +43,7 @@ spec: memory: "50Mi" containers: - name: pgsql - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16:6.1.2889@sha256:44d10196f25968e82258fc7fc509a494eb924eddbb0a9b6a879f5218711ad5d9 + image: index.docker.io/sourcegraph/postgresql-16:6.1.2889@sha256:8cb7b0f54c7ab464f8e3b26918a70bebcb060219dd0b91084209563238ec1dd5 terminationMessagePolicy: FallbackToLogsOnError readinessProbe: exec: @@ -80,7 +80,7 @@ spec: value: postgres://sg:@localhost:5432/?sslmode=disable - name: PG_EXPORTER_EXTEND_QUERY_PATH value: /config/code_intel_queries.yaml - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:6.1.2889@sha256:b76b6b6ff7703cb8d77c8de089a3ee669a9a0eea41a786d3c8382c66e246fdbe + image: index.docker.io/sourcegraph/postgres_exporter:6.1.2889@sha256:a2fedb3d4aa845375d3c60f37e2813d095c6718c2afa96c2bcc8c17dc8b73991 terminationMessagePolicy: FallbackToLogsOnError name: pgsql-exporter resources: diff --git a/base/frontend/sourcegraph-frontend.Deployment.yaml b/base/frontend/sourcegraph-frontend.Deployment.yaml index b2b75508d594..e409b737525b 100644 --- a/base/frontend/sourcegraph-frontend.Deployment.yaml +++ b/base/frontend/sourcegraph-frontend.Deployment.yaml @@ -29,7 +29,7 @@ spec: spec: initContainers: - name: migrator - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/migrator:6.1.2889@sha256:f7dc3b1006fa8a031d3c4ee224d21576f930e2522f57bf5bb15094da62211361 + image: index.docker.io/sourcegraph/migrator:6.1.2889@sha256:67b5b187f006bb789898cd1ab02fd82f860fe1511524a416ba63ee71ebd603c6 args: ["up"] resources: limits: @@ -63,7 +63,7 @@ spec: value: sg containers: - name: frontend - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/frontend:6.1.2889@sha256:402a7982f96ee0f28b66c81f1127314bbee3b332d09fae8a4868b1ffe62528c8 + image: index.docker.io/sourcegraph/frontend:6.1.2889@sha256:43dad562a65d08842659abdd06cf3c92d3745cc9e18c3762e458b78028a86e1e args: - serve env: diff --git a/base/gitserver/gitserver.StatefulSet.yaml b/base/gitserver/gitserver.StatefulSet.yaml index 5ff6d6b3057c..18b4ab0f31c0 100644 --- a/base/gitserver/gitserver.StatefulSet.yaml +++ b/base/gitserver/gitserver.StatefulSet.yaml @@ -35,7 +35,7 @@ spec: fieldPath: status.hostIP - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_AGENT_HOST):4317 - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/gitserver:6.1.2889@sha256:73f337992fb2dde6599996e3764627a8c39ce3be0e601333e70f2fe3acb5fa4c + image: index.docker.io/sourcegraph/gitserver:6.1.2889@sha256:282142b7886f58b0ea7251575c92d5c837ff8649d5831c9c52745ebed6f3af4f terminationMessagePolicy: FallbackToLogsOnError livenessProbe: initialDelaySeconds: 5 diff --git a/base/grafana/grafana.StatefulSet.yaml b/base/grafana/grafana.StatefulSet.yaml index 8b2b05ff8914..1ecc3b98c947 100644 --- a/base/grafana/grafana.StatefulSet.yaml +++ b/base/grafana/grafana.StatefulSet.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: grafana - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/grafana:6.1.2889@sha256:e3245472104310d29d664a182957be374c39d0fb32b42353ba5e1373bc77070a + image: index.docker.io/sourcegraph/grafana:6.1.2889@sha256:fcf1195d4ca852527bb20b4e68756b59186f2315489539753a98cc1191e8edec terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 3370 diff --git a/base/indexed-search/indexed-search.StatefulSet.yaml b/base/indexed-search/indexed-search.StatefulSet.yaml index 97a89144448f..5d975ae41de3 100644 --- a/base/indexed-search/indexed-search.StatefulSet.yaml +++ b/base/indexed-search/indexed-search.StatefulSet.yaml @@ -33,7 +33,7 @@ spec: value: http://$(OTEL_AGENT_HOST):4317 - name: OPENTELEMETRY_DISABLED value: "false" - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/indexed-searcher:6.1.2889@sha256:57334bdbd8941d25c3a4b6e417f3a88093de7941dee16c750fc99c9c2a46eaf6 + image: index.docker.io/sourcegraph/indexed-searcher:6.1.2889@sha256:9bb181a003811fb0193c4fa594ded800f2f155752829f1c4f97a7bfa37dbe69e terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 6070 @@ -67,7 +67,7 @@ spec: value: http://$(OTEL_AGENT_HOST):4317 - name: OPENTELEMETRY_DISABLED value: "false" - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/search-indexer:6.1.2889@sha256:fad61260fdba3b445783f413b29e515eeec68fdc038f8c33d7a998c2d1de45f3 + image: index.docker.io/sourcegraph/search-indexer:6.1.2889@sha256:8a79ecf88f4f22ff72c8a50f33a2d43506c44deddf6ef2e43d8101af9ccd97c0 terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 6072 diff --git a/base/node-exporter/node-exporter.DaemonSet.yaml b/base/node-exporter/node-exporter.DaemonSet.yaml index 077b4de9b7d4..86d512c5cd44 100644 --- a/base/node-exporter/node-exporter.DaemonSet.yaml +++ b/base/node-exporter/node-exporter.DaemonSet.yaml @@ -24,7 +24,7 @@ spec: spec: containers: - name: node-exporter - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/node-exporter:6.1.2889@sha256:85bf1c16153df908f509d64d8911e7476b98a1acce8c457d1ed80b86c28da837 + image: index.docker.io/sourcegraph/node-exporter:6.1.2889@sha256:e496aa37a1053cd59f0025c232fd58261ae08d934269870a343061c7a9596bfd imagePullPolicy: IfNotPresent resources: limits: diff --git a/base/otel-collector/otel-agent.DaemonSet.yaml b/base/otel-collector/otel-agent.DaemonSet.yaml index 45735ae59d70..300df66710db 100644 --- a/base/otel-collector/otel-agent.DaemonSet.yaml +++ b/base/otel-collector/otel-agent.DaemonSet.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: otel-agent - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/opentelemetry-collector:6.1.2889@sha256:5e4f8fb6a023b6c317045a9db90eb491541f27dabd702d67217b20a60d999046 + image: index.docker.io/sourcegraph/opentelemetry-collector:6.1.2889@sha256:c05e84380dd81d74ff952f73d132710dc4a162fa26c0a0709fba58dcb2829958 command: - "/bin/otelcol-sourcegraph" - "--config=/etc/otel-agent/config.yaml" diff --git a/base/otel-collector/otel-collector.Deployment.yaml b/base/otel-collector/otel-collector.Deployment.yaml index 1b169e4c4d72..c912f0032911 100644 --- a/base/otel-collector/otel-collector.Deployment.yaml +++ b/base/otel-collector/otel-collector.Deployment.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: otel-collector - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/opentelemetry-collector:6.1.2889@sha256:5e4f8fb6a023b6c317045a9db90eb491541f27dabd702d67217b20a60d999046 + image: index.docker.io/sourcegraph/opentelemetry-collector:6.1.2889@sha256:c05e84380dd81d74ff952f73d132710dc4a162fa26c0a0709fba58dcb2829958 command: - "/bin/otelcol-sourcegraph" # To use a custom configuration, edit otel-collector.ConfigMap.yaml diff --git a/base/pgsql/pgsql.Deployment.yaml b/base/pgsql/pgsql.Deployment.yaml index 44eb8e11cad9..31c7d66c3dce 100644 --- a/base/pgsql/pgsql.Deployment.yaml +++ b/base/pgsql/pgsql.Deployment.yaml @@ -27,7 +27,7 @@ spec: spec: initContainers: - name: correct-data-dir-permissions - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/alpine-3.14:6.1.2889@sha256:03f4342b207142adf886fec10a09bed9e13b5c02680f2dc60f4eeb8a8e9195a2 + image: index.docker.io/sourcegraph/alpine-3.14:6.1.2889@sha256:1098432c2c1f36e291313bc610f290097bf065fc9d82882baf8dbd32c2bd14e4 command: ["sh", "-c", "if [ -d /data/pgdata-12 ]; then chmod 750 /data/pgdata-12; fi"] volumeMounts: - mountPath: /data @@ -43,7 +43,7 @@ spec: memory: "50Mi" containers: - env: - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16:6.1.2889@sha256:44d10196f25968e82258fc7fc509a494eb924eddbb0a9b6a879f5218711ad5d9 + image: index.docker.io/sourcegraph/postgresql-16:6.1.2889@sha256:8cb7b0f54c7ab464f8e3b26918a70bebcb060219dd0b91084209563238ec1dd5 terminationMessagePolicy: FallbackToLogsOnError readinessProbe: exec: @@ -83,7 +83,7 @@ spec: value: postgres://sg:@localhost:5432/?sslmode=disable - name: PG_EXPORTER_EXTEND_QUERY_PATH value: /config/queries.yaml - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:6.1.2889@sha256:b76b6b6ff7703cb8d77c8de089a3ee669a9a0eea41a786d3c8382c66e246fdbe + image: index.docker.io/sourcegraph/postgres_exporter:6.1.2889@sha256:a2fedb3d4aa845375d3c60f37e2813d095c6718c2afa96c2bcc8c17dc8b73991 terminationMessagePolicy: FallbackToLogsOnError name: pgsql-exporter resources: diff --git a/base/precise-code-intel/worker.Deployment.yaml b/base/precise-code-intel/worker.Deployment.yaml index 180f00a46956..582586681a03 100644 --- a/base/precise-code-intel/worker.Deployment.yaml +++ b/base/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: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/precise-code-intel-worker:6.1.2889@sha256:29e9e3d6777269f16412452b6cec80a56fc7fb537a8155e89b4226b1b2b6536b + image: index.docker.io/sourcegraph/precise-code-intel-worker:6.1.2889@sha256:2a8ec49e080ff19e6f05f92c39cfc67ac50b8e2ff5aba4dcbd7451bba1e8d539 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/base/prometheus/prometheus.Deployment.yaml b/base/prometheus/prometheus.Deployment.yaml index a8f12cc1c86d..b791d9bb8fd9 100644 --- a/base/prometheus/prometheus.Deployment.yaml +++ b/base/prometheus/prometheus.Deployment.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: prometheus - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/prometheus:6.1.2889@sha256:fbdedfaf3e60634965f568976a02c46b494beec2766516fde0affc8b88a8ad47 + image: index.docker.io/sourcegraph/prometheus:6.1.2889@sha256:75fa45933ecb03f7aca1d54ec5ebc05d11ff300494a2ca8fbaefa25c83f0326f terminationMessagePolicy: FallbackToLogsOnError readinessProbe: httpGet: diff --git a/base/redis/redis-cache.Deployment.yaml b/base/redis/redis-cache.Deployment.yaml index 3c0854dbeb03..686c259a4ba6 100644 --- a/base/redis/redis-cache.Deployment.yaml +++ b/base/redis/redis-cache.Deployment.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: redis-cache - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-cache:6.1.2889@sha256:797fd5e4d69c246c3779ad8553611ba11e93d0951748bc4e201d6b9b0f04d485 + image: index.docker.io/sourcegraph/redis-cache:6.1.2889@sha256:204c164bc59119cde8b8d19a640897e8ffe008e040b730bed2188f28fca0d31c terminationMessagePolicy: FallbackToLogsOnError livenessProbe: initialDelaySeconds: 30 @@ -66,7 +66,7 @@ spec: - mountPath: /redis-data name: redis-data - name: redis-exporter - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis_exporter:6.1.2889@sha256:64089b3ed54e0fa56157d6fe29e83f24c375cfe265fd10d357a4a6f1d431cbd9 + image: index.docker.io/sourcegraph/redis_exporter:6.1.2889@sha256:a015f57ccb3f216af6d2996261749a9ebc18a30c251c3e4c996778705b22cc2f terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 9121 diff --git a/base/redis/redis-store.Deployment.yaml b/base/redis/redis-store.Deployment.yaml index 378e05907fba..256f2513c794 100644 --- a/base/redis/redis-store.Deployment.yaml +++ b/base/redis/redis-store.Deployment.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: redis-store - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-store:6.1.2889@sha256:5a3a8332434caaf10cb873b0ed50bc0ee9627af63e84f45abe0228909de94f48 + image: index.docker.io/sourcegraph/redis-store:6.1.2889@sha256:4f4dfb3074e586b7eb8ab2ba631285aeb5e018452219e2f1a2f235c85b8de4bc terminationMessagePolicy: FallbackToLogsOnError livenessProbe: initialDelaySeconds: 30 @@ -65,7 +65,7 @@ spec: - mountPath: /redis-data name: redis-data - name: redis-exporter - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis_exporter:6.1.2889@sha256:64089b3ed54e0fa56157d6fe29e83f24c375cfe265fd10d357a4a6f1d431cbd9 + image: index.docker.io/sourcegraph/redis_exporter:6.1.2889@sha256:a015f57ccb3f216af6d2996261749a9ebc18a30c251c3e4c996778705b22cc2f terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 9121 diff --git a/base/repo-updater/repo-updater.Deployment.yaml b/base/repo-updater/repo-updater.Deployment.yaml index 2a1f85edf9cf..a9b4a705e1a8 100644 --- a/base/repo-updater/repo-updater.Deployment.yaml +++ b/base/repo-updater/repo-updater.Deployment.yaml @@ -29,7 +29,7 @@ spec: spec: containers: - name: repo-updater - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/repo-updater:6.1.2889@sha256:1644d18f4f594e9bb97cb5d5365e7b6c20a78b280895315e13703ea848effc62 + image: index.docker.io/sourcegraph/repo-updater:6.1.2889@sha256:95e8a28bd2d13270a5d0ab80eae5e8aac44913bd421fb92cf45d5550c4874fbc env: # 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 - name: OTEL_AGENT_HOST diff --git a/base/searcher/searcher.Deployment.yaml b/base/searcher/searcher.Deployment.yaml index c1448795ea40..2717d50eaf99 100644 --- a/base/searcher/searcher.Deployment.yaml +++ b/base/searcher/searcher.Deployment.yaml @@ -49,7 +49,7 @@ spec: fieldPath: status.hostIP - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_AGENT_HOST):4317 - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/searcher:6.1.2889@sha256:18d1b4298666938097e1061afcd1f842e84351cdde9c79b2da0b0d7cf72b2021 + image: index.docker.io/sourcegraph/searcher:6.1.2889@sha256:66f633e4e666d65684915087009bdbdb8a46dad6eccb4c307a6de141e0225be6 terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 3181 diff --git a/base/symbols/symbols.Deployment.yaml b/base/symbols/symbols.Deployment.yaml index f618f0353776..9ca706c4c1fd 100644 --- a/base/symbols/symbols.Deployment.yaml +++ b/base/symbols/symbols.Deployment.yaml @@ -49,7 +49,7 @@ spec: fieldPath: status.hostIP - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_AGENT_HOST):4317 - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/symbols:6.1.2889@sha256:888ee3dfbe022e0b98c6868bccb51de78d4d769ce111fb1209019bcf66638b5d + image: index.docker.io/sourcegraph/symbols:6.1.2889@sha256:0ffea2e2d7641decf87587a2c0fbcedb172d876f71a10da4cd3e72b566ce12b4 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/base/syntect-server/syntect-server.Deployment.yaml b/base/syntect-server/syntect-server.Deployment.yaml index 9d16d9e6eba2..cc75a6c3feed 100644 --- a/base/syntect-server/syntect-server.Deployment.yaml +++ b/base/syntect-server/syntect-server.Deployment.yaml @@ -29,7 +29,7 @@ spec: containers: - name: syntect-server env: - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/syntax-highlighter:6.1.2889@sha256:db83411e2f3dfd75fc830cf4f9fc0ef97cc5d9ed6c1910614363a2fc1e99622c + image: index.docker.io/sourcegraph/syntax-highlighter:6.1.2889@sha256:eea296267ca84c8d06eb9c1e44fd5f4c4fbb3f0490193517cc3764d558a773c6 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/base/worker/worker.Deployment.yaml b/base/worker/worker.Deployment.yaml index 8a933556777e..d8b6a4bdc1a0 100644 --- a/base/worker/worker.Deployment.yaml +++ b/base/worker/worker.Deployment.yaml @@ -44,7 +44,7 @@ spec: fieldPath: status.hostIP - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_AGENT_HOST):4317 - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/worker:6.1.2889@sha256:86013b6bc116ed063faa38212b506ca55298af1adedcd9fe11856eb8de61d2c3 + image: index.docker.io/sourcegraph/worker:6.1.2889@sha256:1ef615670e315edda8511ab1e06ffd27b98129bc962bf06aca455c7731baf482 envFrom: - configMapRef: name: embeddings-backend diff --git a/configure/executors/dind/executor.Deployment.yaml b/configure/executors/dind/executor.Deployment.yaml index d08c363d929e..8e24ec41d303 100644 --- a/configure/executors/dind/executor.Deployment.yaml +++ b/configure/executors/dind/executor.Deployment.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: executor - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/executor:6.1.2889@sha256:eeccd74bb08ca50f74fa9c12d7f4358f15caeacf9bd68b1c29adc675bcb076c5 + image: index.docker.io/sourcegraph/executor:6.1.2889@sha256:5c15b7e4232943a1dc73a21050018bd429989d35cb61fe057168ef63b344ddb4 imagePullPolicy: Always livenessProbe: exec: @@ -67,7 +67,7 @@ spec: - mountPath: /scratch name: executor-scratch - name: dind - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/dind:6.1.2889@sha256:1a677d45d74777f8e111c35c06d41fca9b1fdccd267e009379b89cd517f373d8 + image: index.docker.io/sourcegraph/dind:6.1.2889@sha256:cadeaa6a62f0fdd8b4b057f59b73a32850220d0e6e79df0d35e0791499eef519 imagePullPolicy: Always securityContext: privileged: true diff --git a/configure/executors/k8s/executor.Deployment.yaml b/configure/executors/k8s/executor.Deployment.yaml index 80e6e493e674..eefe811874ed 100644 --- a/configure/executors/k8s/executor.Deployment.yaml +++ b/configure/executors/k8s/executor.Deployment.yaml @@ -29,7 +29,7 @@ spec: serviceAccountName: executor containers: - name: executor - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/executor-kubernetes:6.1.2889@sha256:5bd78e42b24ee212479ae7d65550cb6328f5a682f928a413be7db9c670630f95 + image: index.docker.io/sourcegraph/executor-kubernetes:6.1.2889@sha256:d577b67aa029464210e94b3548bc4fd4b1dd4ac4cbf5307d40ccfd08a09d5b41 imagePullPolicy: Always livenessProbe: exec: diff --git a/configure/migrator/migrator.Job.yaml b/configure/migrator/migrator.Job.yaml index a38d251c5305..0a588d8687e7 100644 --- a/configure/migrator/migrator.Job.yaml +++ b/configure/migrator/migrator.Job.yaml @@ -12,7 +12,7 @@ spec: spec: containers: - name: migrator - image: "us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/migrator:6.1.2889@sha256:f7dc3b1006fa8a031d3c4ee224d21576f930e2522f57bf5bb15094da62211361" + image: "index.docker.io/sourcegraph/migrator:6.1.2889@sha256:67b5b187f006bb789898cd1ab02fd82f860fe1511524a416ba63ee71ebd603c6" args: ["up"] env: - name: PGHOST diff --git a/overlays/jaeger/jaeger.Deployment.yaml b/overlays/jaeger/jaeger.Deployment.yaml index 5e81f76795fe..cd546f143009 100644 --- a/overlays/jaeger/jaeger.Deployment.yaml +++ b/overlays/jaeger/jaeger.Deployment.yaml @@ -30,7 +30,7 @@ spec: spec: containers: - name: jaeger - image: index.docker.io/sourcegraph/jaeger-all-in-one:5.11.0@sha256:9357cec3cfe720522b3f9b6b661bd003478c4b58d9462306be154068a71200da + image: index.docker.io/sourcegraph/jaeger-all-in-one:6.1.2889@sha256:d35f0bf61a5be6fe73714bb06e489a68024a77ea7d0a9f346c42633d66c8b1d3 args: ["--memory.max-traces=20000", "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json", "--collector.otlp.enabled"] ports: - containerPort: 5775 diff --git a/overlays/migrate-to-nonprivileged/blobstore/blobstore.Deployment.yaml b/overlays/migrate-to-nonprivileged/blobstore/blobstore.Deployment.yaml index 2301272a33c0..bd61811ce438 100644 --- a/overlays/migrate-to-nonprivileged/blobstore/blobstore.Deployment.yaml +++ b/overlays/migrate-to-nonprivileged/blobstore/blobstore.Deployment.yaml @@ -7,7 +7,7 @@ spec: spec: initContainers: - name: transfer-file-ownership - image: index.docker.io/sourcegraph/alpine-3.14:5.11.0@sha256:6f379faa21ec57a5b8dce5b63e1933d4227ca2042f6371ef24863bd68d7d6c19 + image: index.docker.io/sourcegraph/alpine-3.14:6.1.2889@sha256:1098432c2c1f36e291313bc610f290097bf065fc9d82882baf8dbd32c2bd14e4 command: ["sh", "-c", "chown -R 100:101 /data"] volumeMounts: - mountPath: /data diff --git a/overlays/migrate-to-nonprivileged/gitserver/gitserver.StatefulSet.yaml b/overlays/migrate-to-nonprivileged/gitserver/gitserver.StatefulSet.yaml index 17dd5786d434..b26a98a57feb 100644 --- a/overlays/migrate-to-nonprivileged/gitserver/gitserver.StatefulSet.yaml +++ b/overlays/migrate-to-nonprivileged/gitserver/gitserver.StatefulSet.yaml @@ -7,7 +7,7 @@ spec: spec: initContainers: - name: transfer-file-ownership - image: index.docker.io/sourcegraph/alpine-3.14:5.11.0@sha256:6f379faa21ec57a5b8dce5b63e1933d4227ca2042f6371ef24863bd68d7d6c19 + image: index.docker.io/sourcegraph/alpine-3.14:6.1.2889@sha256:1098432c2c1f36e291313bc610f290097bf065fc9d82882baf8dbd32c2bd14e4 command: ["sh", "-c", "if [[ \"$(stat -c '%u' /data/repos)\" -ne 100 ]]; then chown -R 100:101 /data/repos; fi"] volumeMounts: - mountPath: /data/repos diff --git a/overlays/migrate-to-nonprivileged/grafana/grafana.StatefulSet.yaml b/overlays/migrate-to-nonprivileged/grafana/grafana.StatefulSet.yaml index f6225fb2d474..4a559245001d 100644 --- a/overlays/migrate-to-nonprivileged/grafana/grafana.StatefulSet.yaml +++ b/overlays/migrate-to-nonprivileged/grafana/grafana.StatefulSet.yaml @@ -7,7 +7,7 @@ spec: spec: initContainers: - name: transfer-file-ownership - image: index.docker.io/sourcegraph/alpine-3.14:5.11.0@sha256:6f379faa21ec57a5b8dce5b63e1933d4227ca2042f6371ef24863bd68d7d6c19 + image: index.docker.io/sourcegraph/alpine-3.14:6.1.2889@sha256:1098432c2c1f36e291313bc610f290097bf065fc9d82882baf8dbd32c2bd14e4 command: ["sh", "-c", "chown -R 472:472 /var/lib/grafana"] volumeMounts: - mountPath: /var/lib/grafana diff --git a/overlays/migrate-to-nonprivileged/indexed-search/indexed-search.StatefulSet.yaml b/overlays/migrate-to-nonprivileged/indexed-search/indexed-search.StatefulSet.yaml index cad3d2e3b421..49270160728d 100644 --- a/overlays/migrate-to-nonprivileged/indexed-search/indexed-search.StatefulSet.yaml +++ b/overlays/migrate-to-nonprivileged/indexed-search/indexed-search.StatefulSet.yaml @@ -7,7 +7,7 @@ spec: spec: initContainers: - name: transfer-file-ownership - image: index.docker.io/sourcegraph/alpine-3.14:5.11.0@sha256:6f379faa21ec57a5b8dce5b63e1933d4227ca2042f6371ef24863bd68d7d6c19 + image: index.docker.io/sourcegraph/alpine-3.14:6.1.2889@sha256:1098432c2c1f36e291313bc610f290097bf065fc9d82882baf8dbd32c2bd14e4 command: ["sh", "-c", "chown -R 100:101 /data"] volumeMounts: - mountPath: /data diff --git a/overlays/migrate-to-nonprivileged/prometheus/prometheus.Deployment.yaml b/overlays/migrate-to-nonprivileged/prometheus/prometheus.Deployment.yaml index 71d281e504ab..20a1743758b7 100644 --- a/overlays/migrate-to-nonprivileged/prometheus/prometheus.Deployment.yaml +++ b/overlays/migrate-to-nonprivileged/prometheus/prometheus.Deployment.yaml @@ -7,7 +7,7 @@ spec: spec: initContainers: - name: transfer-file-ownership - image: index.docker.io/sourcegraph/alpine-3.14:5.11.0@sha256:6f379faa21ec57a5b8dce5b63e1933d4227ca2042f6371ef24863bd68d7d6c19 + image: index.docker.io/sourcegraph/alpine-3.14:6.1.2889@sha256:1098432c2c1f36e291313bc610f290097bf065fc9d82882baf8dbd32c2bd14e4 command: ["sh", "-c", "chown -R 100:100 /prometheus"] volumeMounts: - mountPath: /prometheus diff --git a/overlays/migrate-to-nonprivileged/redis/redis-cache.Deployment.yaml b/overlays/migrate-to-nonprivileged/redis/redis-cache.Deployment.yaml index 9aaccc296e16..bf3b5d53bd9c 100644 --- a/overlays/migrate-to-nonprivileged/redis/redis-cache.Deployment.yaml +++ b/overlays/migrate-to-nonprivileged/redis/redis-cache.Deployment.yaml @@ -7,7 +7,7 @@ spec: spec: initContainers: - name: transfer-file-ownership - image: index.docker.io/sourcegraph/alpine-3.14:5.11.0@sha256:6f379faa21ec57a5b8dce5b63e1933d4227ca2042f6371ef24863bd68d7d6c19 + image: index.docker.io/sourcegraph/alpine-3.14:6.1.2889@sha256:1098432c2c1f36e291313bc610f290097bf065fc9d82882baf8dbd32c2bd14e4 command: ["sh", "-c", "chown -R 999:1000 /redis-data"] volumeMounts: - mountPath: /redis-data diff --git a/overlays/migrate-to-nonprivileged/redis/redis-store.Deployment.yaml b/overlays/migrate-to-nonprivileged/redis/redis-store.Deployment.yaml index f31519aa17e1..2d259b326c97 100644 --- a/overlays/migrate-to-nonprivileged/redis/redis-store.Deployment.yaml +++ b/overlays/migrate-to-nonprivileged/redis/redis-store.Deployment.yaml @@ -7,7 +7,7 @@ spec: spec: initContainers: - name: transfer-file-ownership - image: index.docker.io/sourcegraph/alpine-3.14:5.11.0@sha256:6f379faa21ec57a5b8dce5b63e1933d4227ca2042f6371ef24863bd68d7d6c19 + image: index.docker.io/sourcegraph/alpine-3.14:6.1.2889@sha256:1098432c2c1f36e291313bc610f290097bf065fc9d82882baf8dbd32c2bd14e4 command: ["sh", "-c", "chown -R 999:1000 /redis-data"] volumeMounts: - mountPath: /redis-data diff --git a/overlays/migrate-to-nonprivileged/searcher/searcher.Deployment.yaml b/overlays/migrate-to-nonprivileged/searcher/searcher.Deployment.yaml index 956b9f50969a..5d1cf797373d 100644 --- a/overlays/migrate-to-nonprivileged/searcher/searcher.Deployment.yaml +++ b/overlays/migrate-to-nonprivileged/searcher/searcher.Deployment.yaml @@ -7,7 +7,7 @@ spec: spec: initContainers: - name: transfer-cache - image: index.docker.io/sourcegraph/alpine-3.14:5.11.0@sha256:6f379faa21ec57a5b8dce5b63e1933d4227ca2042f6371ef24863bd68d7d6c19 + image: index.docker.io/sourcegraph/alpine-3.14:6.1.2889@sha256:1098432c2c1f36e291313bc610f290097bf065fc9d82882baf8dbd32c2bd14e4 command: ["sh", "-c", "if [[ \"$(stat -c '%u' /mnt/cache)\" -ne 100 ]]; then chown -R 100:101 /mnt/cache; fi"] volumeMounts: - mountPath: /mnt/cache