From 7f19d9ea26f1de6c1417ceb7222f87d9e8463ebe Mon Sep 17 00:00:00 2001 From: ialidzhikov Date: Fri, 12 Jul 2024 11:56:49 +0300 Subject: [PATCH] Update registry to 3.0.0-beta.1 --- .../values.yaml | 2 +- example/controller-registration.yaml | 2 +- imagevector/images.yaml | 2 +- .../registrycaches/registry_caches.go | 2 +- .../registrycaches/registry_caches_test.go | 18 ++++++++++-------- .../registrycaches/templates/config.yml.tpl | 4 +++- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/charts/gardener-extension-registry-cache/values.yaml b/charts/gardener-extension-registry-cache/values.yaml index 6e52e1e7..d16d233d 100644 --- a/charts/gardener-extension-registry-cache/values.yaml +++ b/charts/gardener-extension-registry-cache/values.yaml @@ -44,7 +44,7 @@ imageVectorOverwrite: {} # - name: registry # sourceRepository: github.com/distribution/distribution # repository: europe-docker.pkg.dev/gardener-project/releases/3rd/registry - # tag: "3.0.0-alpha.1" + # tag: "3.0.0-beta.1" gardener: version: "" diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml index 0c43daee..24cd5b71 100644 --- a/example/controller-registration.yaml +++ b/example/controller-registration.yaml @@ -4,7 +4,7 @@ kind: ControllerDeployment metadata: name: extension-registry-cache helm: - rawChart: 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 + rawChart: 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 values: image: europe-docker.pkg.dev/gardener-project/public/gardener/extensions/registry-cache:v0.10.0-dev --- diff --git a/imagevector/images.yaml b/imagevector/images.yaml index 86f88c23..729d8a58 100644 --- a/imagevector/images.yaml +++ b/imagevector/images.yaml @@ -8,7 +8,7 @@ images: - name: registry sourceRepository: github.com/distribution/distribution repository: europe-docker.pkg.dev/gardener-project/releases/3rd/registry - tag: 3.0.0-alpha.1 + tag: 3.0.0-beta.1 labels: - name: gardener.cloud/cve-categorisation value: diff --git a/pkg/component/registrycaches/registry_caches.go b/pkg/component/registrycaches/registry_caches.go index ed678315..e85dd498 100644 --- a/pkg/component/registrycaches/registry_caches.go +++ b/pkg/component/registrycaches/registry_caches.go @@ -342,7 +342,7 @@ func (r *registryCaches) computeResourcesDataForRegistryCache(ctx context.Contex }, { Name: registryConfigVolumeName, - MountPath: "/etc/docker/registry", + MountPath: "/etc/distribution", }, }, }, diff --git a/pkg/component/registrycaches/registry_caches_test.go b/pkg/component/registrycaches/registry_caches_test.go index a6aec566..91deeeb5 100644 --- a/pkg/component/registrycaches/registry_caches_test.go +++ b/pkg/component/registrycaches/registry_caches_test.go @@ -126,7 +126,7 @@ metadata: } configYAMLFor = func(upstreamURL string, ttl string, username, password string) string { - config := `# Maintain this file with the default config file (/etc/docker/registry/config.yml) from the registry image (europe-docker.pkg.dev/gardener-project/releases/3rd/registry:3.0.0-alpha.1). + config := `# Maintain this file with the default config file (/etc/distribution/config.yml) from the registry image (europe-docker.pkg.dev/gardener-project/releases/3rd/registry:3.0.0-beta.1). version: 0.1 log: fields: @@ -140,6 +140,8 @@ storage: # blobdescriptor: inmemory filesystem: rootdirectory: /var/lib/registry + tag: + concurrencylimit: 5 http: addr: :5000 debug: @@ -257,7 +259,7 @@ spec: volumeMounts: - mountPath: /var/lib/registry name: cache-volume - - mountPath: /etc/docker/registry + - mountPath: /etc/distribution name: config-volume priorityClassName: system-cluster-critical securityContext: @@ -373,8 +375,8 @@ status: {} Expect(err).NotTo(HaveOccurred()) Expect(manifests).To(HaveLen(8)) - dockerConfigSecretName := "registry-docker-io-config-340eea9b" - arConfigSecretName := "registry-europe-docker-pkg-dev-config-454ce11f" + dockerConfigSecretName := "registry-docker-io-config-2935d46f" + arConfigSecretName := "registry-europe-docker-pkg-dev-config-245e2638" expectedManifests := []string{ configSecretYAMLFor(dockerConfigSecretName, "registry-docker-io", "docker.io", configYAMLFor("https://registry-1.docker.io", "336h0m0s", "", "")), serviceYAMLFor("registry-docker-io", "docker.io", "https://registry-1.docker.io"), @@ -405,8 +407,8 @@ status: {} Expect(err).NotTo(HaveOccurred()) Expect(manifests).To(HaveLen(6)) - dockerConfigSecretName := "registry-docker-io-config-340eea9b" - arConfigSecretName := "registry-europe-docker-pkg-dev-config-454ce11f" + dockerConfigSecretName := "registry-docker-io-config-2935d46f" + arConfigSecretName := "registry-europe-docker-pkg-dev-config-245e2638" expectedManifests := []string{ configSecretYAMLFor(dockerConfigSecretName, "registry-docker-io", "docker.io", configYAMLFor("https://registry-1.docker.io", "336h0m0s", "", "")), serviceYAMLFor("registry-docker-io", "docker.io", "https://registry-1.docker.io"), @@ -474,8 +476,8 @@ status: {} Expect(err).NotTo(HaveOccurred()) Expect(manifests).To(HaveLen(8)) - dockerConfigSecretName := "registry-docker-io-config-71d335ac" - arConfigSecretName := "registry-europe-docker-pkg-dev-config-5b9d5155" + dockerConfigSecretName := "registry-docker-io-config-90f6f66c" + arConfigSecretName := "registry-europe-docker-pkg-dev-config-bc1d0d16" expectedManifests := []string{ configSecretYAMLFor(dockerConfigSecretName, "registry-docker-io", "docker.io", configYAMLFor("https://registry-1.docker.io", "336h0m0s", "docker-user", "s3cret")), serviceYAMLFor("registry-docker-io", "docker.io", "https://registry-1.docker.io"), diff --git a/pkg/component/registrycaches/templates/config.yml.tpl b/pkg/component/registrycaches/templates/config.yml.tpl index 283c8b01..dbdd3837 100644 --- a/pkg/component/registrycaches/templates/config.yml.tpl +++ b/pkg/component/registrycaches/templates/config.yml.tpl @@ -1,4 +1,4 @@ -# Maintain this file with the default config file (/etc/docker/registry/config.yml) from the registry image (europe-docker.pkg.dev/gardener-project/releases/3rd/registry:3.0.0-alpha.1). +# Maintain this file with the default config file (/etc/distribution/config.yml) from the registry image (europe-docker.pkg.dev/gardener-project/releases/3rd/registry:3.0.0-beta.1). version: 0.1 log: fields: @@ -12,6 +12,8 @@ storage: # blobdescriptor: inmemory filesystem: rootdirectory: /var/lib/registry + tag: + concurrencylimit: 5 http: addr: {{ .http_addr }} debug: