From 92b8e822742eeaed02eda64cbc117009b64e9398 Mon Sep 17 00:00:00 2001 From: Thom Toogood Date: Thu, 31 Oct 2019 13:55:35 +0100 Subject: [PATCH 1/3] Add support for setting relativeurls config. --- changelogs/unreleased/relativeurls.yml | 5 +++++ charts/registry/templates/configmap.yaml | 1 + charts/registry/values.yaml | 3 +++ doc/charts/registry/index.md | 1 + 4 files changed, 10 insertions(+) create mode 100644 changelogs/unreleased/relativeurls.yml diff --git a/changelogs/unreleased/relativeurls.yml b/changelogs/unreleased/relativeurls.yml new file mode 100644 index 0000000000..213d5b006a --- /dev/null +++ b/changelogs/unreleased/relativeurls.yml @@ -0,0 +1,5 @@ +--- +title: Add support for setting relativeurls config. +merge_request: 1007 +author: +type: added diff --git a/charts/registry/templates/configmap.yaml b/charts/registry/templates/configmap.yaml index 9d4d3768e1..cfefdabc6d 100644 --- a/charts/registry/templates/configmap.yaml +++ b/charts/registry/templates/configmap.yaml @@ -26,6 +26,7 @@ data: X-Content-Type-Options: [nosniff] addr: :{{ .Values.service.internalPort }} secret: "HTTP_SECRET" + relativeurls: {{ .Values.relativeurls }} health: {{- if kindIs "map" .Values.health }} {{ toYaml .Values.health | nindent 6 | trim }} diff --git a/charts/registry/values.yaml b/charts/registry/values.yaml index a3ef0fed14..dad1fc2603 100644 --- a/charts/registry/values.yaml +++ b/charts/registry/values.yaml @@ -204,6 +204,9 @@ debug: # receiving a SIGTERM signal draintimeout: '0' +# Enable the registry to return relative URLs in Location headers +relativeurls: false + # https://docs.docker.com/registry/configuration/#health health: storagedriver: diff --git a/doc/charts/registry/index.md b/doc/charts/registry/index.md index 8adfb83860..c2284e4504 100644 --- a/doc/charts/registry/index.md +++ b/doc/charts/registry/index.md @@ -109,6 +109,7 @@ If you chose to deploy this chart as a standalone, remove the `registry` at the | `debug` | | Debug port and prometheus metrics | | `deployment.terminationGracePeriodSeconds` | `30` | Optional duration in seconds the pod needs to terminate gracefully. | | `draintimeout` | `'0'` | Amount of time to wait for HTTP connections to drain after receiving a SIGTERM signal (e.g. `'10s'`) | +| `relativeurls` | `false` | Enable the registry to return relative URLs in Location headers. | | `enabled` | `true` | Enable registry flag | | `hpa.cpu.targetAverageUtilization` | `75` | Target value of the average of the resource metric across all relevant pods which governs the HPA | | `hpa.customMetrics` | `[]` | autoscaling/v2beta1 Metrics contains the specifications for which to use to calculate the desired replica count (overrides the default use of Average CPU Utilization configured in `targetAverageUtilization`) | -- GitLab From e0714af3bc542050092277e253ac13e6a81485ec Mon Sep 17 00:00:00 2001 From: Thom Toogood Date: Wed, 6 Nov 2019 14:58:49 +1300 Subject: [PATCH 2/3] Added author to changelog. --- changelogs/unreleased/relativeurls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/relativeurls.yml b/changelogs/unreleased/relativeurls.yml index 213d5b006a..309e0a08f8 100644 --- a/changelogs/unreleased/relativeurls.yml +++ b/changelogs/unreleased/relativeurls.yml @@ -1,5 +1,5 @@ --- title: Add support for setting relativeurls config. merge_request: 1007 -author: +author: thom8 type: added -- GitLab From 270d0caa215fb420fe31a8ddab3bb0afc2d28ad1 Mon Sep 17 00:00:00 2001 From: Thom Toogood Date: Wed, 6 Nov 2019 16:58:37 +1300 Subject: [PATCH 3/3] Updated changelog title. --- changelogs/unreleased/relativeurls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/relativeurls.yml b/changelogs/unreleased/relativeurls.yml index 309e0a08f8..fbacc4b9fb 100644 --- a/changelogs/unreleased/relativeurls.yml +++ b/changelogs/unreleased/relativeurls.yml @@ -1,5 +1,5 @@ --- -title: Add support for setting relativeurls config. +title: "Registry: Add support for setting relativeurls config." merge_request: 1007 author: thom8 type: added -- GitLab