Skip to content

Commit f83921e

Browse files
⚗️ upgrade distribution registry to v3.0.0, add tracing (ITISFoundation#1182)
* wip * Add csi-s3 and have portainer use it * Change request @Hrytsuk 1GB max portainer volume size * Arch Linux Certificates Customization * Fix pgsql exporter failure * [Kubernetes] Introduce on-prem persistent Storage (Longhorn) 🎉 (ITISFoundation#979) * Introduce longhorn chart * Further longhorn configuration * Longhorn: further settings configuration * Fix longhorn configuration bugs Extra: introduce longhorn pv vales for portainer * Add comment for deletion longhorn * Further longhorn configuration * Add README.md for Longhorn wit FAQ * Update Longhorn readme * Update readme * Futher LH configuration * Update LH's Readme * Update Longhorn Readme * Improve LH's Readme * LH: Reduce reserved default disk space to 5% Since we use a dedicated disk for LH, we can go ahead with 5% * Use values to set Longhorn storage class * Update LH's Readme * LH Readme: add requirements reference * PR Review: bring back portainer s3 pv * LH: decrease portinaer volume size * Experimental: Try to add tracing to simcore-traefik on master * Fixes ITISFoundation/osparc-simcore#7363 * Arch Linux Certificates Customization - 2 * Upgrade registry, add tracing * revert accidental commit --------- Co-authored-by: Dustin Kaiser <[email protected]> Co-authored-by: YH <[email protected]>
1 parent 68933ce commit f83921e

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

services/registry/docker-compose.yml.j2

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3.7"
22
services:
33
registry:
4-
image: registry:2.8.3
4+
image: registry:3.0.0
55
command: ["/bin/sh", "/etc/docker/registry/init"]
66
environment:
77
REGISTRY_HTTP_HOST: "https://${REGISTRY_DOMAIN}"
@@ -31,6 +31,9 @@ services:
3131
REGISTRY_LOG_ACCESSLOG_DISABLED: ${REGISTRY_LOG_ACCESSLOG_DISABLED}
3232
# set to true if using self-signed certificates
3333
UPDATE_CERTIFICATES: "false"
34+
# OpenTelemetry
35+
OTEL_EXPORTER_OTLP_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}:${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
36+
OTEL_SERVICE_NAME: registry-simcore
3437
networks:
3538
- public
3639
- monitored
@@ -77,7 +80,7 @@ services:
7780
{%- raw %}
7881
hostname: "registry-ptc-{{.Node.Hostname}}-{{.Task.Slot}}"
7982
{%- endraw %}
80-
image: registry:2.8.3
83+
image: registry:3.0.0
8184
environment:
8285
REGISTRY_HTTP_SECRET: ${REGISTRY_PULL_THROUGH_CACHE_HTTP_SECRET}
8386
# S3
@@ -100,6 +103,9 @@ services:
100103
# Logs
101104
REGISTRY_LOG_LEVEL: ${REGISTRY_PULL_THROUGH_CACHE_LOG_LEVEL}
102105
REGISTRY_LOG_ACCESSLOG_DISABLED: ${REGISTRY_PULL_THROUGH_CACHE_LOG_ACCESSLOG_DISABLED}
106+
# OpenTelemetry
107+
OTEL_EXPORTER_OTLP_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}:${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
108+
OTEL_SERVICE_NAME: registry-pull-through-cache
103109
ports:
104110
- mode: host
105111
target: 5000

services/registry/template.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@ REGISTRY_PULL_THROUGH_CACHE_LOG_ACCESSLOG_DISABLED=${REGISTRY_PULL_THROUGH_CACHE
3232

3333
DOCKER_HUB_LOGIN=${DOCKER_HUB_LOGIN}
3434
DOCKER_HUB_PASSWORD=${DOCKER_HUB_PASSWORD}
35+
36+
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT=${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
37+
TRACING_OPENTELEMETRY_COLLECTOR_PORT=${TRACING_OPENTELEMETRY_COLLECTOR_PORT}

0 commit comments

Comments
 (0)