From 7673df10e74904b23d7c39f8c778b8e1221b0ed9 Mon Sep 17 00:00:00 2001 From: Filip Strozik Date: Mon, 6 May 2024 12:28:53 +0200 Subject: [PATCH 1/2] migrate to external/registry and new registry-init --- .../charts/docker-registry/templates/deployment.yaml | 2 +- config/docker-registry/values.yaml | 8 ++++++-- sec-scanners-config.yaml | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/config/docker-registry/charts/docker-registry/templates/deployment.yaml b/config/docker-registry/charts/docker-registry/templates/deployment.yaml index 338ca576..b84dae69 100644 --- a/config/docker-registry/charts/docker-registry/templates/deployment.yaml +++ b/config/docker-registry/charts/docker-registry/templates/deployment.yaml @@ -47,7 +47,7 @@ spec: hostIPC: false # Optional. The default is false if the entry is not there. initContainers: - name: generate-htpasswd - image: "{{ include "imageurl" (dict "reg" .Values.global.containerRegistry "img" .Values.global.images.registry) }}" + image: "{{ include "imageurl" (dict "reg" .Values.global.containerRegistry "img" .Values.global.images.registry-init) }}" {{- if .Values.initContainers.securityContext }} securityContext: {{- include "tplValue" ( dict "value" .Values.initContainers.securityContext "context" . ) | nindent 12 }} diff --git a/config/docker-registry/values.yaml b/config/docker-registry/values.yaml index ffc9f205..10211515 100644 --- a/config/docker-registry/values.yaml +++ b/config/docker-registry/values.yaml @@ -10,8 +10,12 @@ global: path: europe-docker.pkg.dev/kyma-project images: registry: - name: "tpi/registry" - version: "2.8.1-1ae4c190" + name: "registry" + version: "2.8.3" + directory: "prod/external" + registry-init: + name: "registry-init" + version: "v20240506-57d31b1d" directory: "prod" dockerregistryPriorityClassValue: 2000000 dockerregistryPriorityClassName: "dockerregistry-priority" diff --git a/sec-scanners-config.yaml b/sec-scanners-config.yaml index 13036cc1..087667ca 100644 --- a/sec-scanners-config.yaml +++ b/sec-scanners-config.yaml @@ -2,7 +2,8 @@ module-name: docker-registry rc-tag: 1.4.0 protecode: - europe-docker.pkg.dev/kyma-project/prod/dockerregistry-operator:main - - europe-docker.pkg.dev/kyma-project/prod/tpi/registry:2.8.1-1ae4c190 + - europe-docker.pkg.dev/kyma-project/prod/external/registry:2.8.3 + - europe-docker.pkg.dev/kyma-project/prod/registry-init:v20240506-57d31b1d whitesource: language: golang-mod subprojects: false From 70951bfe88566e2d8d86552215ba761ddb0ac9fd Mon Sep 17 00:00:00 2001 From: Filip Strozik Date: Mon, 6 May 2024 12:45:20 +0200 Subject: [PATCH 2/2] fix image name --- .../charts/docker-registry/templates/deployment.yaml | 2 +- config/docker-registry/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/docker-registry/charts/docker-registry/templates/deployment.yaml b/config/docker-registry/charts/docker-registry/templates/deployment.yaml index b84dae69..d40b02ac 100644 --- a/config/docker-registry/charts/docker-registry/templates/deployment.yaml +++ b/config/docker-registry/charts/docker-registry/templates/deployment.yaml @@ -47,7 +47,7 @@ spec: hostIPC: false # Optional. The default is false if the entry is not there. initContainers: - name: generate-htpasswd - image: "{{ include "imageurl" (dict "reg" .Values.global.containerRegistry "img" .Values.global.images.registry-init) }}" + image: "{{ include "imageurl" (dict "reg" .Values.global.containerRegistry "img" .Values.global.images.registry_init) }}" {{- if .Values.initContainers.securityContext }} securityContext: {{- include "tplValue" ( dict "value" .Values.initContainers.securityContext "context" . ) | nindent 12 }} diff --git a/config/docker-registry/values.yaml b/config/docker-registry/values.yaml index 10211515..17b94830 100644 --- a/config/docker-registry/values.yaml +++ b/config/docker-registry/values.yaml @@ -13,7 +13,7 @@ global: name: "registry" version: "2.8.3" directory: "prod/external" - registry-init: + registry_init: name: "registry-init" version: "v20240506-57d31b1d" directory: "prod"