From 5032a2ee531881f2d0d55d98e19de033c49b27ba Mon Sep 17 00:00:00 2001 From: Release Bot <107104610+sourcegraph-release-bot@users.noreply.github.com> Date: Thu, 19 Mar 2026 16:53:49 -0400 Subject: [PATCH 1/5] [Backport 7.1.x] chore/platform: update k8s to support jaeger 2.16 config (#428) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport 3adbbdd73c5d7e92d07ace2c2636d12bb6174f81 from #427 ## Description closes PLAT-486 Update manifests to support 2.16 jaeger configurations style This follows changes to the sourcegraph jaeger base image https://github.com/sourcegraph/sourcegraph/pull/10912 ## Test plan `kubectl kustomize base/monitoring/jaeger`
``` ➜ deploy-sourcegraph-k8s git:(wg/plat/jaeger-2.16) ✗ kubectl kustomize base/monitoring/jaeger apiVersion: v1 kind: Service metadata: labels: app: jaeger app.kubernetes.io/component: jaeger app.kubernetes.io/name: jaeger deploy: sourcegraph sourcegraph-resource-requires: no-cluster-admin name: jaeger-collector spec: ports: - name: http-otlp port: 4318 protocol: TCP targetPort: http-otlp - name: grpc-otlp port: 4317 protocol: TCP targetPort: grpc-otlp selector: app.kubernetes.io/component: all-in-one app.kubernetes.io/name: jaeger type: ClusterIP --- apiVersion: v1 kind: Service metadata: labels: app: jaeger app.kubernetes.io/component: jaeger app.kubernetes.io/name: jaeger deploy: sourcegraph sourcegraph-resource-requires: no-cluster-admin name: jaeger-query spec: ports: - name: query-http port: 16686 protocol: TCP targetPort: 16686 selector: app.kubernetes.io/component: all-in-one app.kubernetes.io/name: jaeger type: ClusterIP --- apiVersion: apps/v1 kind: Deployment metadata: labels: app: jaeger app.kubernetes.io/component: jaeger app.kubernetes.io/name: jaeger deploy: sourcegraph sourcegraph-resource-requires: no-cluster-admin name: jaeger spec: replicas: 1 selector: matchLabels: app: jaeger app.kubernetes.io/component: all-in-one app.kubernetes.io/name: jaeger strategy: type: Recreate template: metadata: annotations: prometheus.io/port: "16686" prometheus.io/scrape: "true" labels: app: jaeger app.kubernetes.io/component: all-in-one app.kubernetes.io/name: jaeger deploy: sourcegraph spec: containers: - args: - --config=/etc/jaeger/jaeger-config.yaml image: index.docker.io/sourcegraph/jaeger-all-in-one:6.2.1106@sha256:c1ee8d613be75032066a9da24f54ebae19eacb63e42338e920abd6383ce168a6 name: jaeger ports: - containerPort: 5778 protocol: TCP - containerPort: 16686 name: http protocol: TCP - containerPort: 4317 name: grpc-otlp protocol: TCP - containerPort: 4318 name: http-otlp protocol: TCP - containerPort: 13133 name: health protocol: TCP readinessProbe: httpGet: path: /status port: 13133 initialDelaySeconds: 5 resources: limits: cpu: "1" memory: 1G requests: cpu: 500m memory: 500M securityContext: allowPrivilegeEscalation: false runAsGroup: 101 runAsUser: 100 securityContext: fsGroup: 101 fsGroupChangePolicy: OnRootMismatch runAsUser: 100 ```
Co-authored-by: Warren Gifford --- .../jaeger/jaeger-collector.Service.yaml | 16 +++++--------- base/monitoring/jaeger/jaeger.Deployment.yaml | 22 +++++++++---------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/base/monitoring/jaeger/jaeger-collector.Service.yaml b/base/monitoring/jaeger/jaeger-collector.Service.yaml index 2e714724..7ded3332 100644 --- a/base/monitoring/jaeger/jaeger-collector.Service.yaml +++ b/base/monitoring/jaeger/jaeger-collector.Service.yaml @@ -10,18 +10,14 @@ metadata: app.kubernetes.io/name: jaeger spec: ports: - - name: jaeger-collector-tchannel - port: 14267 + - name: http-otlp + port: 4318 protocol: TCP - targetPort: 14267 - - name: jaeger-collector-http - port: 4321 + targetPort: http-otlp + - name: grpc-otlp + port: 4317 protocol: TCP - targetPort: 4321 - - name: jaeger-collector-grpc - port: 4320 - protocol: TCP - targetPort: 4320 + targetPort: grpc-otlp selector: app.kubernetes.io/name: jaeger app.kubernetes.io/component: all-in-one diff --git a/base/monitoring/jaeger/jaeger.Deployment.yaml b/base/monitoring/jaeger/jaeger.Deployment.yaml index 89796e7d..5f83fbf1 100644 --- a/base/monitoring/jaeger/jaeger.Deployment.yaml +++ b/base/monitoring/jaeger/jaeger.Deployment.yaml @@ -31,26 +31,26 @@ spec: containers: - name: jaeger image: index.docker.io/sourcegraph/jaeger-all-in-one:6.2.1106@sha256:c1ee8d613be75032066a9da24f54ebae19eacb63e42338e920abd6383ce168a6 - args: ["--memory.max-traces=20000", "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json", "--collector.otlp.enabled"] + args: ["--config=/etc/jaeger/jaeger-config.yaml"] ports: - - containerPort: 5775 - protocol: UDP - - containerPort: 6831 - protocol: UDP - - containerPort: 6832 - protocol: UDP - containerPort: 5778 protocol: TCP - containerPort: 16686 + name: http protocol: TCP - - containerPort: 4320 + - containerPort: 4317 + name: grpc-otlp protocol: TCP - - containerPort: 4321 + - containerPort: 4318 + name: http-otlp + protocol: TCP + - containerPort: 13133 + name: health protocol: TCP readinessProbe: httpGet: - path: "/" - port: 14269 + path: "/status" + port: 13133 initialDelaySeconds: 5 resources: limits: From 37874b661dce219fbd4aea02669a1803f4f09de1 Mon Sep 17 00:00:00 2001 From: sourcegraph-bot-2 <87207425+sourcegraph-bot-2@users.noreply.github.com> Date: Mon, 6 Apr 2026 13:34:24 -0600 Subject: [PATCH 2/5] Update K8s images in base to v7.1.2426 --- 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 +- 21 files changed, 31 insertions(+), 31 deletions(-) diff --git a/base/monitoring/cadvisor/cadvisor.DaemonSet.yaml b/base/monitoring/cadvisor/cadvisor.DaemonSet.yaml index 38da1e2d..b16f2030 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-docker.pkg.dev/sourcegraph-images/internal/cadvisor:7.1.2426@sha256:0d18f257645143c62b3f570419c3629ad61b976cf9cfe0602a4da74913062947 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..cdf4ac8b 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-docker.pkg.dev/sourcegraph-images/internal/grafana:7.1.2426@sha256:511b7625de0279cfc882c4cbbedbbd3af0643aa7056d86243d7d9c830b46dec8 terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 3370 diff --git a/base/monitoring/jaeger/jaeger.Deployment.yaml b/base/monitoring/jaeger/jaeger.Deployment.yaml index 5f83fbf1..451a1a3f 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-docker.pkg.dev/sourcegraph-images/internal/jaeger-all-in-one:7.1.2426@sha256:65756fcd95c9475c3a2b0c7efdd5a4d43c1a5a0786cfefc3599d9a3f09823b94 args: ["--config=/etc/jaeger/jaeger-config.yaml"] ports: - containerPort: 5778 diff --git a/base/monitoring/node-exporter/node-exporter.DaemonSet.yaml b/base/monitoring/node-exporter/node-exporter.DaemonSet.yaml index bafea319..a8278a5a 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-docker.pkg.dev/sourcegraph-images/internal/node-exporter:7.1.2426@sha256:d440c196d6abf104de1e1e12f9889c3a074f70ca3f68f7631737f179b24d0b77 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..49004985 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-docker.pkg.dev/sourcegraph-images/internal/opentelemetry-collector:7.1.2426@sha256:b0a7c9f1aaf0a6031d0bb2ca337a73a914ab7373819564c4111b7e1b17556827 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..31a7b6c6 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-docker.pkg.dev/sourcegraph-images/internal/opentelemetry-collector:7.1.2426@sha256:b0a7c9f1aaf0a6031d0bb2ca337a73a914ab7373819564c4111b7e1b17556827 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..b063dc8e 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-docker.pkg.dev/sourcegraph-images/internal/prometheus:7.1.2426@sha256:ad7f483e84ed34b0677a361bca542cc6db50b97c1fafc9b2ed87902c613bb7f9 terminationMessagePolicy: FallbackToLogsOnError env: - name: SG_NAMESPACE diff --git a/base/sourcegraph/blobstore/blobstore.Deployment.yaml b/base/sourcegraph/blobstore/blobstore.Deployment.yaml index 134d301c..6e8fe24f 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-docker.pkg.dev/sourcegraph-images/internal/blobstore:7.1.2426@sha256:bdfdd541cd43dd5541f9035ffbf9c8df5ca42b4d54c42758eefdd06e584b524c 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..b3d575ae 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-docker.pkg.dev/sourcegraph-images/internal/alpine-3.14:7.1.2426@sha256:fa4283196cd787c2ff5e1a73dfe8528568e4f5fc55c07719f07e0cf461fcc730 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-docker.pkg.dev/sourcegraph-images/internal/postgresql-16-codeinsights:7.1.2426@sha256:baf4981054efb9cd4c48949aa02b48c84e8c2a98253eb914ed47f2aed91386cd 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-docker.pkg.dev/sourcegraph-images/internal/postgres_exporter:7.1.2426@sha256:7d4993ecd62b6cab7dfc755c5ec2972f9fa6837a3358cbaece75a1b75192db3c 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..6640fefb 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-docker.pkg.dev/sourcegraph-images/internal/alpine-3.14:7.1.2426@sha256:fa4283196cd787c2ff5e1a73dfe8528568e4f5fc55c07719f07e0cf461fcc730 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-docker.pkg.dev/sourcegraph-images/internal/postgresql-16:7.1.2426@sha256:ddf421767125cb5ba492a5915875d140452961fdaadd5e42d541744a93162aa5 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-docker.pkg.dev/sourcegraph-images/internal/postgres_exporter:7.1.2426@sha256:7d4993ecd62b6cab7dfc755c5ec2972f9fa6837a3358cbaece75a1b75192db3c 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..7d097f7f 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-docker.pkg.dev/sourcegraph-images/internal/migrator:7.1.2426@sha256:1a0374787193d4fb2d86dfbb2f63597e10da417cc408111ddeea58d435212221 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-docker.pkg.dev/sourcegraph-images/internal/frontend:7.1.2426@sha256:a5d9c0e2ca1385478168f2e37b535f440b796f8c4c91bb21e57cc6aa55017bb5 args: - serve envFrom: diff --git a/base/sourcegraph/gitserver/gitserver.StatefulSet.yaml b/base/sourcegraph/gitserver/gitserver.StatefulSet.yaml index f36d5238..dcacc26e 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-docker.pkg.dev/sourcegraph-images/internal/gitserver:7.1.2426@sha256:66b967f16de938badc81046c5f34f6e5506ea63567faff015f85468a46983838 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..e3ea8e10 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-docker.pkg.dev/sourcegraph-images/internal/indexed-searcher:7.1.2426@sha256:d6edd6350a711e0683655523f20891175863d69dad0626d44e4fb8bbbfafdd82 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-docker.pkg.dev/sourcegraph-images/internal/search-indexer:7.1.2426@sha256:63199db1a5be7ac4e6ab15de6dab317821f4256030ec0b32834123ab771df7fd terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 6072 diff --git a/base/sourcegraph/pgsql/pgsql.StatefulSet.yaml b/base/sourcegraph/pgsql/pgsql.StatefulSet.yaml index 0e28ed1f..363576a0 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-docker.pkg.dev/sourcegraph-images/internal/alpine-3.14:7.1.2426@sha256:fa4283196cd787c2ff5e1a73dfe8528568e4f5fc55c07719f07e0cf461fcc730 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-docker.pkg.dev/sourcegraph-images/internal/postgresql-16:7.1.2426@sha256:ddf421767125cb5ba492a5915875d140452961fdaadd5e42d541744a93162aa5 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-docker.pkg.dev/sourcegraph-images/internal/postgres_exporter:7.1.2426@sha256:7d4993ecd62b6cab7dfc755c5ec2972f9fa6837a3358cbaece75a1b75192db3c 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..a3107b20 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-docker.pkg.dev/sourcegraph-images/internal/precise-code-intel-worker:7.1.2426@sha256:1bded50154970f4aea0eeb83fbe0878f45bb943fdea55a3224e5ebcaa30cd3d6 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/base/sourcegraph/redis/redis-cache.Deployment.yaml b/base/sourcegraph/redis/redis-cache.Deployment.yaml index a1bb201a..3171e34b 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-docker.pkg.dev/sourcegraph-images/internal/redis-cache:7.1.2426@sha256:48683844e3b7600d28a9f0c0d4a645d4ca11d9b42b77607ac79e64d605c748fd 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-docker.pkg.dev/sourcegraph-images/internal/redis_exporter:7.1.2426@sha256:639b435ec5794d1d0dce364970ea6766f5abc1706c6df91b54affd680bf6d120 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..d6ce35ae 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-docker.pkg.dev/sourcegraph-images/internal/redis-store:7.1.2426@sha256:9f6fe32ab18ae4c07a087b7995236b49b583a92243403051f44b9174ad9b5a55 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-docker.pkg.dev/sourcegraph-images/internal/redis_exporter:7.1.2426@sha256:639b435ec5794d1d0dce364970ea6766f5abc1706c6df91b54affd680bf6d120 terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 9121 diff --git a/base/sourcegraph/searcher/searcher.StatefulSet.yaml b/base/sourcegraph/searcher/searcher.StatefulSet.yaml index 4c16d459..3ca07895 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-docker.pkg.dev/sourcegraph-images/internal/searcher:7.1.2426@sha256:6862c5a7c706a74d323f4bab6a3240795be05189d927342f0d2f6628a0dc58f0 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..6ec4166a 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-docker.pkg.dev/sourcegraph-images/internal/syntactic-code-intel-worker:7.1.2426@sha256:1ede4a4267e81ababaed5baa034d80ffe6003965368b825db504fd2e349b0bf2 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..051f9c68 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-docker.pkg.dev/sourcegraph-images/internal/syntax-highlighter:7.1.2426@sha256:4fada91bdee2b505e243febfbbb3397b4e1dae812a06daf9c9ee39100cbcedd6 terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: diff --git a/base/sourcegraph/worker/worker.Deployment.yaml b/base/sourcegraph/worker/worker.Deployment.yaml index 7abfc40d..a6031689 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-docker.pkg.dev/sourcegraph-images/internal/worker:7.1.2426@sha256:0328b0c28c438980d0b3b6a32841819f7c3c0f54fc6ed905c3b79b7ba91d71ac terminationMessagePolicy: FallbackToLogsOnError livenessProbe: httpGet: From ad1afb1dcd35edf7aaafb649e2e9a36fdef52c57 Mon Sep 17 00:00:00 2001 From: sourcegraph-bot-2 <87207425+sourcegraph-bot-2@users.noreply.github.com> Date: Mon, 6 Apr 2026 13:34:30 -0600 Subject: [PATCH 3/5] Update K8s images in executors to v7.1.2426 --- components/executors/dind/executor.Deployment.yaml | 4 ++-- components/executors/k8s/executor.Deployment.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/executors/dind/executor.Deployment.yaml b/components/executors/dind/executor.Deployment.yaml index 624c6938..7e1bf687 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-docker.pkg.dev/sourcegraph-images/internal/executor:7.1.2426@sha256:685564786cf93a5e4e0a21bf71a2c238ccfb4ef9a305874ff5107eb62f8095d8 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-docker.pkg.dev/sourcegraph-images/internal/dind:7.1.2426@sha256:3ae5dc82928468e0cf6b94252879367b0ececff34c96082d78822cd3f2841a45 imagePullPolicy: Always securityContext: privileged: true diff --git a/components/executors/k8s/executor.Deployment.yaml b/components/executors/k8s/executor.Deployment.yaml index 1fc0277b..c9171b82 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-docker.pkg.dev/sourcegraph-images/internal/executor-kubernetes:7.1.2426@sha256:81c2bf532285b63b33d599d54f41cb0b012d25819ca636f947b7c753a64eb5e4 imagePullPolicy: Always livenessProbe: exec: From ab274ec7aeeed0d853204766559240b4cf72df07 Mon Sep 17 00:00:00 2001 From: sourcegraph-bot-2 <87207425+sourcegraph-bot-2@users.noreply.github.com> Date: Mon, 6 Apr 2026 13:34:33 -0600 Subject: [PATCH 4/5] Update K8s images in migrator to v7.1.2426 --- components/utils/migrator/resources/migrator.Job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/utils/migrator/resources/migrator.Job.yaml b/components/utils/migrator/resources/migrator.Job.yaml index 2f01a9d6..4c66637e 100644 --- a/components/utils/migrator/resources/migrator.Job.yaml +++ b/components/utils/migrator/resources/migrator.Job.yaml @@ -12,7 +12,7 @@ spec: spec: containers: - name: migrator - image: index.docker.io/sourcegraph/migrator:5.1.6@sha256:76facd38029ee611e5bee723736e42eedb633b2c31d4494711c55f59906a5f93 + image: us-docker.pkg.dev/sourcegraph-images/internal/migrator:7.1.2426@sha256:1a0374787193d4fb2d86dfbb2f63597e10da417cc408111ddeea58d435212221 args: ["up"] envFrom: - configMapRef: From d53fa29e232f23141b1fb15e7f3cda394fc98679 Mon Sep 17 00:00:00 2001 From: sourcegraph-bot-2 <87207425+sourcegraph-bot-2@users.noreply.github.com> Date: Mon, 6 Apr 2026 13:34:34 -0600 Subject: [PATCH 5/5] release: v7.1.2426 {"version":"v7.1.2426","inputs":"server=v7.1.2426","type":"patch"}