From c1a09332b25d5d2701bbb99267b7f1c8e373a614 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Wed, 8 Jan 2025 18:25:17 +0000 Subject: [PATCH] release_patch: v5.11.3601 {"version":"v5.11.3601","inputs":"server=v5.11.3601","type":"patch"} --- docker-compose/docker-compose.yaml | 54 +++++++++---------- .../executors/executor.docker-compose.yaml | 2 +- docker-compose/jaeger/docker-compose.yaml | 10 ++-- otel-collector/config.yaml | 2 +- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index fd8454af..f366f1c8 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -13,7 +13,7 @@ services: # for this container will need to be updated to reflect the new connection information. migrator: container_name: migrator - image: 'index.docker.io/sourcegraph/migrator:5.10.0@sha256:fc2b0c4ff82ebca70dd19f48ebb8378eb00d41959466b099c15870e2cacf80d2' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/migrator:5.11.3601@sha256:1c95b64baea122eecdac8b1e78d147b64a619b2446d75a51e26f23e705e88aea' cpus: 0.5 mem_limit: '500m' command: ['up'] @@ -69,7 +69,7 @@ services: # https://caddyserver.com/docs/caddyfile caddy: container_name: caddy - image: 'index.docker.io/sourcegraph/caddy:5.10.0@sha256:c96d066d0fc11c21b734b4dd8433adc0d4e89a2aebb6db015a528c8b9dfd5e85' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/caddy:5.11.3601@sha256:5723bd398a8a8c105c6d2223f87836e3ddc831e1a88d271b022da69021299706' cpus: 4 mem_limit: '4g' environment: @@ -124,7 +124,7 @@ services: # service. sourcegraph-frontend-0: container_name: sourcegraph-frontend-0 - image: 'index.docker.io/sourcegraph/frontend:5.10.0@sha256:ad4d6e08adc455f3bd21a8d5bb112216d89f5568f39a07d5d3629ff65d93bab3' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/frontend:5.11.3601@sha256:b855a4af89dffbcad00aefd5f66affbb49aeb365bf11acdf2cb10d7efa6f8a2c' cpus: 4 mem_limit: '8g' environment: @@ -180,7 +180,7 @@ services: # sourcegraph-frontend-internal: container_name: sourcegraph-frontend-internal - image: 'index.docker.io/sourcegraph/frontend:5.10.0@sha256:ad4d6e08adc455f3bd21a8d5bb112216d89f5568f39a07d5d3629ff65d93bab3' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/frontend:5.11.3601@sha256:b855a4af89dffbcad00aefd5f66affbb49aeb365bf11acdf2cb10d7efa6f8a2c' cpus: 4 mem_limit: '8g' environment: @@ -227,7 +227,7 @@ services: # gitserver-0: container_name: gitserver-0 - image: 'index.docker.io/sourcegraph/gitserver:5.10.0@sha256:55d27f452ea3c31b1c4825f34b5acfa4fe02cb348787c828eae44680707ba7c4' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/gitserver:5.11.3601@sha256:71341569e6613858590111547228b4c60f57db1531423fe61f469050168526c8' cpus: 4 mem_limit: '8g' environment: @@ -250,7 +250,7 @@ services: # zoekt-indexserver-0: container_name: zoekt-indexserver-0 - image: 'index.docker.io/sourcegraph/search-indexer:5.10.0@sha256:684af01ca03734c50740b94b513c128e55489f21b2976d20e81f675a5f49bcff' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/search-indexer:5.11.3601@sha256:8d49c5eeda6a9a89a700fba8959147d3b9cc9b61ca48788a70d5c6de0d292634' cpus: 8 mem_limit: '16g' environment: @@ -273,7 +273,7 @@ services: # zoekt-webserver-0: container_name: zoekt-webserver-0 - image: 'index.docker.io/sourcegraph/indexed-searcher:5.10.0@sha256:04ddb2012406c8cdc04749254194bea62bd5ef4c4adbd0100089afd8665e6084' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/indexed-searcher:5.11.3601@sha256:ebb4594b43fc6cdbd42649df60a0ea8db64fa0ee7f4652ad793474a5f83eaef4' cpus: 8 mem_limit: '50g' environment: @@ -300,7 +300,7 @@ services: # searcher-0: container_name: searcher-0 - image: 'index.docker.io/sourcegraph/searcher:5.10.0@sha256:731c80ef73b171dbe3e79fa5992236df70bc1f7c489b0a7d5139cfed7260f761' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/searcher:5.11.3601@sha256:44d02355ab8b555f0bdc448fcd4ca53ddb3f1a84a2d6da95eb63795019325412' cpus: 2 mem_limit: '2g' environment: @@ -324,7 +324,7 @@ services: # precise-code-intel-worker: container_name: precise-code-intel-worker - image: 'index.docker.io/sourcegraph/precise-code-intel-worker:5.10.0@sha256:24c5a52c046fdbe9d923b3d69ad561949f021ba0a31858784c3afc7294c7096f' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/precise-code-intel-worker:5.11.3601@sha256:9d96033a00ad636edc3e2fb003922dc460619677c3766d77d83b20df4252acc8' cpus: 2 mem_limit: '4g' environment: @@ -350,7 +350,7 @@ services: # repo-updater: container_name: repo-updater - image: 'index.docker.io/sourcegraph/repo-updater:5.10.0@sha256:1a4cfe362f430166f961a72a27edde58cb97536d424a99e41a1bf159960e37cd' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/repo-updater:5.11.3601@sha256:24d58b4ab325127c205649fe8d9bc45ab6b33c8895d3d0f73851498a19e2e522' cpus: 4 mem_limit: '4g' environment: @@ -370,7 +370,7 @@ services: # worker: container_name: worker - image: 'index.docker.io/sourcegraph/worker:5.10.0@sha256:2f64d6c46a26d0502754e8d37614c2d5aeb1174d0945296e214185f2c13014a9' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/worker:5.11.3601@sha256:688df5d748e08834a4e011b0ac8a8f542171b12cf7b7a69c0e6584320719be17' cpus: 4 mem_limit: '4g' environment: @@ -396,7 +396,7 @@ services: # syntect-server: container_name: syntect-server - image: 'index.docker.io/sourcegraph/syntax-highlighter:5.10.0@sha256:d4398f091fd32508b32bfae59c2ec2ea00f6bf8c95ebb7e7dddf28288bca34cf' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/syntax-highlighter:5.11.3601@sha256:b283f8bf6452bd74132a490a2a456742395027b2506c1a2e429665ba58c351d5' cpus: 4 mem_limit: '6g' healthcheck: @@ -417,7 +417,7 @@ services: # symbols-0: container_name: symbols-0 - image: 'index.docker.io/sourcegraph/symbols:5.10.0@sha256:718b7c0be30715c2e199865227bcec8afe0dbda87146fd2d85ccc86451799e31' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/symbols:5.11.3601@sha256:d69267ad3f3d81647ca3dae73da70c1c85dcf932a25048bdf0b2dfcc86dab88f' cpus: 2 mem_limit: '4g' environment: @@ -443,7 +443,7 @@ services: # prometheus: container_name: prometheus - image: 'index.docker.io/sourcegraph/prometheus:5.10.0@sha256:762cdd16736f3abf4865c468b87d59c12dbcaa671b2450df43cb56cfc8dda5af' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/prometheus:5.11.3601@sha256:6edf7bc8fc2f5c95c46e5eac28cf71830fe3c095f8ac42213f5d469a988a05db' cpus: 4 mem_limit: '8g' volumes: @@ -470,7 +470,7 @@ services: # 'GF_SERVER_ROOT_URL='https://grafana.example.com' grafana: container_name: grafana - image: 'index.docker.io/sourcegraph/grafana:5.10.0@sha256:91a911a1682b53b025394b1096f6b7c0108554520dd549168a9d6281b810f417' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/grafana:5.11.3601@sha256:69e5a2febde068d31a1c2edb5a0a14d3b495327d1d6f4ebe3bf36984afedf123' cpus: 1 mem_limit: '1g' volumes: @@ -491,7 +491,7 @@ services: # cadvisor: container_name: cadvisor - image: 'index.docker.io/sourcegraph/cadvisor:5.10.0@sha256:26767f32ffeaf4e3cfba699c34951f49ac8312cbca4dc36609c3bec3cd2a2d8e' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/cadvisor:5.11.3601@sha256:bf5a09b2fde8b4395eb82ee487887693f3715d3a884e00f1b43752e326465b39' cpus: 1 mem_limit: '1g' # You may set `privileged` to `false and `cadvisor` will run with reduced privileges. @@ -524,7 +524,7 @@ services: # node-exporter: container_name: node-exporter - image: 'index.docker.io/sourcegraph/node-exporter:5.10.0@sha256:f0c08bdefaa90f85aad5b04c7a72f34ebade031ac23e23ea40969c78e3d8cbc9' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/node-exporter:5.11.3601@sha256:2e2d963634ce8090c21fcfaca996575ab7c38f6b27db349ee2cb03dd15e817a5' cpus: .5 mem_limit: '1g' pid: 'host' @@ -553,7 +553,7 @@ services: # pgsql: container_name: pgsql - image: 'index.docker.io/sourcegraph/postgresql-16:5.10.0@sha256:3605d1f49c24518ecbbae57db89aaaea46664db1235e5eb7b83ca229cc471358' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16:5.11.3601@sha256:b7100a7686dda9e4374c6c78197bc81e4af7abfaaa934a5ef5993bb7ecf11b6b' cpus: 4 mem_limit: '4g' shm_size: '1g' @@ -581,7 +581,7 @@ services: # for this container will need to be updated to reflect the new connection information. pgsql-exporter: container_name: pgsql-exporter - image: 'index.docker.io/sourcegraph/postgres_exporter:5.10.0@sha256:318706b084bd485aa6eb0d61f7d66d915db8b3054e651d5b7114ff84343acc24' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.11.3601@sha256:6c5b300b1f47c714faf00754b0089474c64cd928b959aa48d126e7d4c573a20c' cpus: 0.1 mem_limit: '50m' networks: @@ -600,7 +600,7 @@ services: # codeintel-db: container_name: codeintel-db - image: 'index.docker.io/sourcegraph/postgresql-16:5.10.0@sha256:3605d1f49c24518ecbbae57db89aaaea46664db1235e5eb7b83ca229cc471358' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16:5.11.3601@sha256:b7100a7686dda9e4374c6c78197bc81e4af7abfaaa934a5ef5993bb7ecf11b6b' cpus: 4 mem_limit: '4g' shm_size: '1g' @@ -628,7 +628,7 @@ services: # for this container will need to be updated to reflect the new connection information. codeintel-db-exporter: container_name: codeintel-db-exporter - image: 'index.docker.io/sourcegraph/postgres_exporter:5.10.0@sha256:318706b084bd485aa6eb0d61f7d66d915db8b3054e651d5b7114ff84343acc24' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.11.3601@sha256:6c5b300b1f47c714faf00754b0089474c64cd928b959aa48d126e7d4c573a20c' cpus: 0.1 mem_limit: '50m' networks: @@ -647,7 +647,7 @@ services: # codeinsights-db: container_name: codeinsights-db - image: 'index.docker.io/sourcegraph/postgresql-16-codeinsights:5.10.0@sha256:fc3bc82f68abe635bb164af6b5d00ca3017a9b862ac0c930be2e8766a12ad810' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16-codeinsights:5.11.3601@sha256:ed43d9a08b6a5742267c826bad042b3c0bd5bf60b0e9cc307e7734a2afef4357' cpus: 4 mem_limit: '2g' shm_size: '1g' @@ -680,7 +680,7 @@ services: # for this container will need to be updated to reflect the new connection information. codeinsights-db-exporter: container_name: codeinsights-db-exporter - image: 'index.docker.io/sourcegraph/postgres_exporter:5.10.0@sha256:318706b084bd485aa6eb0d61f7d66d915db8b3054e651d5b7114ff84343acc24' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.11.3601@sha256:6c5b300b1f47c714faf00754b0089474c64cd928b959aa48d126e7d4c573a20c' cpus: 0.1 mem_limit: '50m' networks: @@ -699,7 +699,7 @@ services: # blobstore: container_name: blobstore - image: 'index.docker.io/sourcegraph/blobstore:5.10.0@sha256:075736a86c5e4cf0cc889d4e895b469eb4f8c2b094e9bc61490b10acb5dfb1dd' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/blobstore:5.11.3601@sha256:5b8ce4604c628fc30f5a512e9a146d612996619cae38e90b421c775c1d07e0bd' cpus: 1 mem_limit: '1g' healthcheck: @@ -722,7 +722,7 @@ services: # redis-cache: container_name: redis-cache - image: 'index.docker.io/sourcegraph/redis-cache:5.10.0@sha256:98d7e9bb26f2424e0ab29c026aa38460c1f9ebe65d0f26733382af65d34edac4' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-cache:5.11.3601@sha256:ad833fb86cf9d2c4607c8cc314431ab022e460a8bcf74329241838f4f1c17553' cpus: 1 mem_limit: '7g' volumes: @@ -738,7 +738,7 @@ services: # redis-store: container_name: redis-store - image: 'index.docker.io/sourcegraph/redis-store:5.10.0@sha256:e129eb8901f12a5e7d022e0de17fd69166fba4595c085e6571a2bbe95de17f16' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-store:5.11.3601@sha256:ee1288e9e59b720f5ae096cec7d7d50b7159ae081a1c48371651dc359f597061' cpus: 1 mem_limit: '7g' volumes: @@ -753,7 +753,7 @@ services: # Ports exposed to the public internet: none otel-collector: container_name: otel-collector - image: 'index.docker.io/sourcegraph/opentelemetry-collector:5.10.0@sha256:35ff98cd292bacc48834f1d261d4090d6980f497a4c1028769d4f132f6ceefc9' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/opentelemetry-collector:5.11.3601@sha256:58ab376b226c53e3b88d67409b4b8933f2d6d4be1663c6176fd9546762bb70a4' cpus: 1 mem_limit: '1g' networks: diff --git a/docker-compose/executors/executor.docker-compose.yaml b/docker-compose/executors/executor.docker-compose.yaml index fb6e162e..18a59fb3 100644 --- a/docker-compose/executors/executor.docker-compose.yaml +++ b/docker-compose/executors/executor.docker-compose.yaml @@ -2,7 +2,7 @@ version: '2.4' services: executor: container_name: executor - image: 'index.docker.io/sourcegraph/executor:5.10.0@sha256:1d354b4e6fc2ead29c413341f6107beefb08810394325f6c8b45eb0b22802ecc' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/executor:5.11.3601@sha256:ad1161f78d3ecbcd74ff92775f8f928ff770867daa93017e2ca8f9264b72e087' cpus: 1 mem_limit: '4g' # Run as root (required for docker daemon control) diff --git a/docker-compose/jaeger/docker-compose.yaml b/docker-compose/jaeger/docker-compose.yaml index d544bb04..f19d6537 100644 --- a/docker-compose/jaeger/docker-compose.yaml +++ b/docker-compose/jaeger/docker-compose.yaml @@ -4,13 +4,13 @@ services: # (https://www.jaegertracing.io/docs/1.17/getting-started/#all-in-one) for distributed tracing. # # Disk: none - # Ports exposed to other Sourcegraph services: 5778/TCP 6831/UDP 6832/UDP 14250/TCP 4320/UDP 4321/UDP + # Ports exposed to other Sourcegraph services: 5778/TCP 6831/UDP 6832/UDP 14250/TCP 4317/UDP 4321/UDP # Ports exposed to the public internet: none # Ports exposed to site admins only: 16686/HTTP # jaeger: container_name: jaeger - image: 'index.docker.io/sourcegraph/jaeger-all-in-one:5.10.0@sha256:99c46dfa6b6cbc5477890efc6c878c4318f28a492c08de4ec67885b45d7989d2' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/jaeger-all-in-one:5.11.3601@sha256:a72eb592ad3b1e85da8f64a1318a0adfb0a2a5f0919ff058f526155fe7d3a862' cpus: 0.5 mem_limit: '512m' ports: @@ -18,7 +18,7 @@ services: - '0.0.0.0:16686:16686' # Collector port - '0.0.0.0:14250:14250' - - '0.0.0.0:4320:4320' # gRPC port + - '0.0.0.0:4317:4317' # gRPC port - '0.0.0.0:4321:4321' # HTTP port # Agent ports - '0.0.0.0:5778:5778' @@ -31,14 +31,14 @@ services: environment: - 'SAMPLING_STRATEGIES_FILE=/etc/jaeger/sampling_strategies.json' - 'COLLECTOR_OTLP_ENABLED=true' - - 'JAEGER_OTLP_GRPC_PORT=4320' + - 'JAEGER_OTLP_GRPC_PORT=4317' - 'JAEGER_OTLP_HTTP_PORT=4321' # Configure collector to send traces to Jaeger otel-collector: environment: - JAEGER_HOST=jaeger - - JAEGER_OTLP_GRPC_PORT=4320 + - JAEGER_OTLP_GRPC_PORT=4317 command: ['--config', '/etc/otel-collector/configs/jaeger.yaml'] # Let frontend proxy to Jaeger interface diff --git a/otel-collector/config.yaml b/otel-collector/config.yaml index 75deac98..c29a89cd 100644 --- a/otel-collector/config.yaml +++ b/otel-collector/config.yaml @@ -4,7 +4,7 @@ receivers: otlp: protocols: - grpc: # port 4320 + grpc: # port 4317 http: # port 4321 exporters: