From 1078ff2b43070584578662217b9aa534f3a34fbc Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Mon, 20 May 2024 17:45:37 +0000 Subject: [PATCH] promote-release: v5.4.2198 {"version":"v5.4.2198","inputs":"server=5.4.2198","type":"patch"} --- base/blobstore/blobstore.Deployment.yaml | 2 +- base/cadvisor/cadvisor.DaemonSet.yaml | 2 +- .../codeinsights-db.Deployment.yaml | 6 +- .../codeintel-db/codeintel-db.Deployment.yaml | 6 +- .../sourcegraph-frontend.Deployment.yaml | 4 +- base/gitserver/gitserver.StatefulSet.yaml | 2 +- base/grafana/grafana.StatefulSet.yaml | 2 +- .../indexed-search.StatefulSet.yaml | 4 +- .../node-exporter.DaemonSet.yaml | 2 +- base/otel-collector/otel-agent.DaemonSet.yaml | 2 +- .../otel-collector.Deployment.yaml | 2 +- base/pgsql/pgsql.Deployment.yaml | 6 +- .../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 +- .../repo-updater/repo-updater.Deployment.yaml | 2 +- base/searcher/searcher.Deployment.yaml | 2 +- base/symbols/symbols.Deployment.yaml | 2 +- .../syntect-server.Deployment.yaml | 2 +- base/worker/worker.Deployment.yaml | 2 +- .../embeddings/embeddings.Deployment.yaml | 2 +- .../executors/dind/executor.Deployment.yaml | 4 +- .../executors/k8s/executor.Deployment.yaml | 2 +- configure/migrator/migrator.Job.yaml | 2 +- overlays/bases/pvcs/kustomization.yaml | 1 - overlays/envoy/gitserver.EnvoyFilter.yaml | 2 +- overlays/envoy/kustomization.yaml | 2 +- overlays/jaeger/grafana.ConfigMap.yaml | 2 +- overlays/jaeger/jaeger.Deployment.yaml | 62 +++++++++---------- .../blobstore/blobstore.Deployment.yaml | 6 +- .../gitserver/gitserver.StatefulSet.yaml | 2 +- .../grafana/grafana.StatefulSet.yaml | 2 +- .../indexed-search.StatefulSet.yaml | 2 +- .../kustomization.yaml | 2 +- .../prometheus/prometheus.Deployment.yaml | 2 +- .../redis/redis-cache.Deployment.yaml | 2 +- .../redis/redis-store.Deployment.yaml | 2 +- .../searcher/searcher.Deployment.yaml | 2 +- .../sourcegraph-frontend.Deployment.yaml | 12 ++-- 40 files changed, 87 insertions(+), 88 deletions(-) diff --git a/base/blobstore/blobstore.Deployment.yaml b/base/blobstore/blobstore.Deployment.yaml index 78e752014801..e02629415009 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:5.4.2198@sha256:bb165a8a8ac7df536daa3960cdac6e60085e87474dff33c76ccb1dd1069ed456 + image: index.docker.io/sourcegraph/blobstore:5.4.2198@sha256:0d47b23842d7f927f8697b7d4703cd26cb1bb86e499877521d90a90ad5c13f8e terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 9000 diff --git a/base/cadvisor/cadvisor.DaemonSet.yaml b/base/cadvisor/cadvisor.DaemonSet.yaml index 81578459adb1..f2b42e8a21f5 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:5.4.2198@sha256:dbe47297ddc4c86d59b65577b5e13139b4ae8330fced129b467c65efa3b64f2a + image: index.docker.io/sourcegraph/cadvisor:5.4.2198@sha256:b6b7508df52103cab84f186fe997dc0559837d83333401eaefefacc84e142e3c 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 961a0f5281a0..7e8e49c3ff0b 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:5.4.2198@sha256:982220e0fd8ce55a73798fa7e814a482c4807c412f054c8440c5970b610239b7 + image: index.docker.io/sourcegraph/alpine-3.14:5.4.2198@sha256:0de2a485bf3be6b5a92bea8f46a134196ed22aea6e906525f9f8f63d0616db7d 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/codeinsights-db:5.4.2198@sha256:c4a1bd3908658e1c09558a638e378e5570d5f669d27f9f867eeda25fe60cb88f + image: index.docker.io/sourcegraph/codeinsights-db:5.4.2198@sha256:982fc005202cc0f0d9974be1cd42708bb950595d39fc66656d614362b1ae0339 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:5.4.2198@sha256:a038f8822567c5a968375126d3abbf7d7333f7c73f9b7dffbc5cd5e1c53f8045 + image: index.docker.io/sourcegraph/postgres_exporter:5.4.2198@sha256:1783085083872f4b658d9f87d66c34436ac1615615176e9cb8af679e88c898a7 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 5b2b32884b39..816e9da4c3f3 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:5.4.2198@sha256:982220e0fd8ce55a73798fa7e814a482c4807c412f054c8440c5970b610239b7 + image: index.docker.io/sourcegraph/alpine-3.14:5.4.2198@sha256:0de2a485bf3be6b5a92bea8f46a134196ed22aea6e906525f9f8f63d0616db7d 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/codeintel-db:5.4.2198@sha256:1e0e93661a65c832b9697048c797f9894dfb502e2e1da2b8209f0018a6632b79 + image: index.docker.io/sourcegraph/codeintel-db:5.4.2198@sha256:c48e799964ab29371b50da7f55a4c38b52bc2adb7093be892aceb7a41a37a2fc 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:5.4.2198@sha256:a038f8822567c5a968375126d3abbf7d7333f7c73f9b7dffbc5cd5e1c53f8045 + image: index.docker.io/sourcegraph/postgres_exporter:5.4.2198@sha256:1783085083872f4b658d9f87d66c34436ac1615615176e9cb8af679e88c898a7 terminationMessagePolicy: FallbackToLogsOnError name: pgsql-exporter resources: diff --git a/base/frontend/sourcegraph-frontend.Deployment.yaml b/base/frontend/sourcegraph-frontend.Deployment.yaml index d23a51052959..24d6b9108860 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:5.4.2198@sha256:c0b25301b59ad3ba1a086da8b86b11637bd7c0d57a9b445ca9e7fb2943b9a820 + image: index.docker.io/sourcegraph/migrator:5.4.2198@sha256:9c3f106a3847c00b13b62cc6cddc966e8d0175d2fd516b7731fff1186370afe8 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:5.4.2198@sha256:2fb607592b38cc68a243b989767f23afd765c9818f708e181d21eebf15a4cbab + image: index.docker.io/sourcegraph/frontend:5.4.2198@sha256:64d59bbd3c4fc6658e48db580d7cf706c1a7428926bd3c660bac50606e0c603d args: - serve env: diff --git a/base/gitserver/gitserver.StatefulSet.yaml b/base/gitserver/gitserver.StatefulSet.yaml index 08e11a1816f2..0d6dedbfdd40 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:5.4.2198@sha256:223b64c5400e8209760e6e480b676688377aef1a4703df3dec270d61a740e7be + image: index.docker.io/sourcegraph/gitserver:5.4.2198@sha256:5b1e20b09b678b84ec4db66a41ff6a33f143de89c1e46d75ec9707f2b60d91aa terminationMessagePolicy: FallbackToLogsOnError livenessProbe: initialDelaySeconds: 5 diff --git a/base/grafana/grafana.StatefulSet.yaml b/base/grafana/grafana.StatefulSet.yaml index d31b1c027691..1802c9e4b60f 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:5.4.2198@sha256:3882e70211e7723e5f7095c846cc1378d462ac1410538e9ac249b5b9e8059acd + image: index.docker.io/sourcegraph/grafana:5.4.2198@sha256:85eae1e10b4865fb89af156421dd6b73dad3e81ad81aada31f07c37a6677e1ad terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 3370 diff --git a/base/indexed-search/indexed-search.StatefulSet.yaml b/base/indexed-search/indexed-search.StatefulSet.yaml index 28ea0f60de2e..ac72a020e89e 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:5.4.2198@sha256:e98f6b808a5be1e72a179fee925df9d75936fae7897f745e4f1cd8f5afc109b7 + image: index.docker.io/sourcegraph/indexed-searcher:5.4.2198@sha256:efdca491ee332020c2c867b6bb26e6d23a2ee9422d73c396bff56027fa17a8be 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:5.4.2198@sha256:59ab35b24c6ab29fd2395c410289408bf9c79eaf2f02159b48ba55f0e25e8a8a + image: index.docker.io/sourcegraph/search-indexer:5.4.2198@sha256:fa80bd30ad42b58e88ab1ddfb8e6c47f75465d322692b391afae5f88be7cd972 terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 6072 diff --git a/base/node-exporter/node-exporter.DaemonSet.yaml b/base/node-exporter/node-exporter.DaemonSet.yaml index 53afc1064bec..b7c107316edb 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:5.4.2198@sha256:2de930bef21119fb7e4f57ba6a2a0b50984addba1675220a3b031f701e269ea7 + image: index.docker.io/sourcegraph/node-exporter:5.4.2198@sha256:222d7fb3623679d94116b712b0a7551c557d2552b82bdbb677a3113a8e2359ea imagePullPolicy: IfNotPresent resources: limits: diff --git a/base/otel-collector/otel-agent.DaemonSet.yaml b/base/otel-collector/otel-agent.DaemonSet.yaml index 2b7b47e6a3bc..9a8c9d5674e5 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:5.4.2198@sha256:23c4790aa98c078bbba2294bfc041a30568dd5a09841d3d12d3a1e34d61450df + image: index.docker.io/sourcegraph/opentelemetry-collector:5.4.2198@sha256:b2d8fb3d61450ed4bfeaa7adcc00cb4567879b04a8be399475aa2a9517b93122 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 6c4f559a9a20..ffb7dded9f14 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:5.4.2198@sha256:23c4790aa98c078bbba2294bfc041a30568dd5a09841d3d12d3a1e34d61450df + image: index.docker.io/sourcegraph/opentelemetry-collector:5.4.2198@sha256:b2d8fb3d61450ed4bfeaa7adcc00cb4567879b04a8be399475aa2a9517b93122 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 121242db4fec..40ca653a59aa 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:5.4.2198@sha256:982220e0fd8ce55a73798fa7e814a482c4807c412f054c8440c5970b610239b7 + image: index.docker.io/sourcegraph/alpine-3.14:5.4.2198@sha256:0de2a485bf3be6b5a92bea8f46a134196ed22aea6e906525f9f8f63d0616db7d 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/postgres-12-alpine:5.4.2198@sha256:1e0e93661a65c832b9697048c797f9894dfb502e2e1da2b8209f0018a6632b79 + image: index.docker.io/sourcegraph/postgres-12-alpine:5.4.2198@sha256:c48e799964ab29371b50da7f55a4c38b52bc2adb7093be892aceb7a41a37a2fc 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:5.4.2198@sha256:a038f8822567c5a968375126d3abbf7d7333f7c73f9b7dffbc5cd5e1c53f8045 + image: index.docker.io/sourcegraph/postgres_exporter:5.4.2198@sha256:1783085083872f4b658d9f87d66c34436ac1615615176e9cb8af679e88c898a7 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 f841edd1e40b..c66baeb66c3a 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:5.4.2198@sha256:2c632ea800f696cf3d63999da73151c521179f14bcfe212d11982aa1915bb09b + image: index.docker.io/sourcegraph/precise-code-intel-worker:5.4.2198@sha256:9e247dd49b8dc15c58eaa49a4419dd44157e484ba20900b978a416e396d2c12c terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/base/prometheus/prometheus.Deployment.yaml b/base/prometheus/prometheus.Deployment.yaml index cf12e6c7be4d..004938cbe634 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:5.4.2198@sha256:cfd6e168a1a6cac37be0301c382d1162beb4e5a69908a59d69817359ba1b2e2b + image: index.docker.io/sourcegraph/prometheus:5.4.2198@sha256:caf2b3c23a594f0cc7980bec768bfff1790592f605a4db2865d15a768fbf61b2 terminationMessagePolicy: FallbackToLogsOnError readinessProbe: httpGet: diff --git a/base/redis/redis-cache.Deployment.yaml b/base/redis/redis-cache.Deployment.yaml index ecdca104ca72..6846d4805573 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:5.4.2198@sha256:f03d1b1d659970f6c40dadf2b5c68d6926d4ca3f9c390ffed1e4726288a4ed66 + image: index.docker.io/sourcegraph/redis-cache:5.4.2198@sha256:20163319ffffe8b3446b300681e117b0562eb8c3d5500876fe55e9d6ceac37af terminationMessagePolicy: FallbackToLogsOnError livenessProbe: initialDelaySeconds: 30 @@ -50,7 +50,7 @@ spec: - mountPath: /redis-data name: redis-data - name: redis-exporter - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis_exporter:5.4.2198@sha256:7e9267909135e2463a1aca37d5c46370faf4b4d7ca98aed703bd430ed0a6ebf7 + image: index.docker.io/sourcegraph/redis_exporter:5.4.2198@sha256:27c98f43fd8a133e1ae3ebe7bbc493a9e75589bdf8fdd07b03ea015c3482ad2d terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 9121 diff --git a/base/redis/redis-store.Deployment.yaml b/base/redis/redis-store.Deployment.yaml index cef7ff52445c..adebb59c730d 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:5.4.2198@sha256:8c18249dc04dc4c1f11c2a09f43df1920a5a15cba4aac4ad9974203c8223128f + image: index.docker.io/sourcegraph/redis-store:5.4.2198@sha256:dc0e01fca6243ecd97110f9ca989f00d41455d3381906400a7270b9d9ce3d760 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: initialDelaySeconds: 30 @@ -49,7 +49,7 @@ spec: - mountPath: /redis-data name: redis-data - name: redis-exporter - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis_exporter:5.4.2198@sha256:7e9267909135e2463a1aca37d5c46370faf4b4d7ca98aed703bd430ed0a6ebf7 + image: index.docker.io/sourcegraph/redis_exporter:5.4.2198@sha256:27c98f43fd8a133e1ae3ebe7bbc493a9e75589bdf8fdd07b03ea015c3482ad2d terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 9121 diff --git a/base/repo-updater/repo-updater.Deployment.yaml b/base/repo-updater/repo-updater.Deployment.yaml index c8ec5bd1fc61..f825a526068e 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:5.4.2198@sha256:a84503a94db4a8d8623b40b6b52b6a38315ff9d44b344f42bf5d0e8193bb9e7c + image: index.docker.io/sourcegraph/repo-updater:5.4.2198@sha256:e18a18f1b7aeffcda08e8925ec38ba9842d37b57e23cf576cbe7cea99262cd57 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 51b224362343..8571ca7f74dc 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:5.4.2198@sha256:360225b5eea0943fd58ac84f1f83b70f84171582f033595ee4d0cec80305b112 + image: index.docker.io/sourcegraph/searcher:5.4.2198@sha256:b48933d0d2685a3ca7962e2bd5ce3dc01daf669ab1e71b246eaeb891a300db99 terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 3181 diff --git a/base/symbols/symbols.Deployment.yaml b/base/symbols/symbols.Deployment.yaml index 0178eade0fcf..c63c734b8ed4 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:5.4.2198@sha256:d1eb122637a6825e4a1ce27c40328e087240391d665b635e0639e353cf6e20e4 + image: index.docker.io/sourcegraph/symbols:5.4.2198@sha256:ba4b7a30d3382ba33ebec63040d70c6c0b4620cfa39cbb643aba0c39c594b377 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/base/syntect-server/syntect-server.Deployment.yaml b/base/syntect-server/syntect-server.Deployment.yaml index 1eed1c5d9558..3117d2a038d8 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:5.4.2198@sha256:41478e6d7a189da130879c7b17addc511bf96ae375fa5cec15641cd527ee20be + image: index.docker.io/sourcegraph/syntax-highlighter:5.4.2198@sha256:4a711fc682a25919856b2dcb195f01207540c5909003897823add8486be8106d terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/base/worker/worker.Deployment.yaml b/base/worker/worker.Deployment.yaml index 56200368b452..1da18beabdcf 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:5.4.2198@sha256:c42c7c04522e381bddace832a922e2a797964c2b0e74342be9abe4914f8a3798 + image: index.docker.io/sourcegraph/worker:5.4.2198@sha256:6eff8adc0e720953420090ea86eab880e3fa60c9f34c23bcf7efec096b9b9825 envFrom: - configMapRef: name: embeddings-backend diff --git a/configure/embeddings/embeddings.Deployment.yaml b/configure/embeddings/embeddings.Deployment.yaml index e1e1e3a4eaf4..645f484965cc 100644 --- a/configure/embeddings/embeddings.Deployment.yaml +++ b/configure/embeddings/embeddings.Deployment.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: embeddings - image: us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/embeddings:5.4.2198@sha256:9b0093ee918edbbeed50edab124834d43052710a86a962d0c231e754354223d5 + image: index.docker.io/sourcegraph/embeddings:5.4.2198@sha256:fe9ff18f31ab13c45771670b1fbbc70cd6d243b479a7e26dfef2e1afd48206e8 env: - name: POD_NAME valueFrom: diff --git a/configure/executors/dind/executor.Deployment.yaml b/configure/executors/dind/executor.Deployment.yaml index 05f37ab8e978..cb852d6525af 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:5.4.2198@sha256:c31fde661252f1029c8c047d524fb09822e25e5299bb4208a2c9334d8658a8be + image: index.docker.io/sourcegraph/executor:5.4.2198@sha256:f62903679dad001f82bf1c6c4d748dc2edb52e80fe028ab0a545e5684de489b9 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:5.4.2198@sha256:157d0c4aaed22118e92e57d878a92267854604b3034644da7b9a282c4d1295fe + image: index.docker.io/sourcegraph/dind:5.4.2198@sha256:feaa16b7f7f4757fa3534c21f3f951fed8564b9c163dddd925fa21b7e167870a imagePullPolicy: Always securityContext: privileged: true diff --git a/configure/executors/k8s/executor.Deployment.yaml b/configure/executors/k8s/executor.Deployment.yaml index 635cde4bbc80..d7430652ba42 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:5.4.2198@sha256:2468770df19a944d2d07d68f1d180d2f5a47bd06df1cee8ed33c560548d0ef22 + image: index.docker.io/sourcegraph/executor-kubernetes:5.4.2198@sha256:4085e22e15858a158343e6f18a6d639908fb241bddf45024c77090f6e5181d48 imagePullPolicy: Always livenessProbe: exec: diff --git a/configure/migrator/migrator.Job.yaml b/configure/migrator/migrator.Job.yaml index 9bde5d6f9a38..c445faf4ef97 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:5.4.2198@sha256:c0b25301b59ad3ba1a086da8b86b11637bd7c0d57a9b445ca9e7fb2943b9a820" + image: "index.docker.io/sourcegraph/migrator:5.4.2198@sha256:9c3f106a3847c00b13b62cc6cddc966e8d0175d2fd516b7731fff1186370afe8" args: ["up"] env: - name: PGHOST diff --git a/overlays/bases/pvcs/kustomization.yaml b/overlays/bases/pvcs/kustomization.yaml index 0471734f0b22..e4b442ab224f 100644 --- a/overlays/bases/pvcs/kustomization.yaml +++ b/overlays/bases/pvcs/kustomization.yaml @@ -8,4 +8,3 @@ resources: - base/codeintel-db/codeintel-db.PersistentVolumeClaim.yaml - base/blobstore/blobstore.PersistentVolumeClaim.yaml - base/codeinsights-db/codeinsights-db.PersistentVolumeClaim.yaml - diff --git a/overlays/envoy/gitserver.EnvoyFilter.yaml b/overlays/envoy/gitserver.EnvoyFilter.yaml index 3336f96cd245..eb9239afdb2e 100644 --- a/overlays/envoy/gitserver.EnvoyFilter.yaml +++ b/overlays/envoy/gitserver.EnvoyFilter.yaml @@ -33,4 +33,4 @@ spec: "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions explicit_http_config: http_protocol_options: - enable_trailers: true \ No newline at end of file + enable_trailers: true diff --git a/overlays/envoy/kustomization.yaml b/overlays/envoy/kustomization.yaml index 8ba225e1d557..7e990458b613 100644 --- a/overlays/envoy/kustomization.yaml +++ b/overlays/envoy/kustomization.yaml @@ -5,4 +5,4 @@ resources: - ../bases/deployments - ../bases/rbac-roles - ../bases/pvcs - - gitserver.EnvoyFilter.yaml \ No newline at end of file + - gitserver.EnvoyFilter.yaml diff --git a/overlays/jaeger/grafana.ConfigMap.yaml b/overlays/jaeger/grafana.ConfigMap.yaml index 43dd15c4ad42..fc1022d0be71 100644 --- a/overlays/jaeger/grafana.ConfigMap.yaml +++ b/overlays/jaeger/grafana.ConfigMap.yaml @@ -5,7 +5,7 @@ metadata: data: datasources.yml: | apiVersion: 1 - + datasources: - name: Prometheus type: prometheus diff --git a/overlays/jaeger/jaeger.Deployment.yaml b/overlays/jaeger/jaeger.Deployment.yaml index 56762414ab96..b6ec6e945a03 100644 --- a/overlays/jaeger/jaeger.Deployment.yaml +++ b/overlays/jaeger/jaeger.Deployment.yaml @@ -28,34 +28,34 @@ spec: prometheus.io/scrape: "true" prometheus.io/port: "16686" spec: - containers: - - name: jaeger - image: index.docker.io/sourcegraph/jaeger-all-in-one:insiders@sha256:3b7d972994ba6ae3b58575db3249478e2d9393e8b7f1d5c952523aaf0fdd10cf - args: ["--memory.max-traces=20000"] - ports: - - containerPort: 5775 - protocol: UDP - - containerPort: 6831 - protocol: UDP - - containerPort: 6832 - protocol: UDP - - containerPort: 5778 - protocol: TCP - - containerPort: 16686 - protocol: TCP - - containerPort: 14250 - protocol: TCP - readinessProbe: - httpGet: - path: "/" - port: 14269 - initialDelaySeconds: 5 - resources: - limits: - cpu: "1" - memory: 1G - requests: - cpu: 500m - memory: 500M - securityContext: - runAsUser: 0 + containers: + - name: jaeger + image: index.docker.io/sourcegraph/jaeger-all-in-one:5.4.2198@sha256:da460efb0c0b62c994eac1b1337c369fe1ac1f4aca41e64a1afe757903f77fd1 + args: ["--memory.max-traces=20000"] + ports: + - containerPort: 5775 + protocol: UDP + - containerPort: 6831 + protocol: UDP + - containerPort: 6832 + protocol: UDP + - containerPort: 5778 + protocol: TCP + - containerPort: 16686 + protocol: TCP + - containerPort: 14250 + protocol: TCP + readinessProbe: + httpGet: + path: "/" + port: 14269 + initialDelaySeconds: 5 + resources: + limits: + cpu: "1" + memory: 1G + requests: + cpu: 500m + memory: 500M + securityContext: + runAsUser: 0 diff --git a/overlays/migrate-to-nonprivileged/blobstore/blobstore.Deployment.yaml b/overlays/migrate-to-nonprivileged/blobstore/blobstore.Deployment.yaml index 7ad588b38a4d..ce0092b2d225 100644 --- a/overlays/migrate-to-nonprivileged/blobstore/blobstore.Deployment.yaml +++ b/overlays/migrate-to-nonprivileged/blobstore/blobstore.Deployment.yaml @@ -7,10 +7,10 @@ spec: spec: initContainers: - name: transfer-file-ownership - image: index.docker.io/sourcegraph/alpine-3.14:insiders@sha256:982220e0fd8ce55a73798fa7e814a482c4807c412f054c8440c5970b610239b7 + image: index.docker.io/sourcegraph/alpine-3.14:5.4.2198@sha256:0de2a485bf3be6b5a92bea8f46a134196ed22aea6e906525f9f8f63d0616db7d command: ["sh", "-c", "chown -R 100:101 /data"] volumeMounts: - - mountPath: /data - name: blobstore-data + - mountPath: /data + name: blobstore-data securityContext: runAsUser: 0 diff --git a/overlays/migrate-to-nonprivileged/gitserver/gitserver.StatefulSet.yaml b/overlays/migrate-to-nonprivileged/gitserver/gitserver.StatefulSet.yaml index b2f3c76b7a6d..d431bc552832 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:insiders@sha256:982220e0fd8ce55a73798fa7e814a482c4807c412f054c8440c5970b610239b7 + image: index.docker.io/sourcegraph/alpine-3.14:5.4.2198@sha256:0de2a485bf3be6b5a92bea8f46a134196ed22aea6e906525f9f8f63d0616db7d 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 baed3900cc17..a63eb45cb6af 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:insiders@sha256:982220e0fd8ce55a73798fa7e814a482c4807c412f054c8440c5970b610239b7 + image: index.docker.io/sourcegraph/alpine-3.14:5.4.2198@sha256:0de2a485bf3be6b5a92bea8f46a134196ed22aea6e906525f9f8f63d0616db7d 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 30f2ca8da9c6..c022e8bcdcce 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:insiders@sha256:982220e0fd8ce55a73798fa7e814a482c4807c412f054c8440c5970b610239b7 + image: index.docker.io/sourcegraph/alpine-3.14:5.4.2198@sha256:0de2a485bf3be6b5a92bea8f46a134196ed22aea6e906525f9f8f63d0616db7d command: ["sh", "-c", "chown -R 100:101 /data"] volumeMounts: - mountPath: /data diff --git a/overlays/migrate-to-nonprivileged/kustomization.yaml b/overlays/migrate-to-nonprivileged/kustomization.yaml index aef3a5395e3e..65e9ec06c6d5 100644 --- a/overlays/migrate-to-nonprivileged/kustomization.yaml +++ b/overlays/migrate-to-nonprivileged/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization # If you have used an alternative namespace, please change the default value below before generating your overlays. -namespace: default +namespace: default resources: - ../non-privileged patchesStrategicMerge: diff --git a/overlays/migrate-to-nonprivileged/prometheus/prometheus.Deployment.yaml b/overlays/migrate-to-nonprivileged/prometheus/prometheus.Deployment.yaml index ad2789a788ff..fead73c4ba77 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:insiders@sha256:982220e0fd8ce55a73798fa7e814a482c4807c412f054c8440c5970b610239b7 + image: index.docker.io/sourcegraph/alpine-3.14:5.4.2198@sha256:0de2a485bf3be6b5a92bea8f46a134196ed22aea6e906525f9f8f63d0616db7d 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 c99754068ea4..abe9ea8afb69 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:insiders@sha256:982220e0fd8ce55a73798fa7e814a482c4807c412f054c8440c5970b610239b7 + image: index.docker.io/sourcegraph/alpine-3.14:5.4.2198@sha256:0de2a485bf3be6b5a92bea8f46a134196ed22aea6e906525f9f8f63d0616db7d 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 fbab628bf00c..f9ad397896f9 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:insiders@sha256:982220e0fd8ce55a73798fa7e814a482c4807c412f054c8440c5970b610239b7 + image: index.docker.io/sourcegraph/alpine-3.14:5.4.2198@sha256:0de2a485bf3be6b5a92bea8f46a134196ed22aea6e906525f9f8f63d0616db7d 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 fbaaa7cd6143..67d4bca25189 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:insiders@sha256:982220e0fd8ce55a73798fa7e814a482c4807c412f054c8440c5970b610239b7 + image: index.docker.io/sourcegraph/alpine-3.14:5.4.2198@sha256:0de2a485bf3be6b5a92bea8f46a134196ed22aea6e906525f9f8f63d0616db7d command: ["sh", "-c", "if [[ \"$(stat -c '%u' /mnt/cache)\" -ne 100 ]]; then chown -R 100:101 /mnt/cache; fi"] volumeMounts: - mountPath: /mnt/cache diff --git a/overlays/non-privileged/frontend/sourcegraph-frontend.Deployment.yaml b/overlays/non-privileged/frontend/sourcegraph-frontend.Deployment.yaml index 6ad2e718ca5f..9de0d242672f 100644 --- a/overlays/non-privileged/frontend/sourcegraph-frontend.Deployment.yaml +++ b/overlays/non-privileged/frontend/sourcegraph-frontend.Deployment.yaml @@ -12,9 +12,9 @@ spec: runAsUser: 100 runAsGroup: 101 containers: - - name: frontend - securityContext: - # Required to prevent escalations to root. - allowPrivilegeEscalation: false - runAsUser: 100 - runAsGroup: 101 + - name: frontend + securityContext: + # Required to prevent escalations to root. + allowPrivilegeEscalation: false + runAsUser: 100 + runAsGroup: 101