From 065f6c5c4454dbc572a5836ef726f916365fde82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jan 2025 02:32:57 +0000 Subject: [PATCH 01/17] Bump helm/chart-releaser-action from 1.6.0 to 1.7.0 Bumps [helm/chart-releaser-action](https://github.com/helm/chart-releaser-action) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/helm/chart-releaser-action/releases) - [Commits](https://github.com/helm/chart-releaser-action/compare/v1.6.0...v1.7.0) --- updated-dependencies: - dependency-name: helm/chart-releaser-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/helm_release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm_release.yaml b/.github/workflows/helm_release.yaml index 4263e76d..c9e1b8ac 100644 --- a/.github/workflows/helm_release.yaml +++ b/.github/workflows/helm_release.yaml @@ -20,7 +20,7 @@ jobs: git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - name: Install chart-releaser - uses: helm/chart-releaser-action@v1.6.0 + uses: helm/chart-releaser-action@v1.7.0 with: install_only: true From 5af937bbce12400628913ff453da5219d53214d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Apr 2025 02:47:40 +0000 Subject: [PATCH 02/17] Bump marocchino/sticky-pull-request-comment from 2.2.0 to 2.9.2 Bumps [marocchino/sticky-pull-request-comment](https://github.com/marocchino/sticky-pull-request-comment) from 2.2.0 to 2.9.2. - [Release notes](https://github.com/marocchino/sticky-pull-request-comment/releases) - [Commits](https://github.com/marocchino/sticky-pull-request-comment/compare/39c5b5dc7717447d0cba270cd115037d32d28443...67d0dec7b07ed060a405f9b2a64b8ab319fdd7db) --- updated-dependencies: - dependency-name: marocchino/sticky-pull-request-comment dependency-version: 2.9.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/pr_diff.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_diff.yaml b/.github/workflows/pr_diff.yaml index 52f6a420..129238bc 100644 --- a/.github/workflows/pr_diff.yaml +++ b/.github/workflows/pr_diff.yaml @@ -44,7 +44,7 @@ jobs: echo 'HELM_DIFF<> $GITHUB_ENV echo "$(diff -ur before after)" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: marocchino/sticky-pull-request-comment@39c5b5dc7717447d0cba270cd115037d32d28443 + - uses: marocchino/sticky-pull-request-comment@67d0dec7b07ed060a405f9b2a64b8ab319fdd7db with: message: | Running a `helm template` smoketest on commit ${{ github.ref }} results in the following diff against `${{ github.base_ref }}`: From e73d9e85c4cf73a2a4bf92f9258426cdbe7d94dc Mon Sep 17 00:00:00 2001 From: Mercbot7 <42525173+Mercbot7@users.noreply.github.com> Date: Mon, 14 Apr 2025 09:20:19 -0400 Subject: [PATCH 03/17] Update gargagecollect cronjob This adds podLabels and podAnnotations to the cronjob job pod and defaults them to the root podLabels and podAnnotations. --- templates/cronjob.yaml | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/templates/cronjob.yaml b/templates/cronjob.yaml index 780cf875..a671cf51 100644 --- a/templates/cronjob.yaml +++ b/templates/cronjob.yaml @@ -17,16 +17,40 @@ spec: app: {{ template "docker-registry.name" . }} release: {{ .Release.Name }} {{- with .Values.podLabels }} - {{ toYaml . | nindent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} {{- if .Values.podAnnotations }} - {{ toYaml .Values.podAnnotations | nindent 8 }} + {{- toYaml .Values.podAnnotations | nindent 8 }} {{- end }} spec: template: + metadata: + labels: + release: {{ .Release.Name }} + {{- if .Values.garbageCollect.podLabels }} + {{- with .Values.garbageCollect.podLabels }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- else if .Values.podLabels }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- end }} + annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} + {{- if .Values.garbageCollect.podAnnotations }} + {{- with .Values.garbageCollect.podAnnotations }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- else if .Values.podAnnotations }} + {{- with .Values.podAnnotations}} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- end }} spec: {{- if or (eq .Values.serviceAccount.create true) (ne .Values.serviceAccount.name "") }} serviceAccountName: {{ .Values.serviceAccount.name | default (include "docker-registry.fullname" .) }} @@ -49,7 +73,7 @@ spec: - garbage-collect - --delete-untagged={{ .Values.garbageCollect.deleteUntagged }} - /etc/docker/registry/config.yml - resources: {{ toYaml .Values.garbageCollect.resources | nindent 12 }} + resources: {{ toYaml .Values.garbageCollect.resources | nindent 16 }} env: {{ include "docker-registry.envs" . | nindent 16 }} {{- if .Values.containerSecurityContext.enabled }} securityContext: {{ omit .Values.containerSecurityContext "enabled" | toYaml | nindent 16 }} From 88ccbc1313fe910176259cd6258dfffa4f8b073b Mon Sep 17 00:00:00 2001 From: Mercbot7 <42525173+Mercbot7@users.noreply.github.com> Date: Mon, 14 Apr 2025 09:23:32 -0400 Subject: [PATCH 04/17] Update values.yaml to match cronjob updates and minor spacing fixes --- values.yaml | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/values.yaml b/values.yaml index 4bdab458..ef8f0414 100644 --- a/values.yaml +++ b/values.yaml @@ -61,11 +61,11 @@ resources: {} # resources, such as Minikube. If you do want to specify resources, uncomment the following # lines, adjust them as necessary, and remove the curly braces after 'resources:'. # limits: - # cpu: 100m - # memory: 128Mi + # cpu: 100m + # memory: 128Mi # requests: - # cpu: 100m - # memory: 128Mi + # cpu: 100m + # memory: 128Mi persistence: accessMode: 'ReadWriteOnce' enabled: false @@ -98,17 +98,17 @@ secrets: # Options for s3 storage type: # s3: -# region: us-east-1 -# regionEndpoint: https://s3.us-east-1.amazonaws.com -# bucket: my-bucket -# rootdirectory: /object/prefix -# encrypt: false -# secure: true +# region: us-east-1 +# regionEndpoint: https://s3.us-east-1.amazonaws.com +# bucket: my-bucket +# rootdirectory: /object/prefix +# encrypt: false +# secure: true # Options for swift storage type: # swift: -# authurl: http://swift.example.com/ -# container: my-container +# authurl: http://swift.example.com/ +# container: my-container # https://docs.docker.com/registry/recipes/mirror/ proxy: @@ -245,4 +245,16 @@ garbageCollect: enabled: false deleteUntagged: true schedule: "0 1 * * *" + podAnnotations: {} + podLabels: {} resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi From d6224c847b7d927357cd0fccc56e17f08837a8d4 Mon Sep 17 00:00:00 2001 From: Mercbot7 <42525173+Mercbot7@users.noreply.github.com> Date: Mon, 14 Apr 2025 15:02:51 -0400 Subject: [PATCH 05/17] refactor logic for lapels and annotations and fix resources --- templates/cronjob.yaml | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/templates/cronjob.yaml b/templates/cronjob.yaml index a671cf51..e15fdab9 100644 --- a/templates/cronjob.yaml +++ b/templates/cronjob.yaml @@ -30,27 +30,13 @@ spec: metadata: labels: release: {{ .Release.Name }} - {{- if .Values.garbageCollect.podLabels }} - {{- with .Values.garbageCollect.podLabels }} - {{- toYaml . | nindent 12 }} - {{- end }} - {{- else if .Values.podLabels }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 12 }} - {{- end }} + {{- if or .Values.podLabels .Values.garbageCollect.podLabels }} + {{- toYaml (merge (.Values.podLabels | default (dict)) (.Values.garbageCollect.podLabels | default (dict))) | nindent 12 }} {{- end }} + {{- if or .Values.podAnnotations .Values.garbageCollect.podAnnotations }} annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} - {{- if .Values.garbageCollect.podAnnotations }} - {{- with .Values.garbageCollect.podAnnotations }} - {{- toYaml . | nindent 12 }} - {{- end }} - {{- else if .Values.podAnnotations }} - {{- with .Values.podAnnotations}} - {{- toYaml . | nindent 12 }} - {{- end }} - {{- end }} + {{- toYaml (merge (.Values.podAnnotations | default (dict)) (.Values.garbageCollect.podAnnotations | default (dict))) | nindent 12 }} + {{- end}} spec: {{- if or (eq .Values.serviceAccount.create true) (ne .Values.serviceAccount.name "") }} serviceAccountName: {{ .Values.serviceAccount.name | default (include "docker-registry.fullname" .) }} @@ -73,7 +59,10 @@ spec: - garbage-collect - --delete-untagged={{ .Values.garbageCollect.deleteUntagged }} - /etc/docker/registry/config.yml - resources: {{ toYaml .Values.garbageCollect.resources | nindent 16 }} + {{- if .Values.garbageCollect.resources }} + resources: + {{- toYaml .Values.garbageCollect.resources | nindent 16 }} + {{- end }} env: {{ include "docker-registry.envs" . | nindent 16 }} {{- if .Values.containerSecurityContext.enabled }} securityContext: {{ omit .Values.containerSecurityContext "enabled" | toYaml | nindent 16 }} From 9bba24a3d2a7c1ce9dc2621136438ecd340dc1f5 Mon Sep 17 00:00:00 2001 From: Mercbot7 <42525173+Mercbot7@users.noreply.github.com> Date: Tue, 15 Apr 2025 09:09:43 -0400 Subject: [PATCH 06/17] reorder merge for proper preference --- templates/cronjob.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/cronjob.yaml b/templates/cronjob.yaml index e15fdab9..e9207762 100644 --- a/templates/cronjob.yaml +++ b/templates/cronjob.yaml @@ -31,11 +31,11 @@ spec: labels: release: {{ .Release.Name }} {{- if or .Values.podLabels .Values.garbageCollect.podLabels }} - {{- toYaml (merge (.Values.podLabels | default (dict)) (.Values.garbageCollect.podLabels | default (dict))) | nindent 12 }} + {{- toYaml (merge (.Values.garbageCollect.podLabels | default (dict)) (.Values.podLabels | default (dict))) | nindent 12 }} {{- end }} {{- if or .Values.podAnnotations .Values.garbageCollect.podAnnotations }} annotations: - {{- toYaml (merge (.Values.podAnnotations | default (dict)) (.Values.garbageCollect.podAnnotations | default (dict))) | nindent 12 }} + {{- toYaml (merge (.Values.garbageCollect.podAnnotations | default (dict)) (.Values.podAnnotations | default (dict))) | nindent 12 }} {{- end}} spec: {{- if or (eq .Values.serviceAccount.create true) (ne .Values.serviceAccount.name "") }} From 53e594b53d09396871e88d16bfe8ec40bb91385e Mon Sep 17 00:00:00 2001 From: Josh Sizer Date: Tue, 15 Apr 2025 21:50:52 -0400 Subject: [PATCH 07/17] =?UTF-8?q?=F0=9F=8F=81=20v2.3.0=20Release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index b0e582ab..c0355720 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Docker Registry name: docker-registry -version: 2.2.3 +version: 2.3.0 appVersion: 2.8.1 home: https://hub.docker.com/_/registry/ icon: https://helm.twun.io/docker-registry.png From 14fc7bb5a2c48dc4857ce6a59671806f58ddffdf Mon Sep 17 00:00:00 2001 From: Mercbot7 <42525173+Mercbot7@users.noreply.github.com> Date: Wed, 16 Apr 2025 12:06:32 -0400 Subject: [PATCH 08/17] Update README.md for garbageCollect Update README.md for garbageCollect Annotations and Labels keys. --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7e7e86b7..622ec9fa 100644 --- a/README.md +++ b/README.md @@ -57,8 +57,8 @@ their default values. | `service.sessionAffinityConfig` | service session affinity config | `nil` | | `replicaCount` | k8s replicas | `1` | | `updateStrategy` | update strategy for deployment | `{}` | -| `podAnnotations` | Annotations for pod | `{}` | -| `podLabels` | Labels for pod | `{}` | +| `podAnnotations` | Annotations for deployment pod, and `garbageCollect` pod unless set explicitly there. See `garbageCollect` | `{}` | +| `podLabels` | Labels for deployment pod, and `garbageCollect` pod unless set explicitly there. See `garbageCollect` | `{}` | | `podDisruptionBudget` | Pod disruption budget | `{}` | | `resources.limits.cpu` | Container requested CPU | `nil` | | `resources.limits.memory` | Container requested memory | `nil` | @@ -119,6 +119,8 @@ their default values. | `garbageCollect.enabled` | If true, will deploy garbage-collector cronjob | `false` | | `garbageCollect.deleteUntagged` | If true, garbage-collector will delete manifests that are not currently referenced via tag | `true` | | `garbageCollect.schedule` | CronTab schedule, please use standard crontab format | `0 1 * * *` | +| `garbageCollect.podAnnotations` | CronJob pod Annotations. If left empty and chart `podAnnotations` are set, will use those. If both are set, these take precedence for the `garbageCollect` pods. | `{}` | +| `garbageCollect.podLabels` | CronJob pod Annotations. If left empty and chart `podLabels` are set, will use those. If both are set, these take precedence for the `garbageCollect` pods. | `{}` | | `garbageCollect.resources` | garbage-collector requested resources | `{}` | Specify each parameter using the `--set key=value[,key=value]` argument to From e3a6eb45bf921adc36ced28de2a8e6a027aa9c7f Mon Sep 17 00:00:00 2001 From: Clovis Durand Date: Tue, 3 Jun 2025 12:29:29 +0200 Subject: [PATCH 09/17] Updated chart to accept configPath to fix distribution's 3.0.0 breaking change Signed-off-by: Clovis Durand --- README.md | 1 + templates/_helpers.tpl | 2 +- templates/cronjob.yaml | 2 +- templates/deployment.yaml | 2 +- values.yaml | 4 +++- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 622ec9fa..e100b7d3 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,7 @@ their default values. | `secrets.swift.password` | Password for Swift configuration | `nil` | | `secrets.haSharedSecret` | Shared secret for Registry | `nil` | | `configData` | Configuration hash for docker | `nil` | +| `configPath` | Configuration mount point in docker, `/etc/docker/registry` for registry version 2, `/etc/distribution` for version 3 | `/etc/docker/registry` | | `s3.region` | S3 region | `nil` | | `s3.regionEndpoint` | S3 region endpoint | `nil` | | `s3.bucket` | S3 bucket name | `nil` | diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index d9d7531b..f7681bb4 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -148,7 +148,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- define "docker-registry.volumeMounts" -}} - name: "{{ template "docker-registry.fullname" . }}-config" - mountPath: "/etc/docker/registry" + mountPath: {{ .Values.configPath }} {{- if .Values.secrets.htpasswd }} - name: auth diff --git a/templates/cronjob.yaml b/templates/cronjob.yaml index e9207762..a5419590 100644 --- a/templates/cronjob.yaml +++ b/templates/cronjob.yaml @@ -58,7 +58,7 @@ spec: - /bin/registry - garbage-collect - --delete-untagged={{ .Values.garbageCollect.deleteUntagged }} - - /etc/docker/registry/config.yml + - {{ .Values.configPath }}/config.yml {{- if .Values.garbageCollect.resources }} resources: {{- toYaml .Values.garbageCollect.resources | nindent 16 }} diff --git a/templates/deployment.yaml b/templates/deployment.yaml index dff79cb5..a8ef2fca 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -60,7 +60,7 @@ spec: command: - /bin/registry - serve - - /etc/docker/registry/config.yml + - {{ .Values.configPath }}/config.yml ports: - containerPort: 5000 {{- if .Values.metrics.enabled }} diff --git a/values.yaml b/values.yaml index ef8f0414..b8c5ce27 100644 --- a/values.yaml +++ b/values.yaml @@ -19,7 +19,7 @@ serviceAccount: image: repository: registry - tag: 2.8.1 + tag: 3.0.0 pullPolicy: IfNotPresent # imagePullSecrets: # - name: docker @@ -133,6 +133,7 @@ metrics: labels: {} rules: {} +configPath: /etc/distribution configData: version: 0.1 log: @@ -176,6 +177,7 @@ securityContext: fsGroupChangePolicy: Always sysctls: [] supplementalGroups: [] + runAsUser: 1000 fsGroup: 1000 priorityClassName: "" From ec1706762ebf20ccc1ba060448e886a8419188b7 Mon Sep 17 00:00:00 2001 From: Kevin Boisits Date: Tue, 3 Jun 2025 18:24:15 -0500 Subject: [PATCH 10/17] Add the ability to force path style for s3 storage --- README.md | 1 + templates/_helpers.tpl | 5 +++++ values.yaml | 1 + 3 files changed, 7 insertions(+) diff --git a/README.md b/README.md index 622ec9fa..2871f952 100644 --- a/README.md +++ b/README.md @@ -85,6 +85,7 @@ their default values. | `s3.rootdirectory` | S3 prefix that is applied to allow you to segment data | `nil` | | `s3.encrypt` | Store images in encrypted format | `nil` | | `s3.secure` | Use HTTPS | `nil` | +| `s3.forcepathstyle` | Use path-style addressing, needed for some s3 compatible storage (minio) | `nil` | | `swift.authurl` | Swift authurl | `nil` | | `swift.container` | Swift container | `nil` | | `proxy.enabled` | If true, registry will function as a proxy/mirror | `false` | diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index d9d7531b..5a754fb7 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -103,6 +103,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this value: {{ .Values.s3.secure | quote }} {{- end -}} +{{- if .Values.s3.forcepathstyle }} +- name: REGISTRY_STORAGE_S3_FORCEPATHSTYLE + value: {{ .Values.s3.forcepathstyle | quote }} +{{- end -}} + {{- else if eq .Values.storage "swift" }} - name: REGISTRY_STORAGE_SWIFT_AUTHURL value: {{ required ".Values.swift.authurl is required" .Values.swift.authurl }} diff --git a/values.yaml b/values.yaml index ef8f0414..38f32cb7 100644 --- a/values.yaml +++ b/values.yaml @@ -104,6 +104,7 @@ secrets: # rootdirectory: /object/prefix # encrypt: false # secure: true +# forcepathstyle: true # Options for swift storage type: # swift: From 8b8e96444e0c4ef805c3daa06aa56f261f50cfc6 Mon Sep 17 00:00:00 2001 From: Kevin Boisits Date: Fri, 6 Jun 2025 21:00:14 -0500 Subject: [PATCH 11/17] Add the ability to skip verifying the TLS cert for s3 storage Allow using self signed cert on S3 storage used --- README.md | 1 + templates/_helpers.tpl | 5 +++++ values.yaml | 1 + 3 files changed, 7 insertions(+) diff --git a/README.md b/README.md index 2871f952..b46d44e0 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,7 @@ their default values. | `s3.encrypt` | Store images in encrypted format | `nil` | | `s3.secure` | Use HTTPS | `nil` | | `s3.forcepathstyle` | Use path-style addressing, needed for some s3 compatible storage (minio) | `nil` | +| `s3.insecureSkipVerify` | Allows connection to s3 storage using TLS with untrusted/self-signed certificate | `nil` | | `swift.authurl` | Swift authurl | `nil` | | `swift.container` | Swift container | `nil` | | `proxy.enabled` | If true, registry will function as a proxy/mirror | `false` | diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 5a754fb7..b5d75db3 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -108,6 +108,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this value: {{ .Values.s3.forcepathstyle | quote }} {{- end -}} +{{- if .Values.s3.insecureSkipVerify }} +- name: REGISTRY_STORAGE_S3_SKIPVERIFY + value: {{ .Values.s3.insecureSkipVerify | quote }} +{{- end -}} + {{- else if eq .Values.storage "swift" }} - name: REGISTRY_STORAGE_SWIFT_AUTHURL value: {{ required ".Values.swift.authurl is required" .Values.swift.authurl }} diff --git a/values.yaml b/values.yaml index 38f32cb7..a04d92e5 100644 --- a/values.yaml +++ b/values.yaml @@ -105,6 +105,7 @@ secrets: # encrypt: false # secure: true # forcepathstyle: true +# insecureSkipVerify: true # Options for swift storage type: # swift: From d344f36b9412363e27b46881047f96699e4c8c0b Mon Sep 17 00:00:00 2001 From: Kevin Boisits Date: Sun, 8 Jun 2025 22:32:26 -0500 Subject: [PATCH 12/17] Change name to match the config variable --- README.md | 2 +- templates/_helpers.tpl | 4 ++-- values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b46d44e0..30f48b4d 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ their default values. | `s3.encrypt` | Store images in encrypted format | `nil` | | `s3.secure` | Use HTTPS | `nil` | | `s3.forcepathstyle` | Use path-style addressing, needed for some s3 compatible storage (minio) | `nil` | -| `s3.insecureSkipVerify` | Allows connection to s3 storage using TLS with untrusted/self-signed certificate | `nil` | +| `s3.skipverify` | Allows connection to s3 storage using TLS with untrusted/self-signed certificate | `nil` | | `swift.authurl` | Swift authurl | `nil` | | `swift.container` | Swift container | `nil` | | `proxy.enabled` | If true, registry will function as a proxy/mirror | `false` | diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index b5d75db3..573276c3 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -108,9 +108,9 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this value: {{ .Values.s3.forcepathstyle | quote }} {{- end -}} -{{- if .Values.s3.insecureSkipVerify }} +{{- if .Values.s3.skipverify }} - name: REGISTRY_STORAGE_S3_SKIPVERIFY - value: {{ .Values.s3.insecureSkipVerify | quote }} + value: {{ .Values.s3.skipverify | quote }} {{- end -}} {{- else if eq .Values.storage "swift" }} diff --git a/values.yaml b/values.yaml index a04d92e5..93f01686 100644 --- a/values.yaml +++ b/values.yaml @@ -105,7 +105,7 @@ secrets: # encrypt: false # secure: true # forcepathstyle: true -# insecureSkipVerify: true +# skipverify: true # Options for swift storage type: # swift: From 55527bf77c9f8e1b8432c9c98d51e2d1b65d9c22 Mon Sep 17 00:00:00 2001 From: Kevin Boisits Date: Sun, 8 Jun 2025 22:33:50 -0500 Subject: [PATCH 13/17] Fix spacing --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 30f48b4d..5c36f88d 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ their default values. | `s3.encrypt` | Store images in encrypted format | `nil` | | `s3.secure` | Use HTTPS | `nil` | | `s3.forcepathstyle` | Use path-style addressing, needed for some s3 compatible storage (minio) | `nil` | -| `s3.skipverify` | Allows connection to s3 storage using TLS with untrusted/self-signed certificate | `nil` | +| `s3.skipverify` | Allows connection to s3 storage using TLS with untrusted/self-signed certificate | `nil` | | `swift.authurl` | Swift authurl | `nil` | | `swift.container` | Swift container | `nil` | | `proxy.enabled` | If true, registry will function as a proxy/mirror | `false` | From 8ff170786c2659c7ad1d104052b2cba1da0b7f87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jun 2025 02:59:41 +0000 Subject: [PATCH 14/17] Bump marocchino/sticky-pull-request-comment from 2.9.2 to 2.9.3 Bumps [marocchino/sticky-pull-request-comment](https://github.com/marocchino/sticky-pull-request-comment) from 2.9.2 to 2.9.3. - [Release notes](https://github.com/marocchino/sticky-pull-request-comment/releases) - [Commits](https://github.com/marocchino/sticky-pull-request-comment/compare/67d0dec7b07ed060a405f9b2a64b8ab319fdd7db...d2ad0de260ae8b0235ce059e63f2949ba9e05943) --- updated-dependencies: - dependency-name: marocchino/sticky-pull-request-comment dependency-version: 2.9.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/pr_diff.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_diff.yaml b/.github/workflows/pr_diff.yaml index 129238bc..a7b20ff4 100644 --- a/.github/workflows/pr_diff.yaml +++ b/.github/workflows/pr_diff.yaml @@ -44,7 +44,7 @@ jobs: echo 'HELM_DIFF<> $GITHUB_ENV echo "$(diff -ur before after)" >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - - uses: marocchino/sticky-pull-request-comment@67d0dec7b07ed060a405f9b2a64b8ab319fdd7db + - uses: marocchino/sticky-pull-request-comment@d2ad0de260ae8b0235ce059e63f2949ba9e05943 with: message: | Running a `helm template` smoketest on commit ${{ github.ref }} results in the following diff against `${{ github.base_ref }}`: From 8662c4fefbbdc6e4f5c29eea68c06c7c0c11a3f9 Mon Sep 17 00:00:00 2001 From: John Weis Date: Tue, 29 Jul 2025 12:20:55 -0400 Subject: [PATCH 15/17] =?UTF-8?q?=F0=9F=8F=81=20v3.0.0=20Release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index c0355720..07887125 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: A Helm chart for Docker Registry name: docker-registry -version: 2.3.0 -appVersion: 2.8.1 +version: 3.0.0 +appVersion: 3.0.0 home: https://hub.docker.com/_/registry/ icon: https://helm.twun.io/docker-registry.png maintainers: From 43ed2639edc4ad4f3b9bf5f6de254a011b39aafa Mon Sep 17 00:00:00 2001 From: canterberry Date: Wed, 10 Sep 2025 05:15:59 +0000 Subject: [PATCH 16/17] Update repo URL in README GitHub Pages has been the primary distribution channel for this chart since March 2024. However, the repo URL in the README has not been updated accordingly. I would like to decommission the https://helm.twun.io/ repo, but would prefer not to do so without sufficient notice to the community to update their repo URLs. Updating the README is one necessary step toward this. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6dd113bc..2df95413 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This chart will do the following: First, add the repo: ```console -helm repo add twuni https://helm.twun.io +helm repo add twuni https://twuni.github.io/docker-registry.helm ``` To install the chart, use the following: From 8d4e020c42516fdd844b36e8f336bb132c7b0334 Mon Sep 17 00:00:00 2001 From: canterberry Date: Wed, 10 Sep 2025 05:28:03 +0000 Subject: [PATCH 17/17] Add repo migration and deprecation notice to README This is a follow-up to the previous commit updating the repo URL. In this commit, I have added a notice to the README intended for those experiencing chart install/update issues which will result from the eventual decommissioning of the old repo. The goal of the notice is to provide an easy and convenient migration path to using the GitHub Pages repo currently in use as the primary distribution channel for this chart. --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 2df95413..45e25b52 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,21 @@ This chart will do the following: * Implement a Docker registry deployment +## ⚠️ Repo Migration and Deprecation Notice + +The following change only affects attempts to install or update the chart via the https://helm.twun.io repo. + +The https://helm.twun.io repo has been migrated to https://twuni.github.io/docker-registry.helm. + +To update your configuration, remove and re-add the repo with the new URL: + +```console +helm repo remove twuni +helm repo add twuni https://twuni.github.io/docker-registry.helm +``` + +The deprecated repo URL, https://helm.twun.io, may become unavailable as early as **October 16, 2025**. + ## Installing the Chart First, add the repo: