From 967bca60dd667eff521f9bbeea6fae49dab902f6 Mon Sep 17 00:00:00 2001 From: Christian Cwienk Date: Tue, 12 Dec 2023 23:09:52 +0100 Subject: [PATCH 1/2] cleanup: rm unused/obsolete attributes --- .ci/pipeline_definitions | 3 --- 1 file changed, 3 deletions(-) diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions index 172976b4..2f8293d1 100644 --- a/.ci/pipeline_definitions +++ b/.ci/pipeline_definitions @@ -3,7 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 gardener-extension-shoot-lakom-service: - template: 'default' base_definition: traits: version: @@ -15,12 +14,10 @@ gardener-extension-shoot-lakom-service: - linux/arm64 dockerimages: gardener-extension-shoot-lakom-service: - registry: 'gcr-readwrite' image: 'eu.gcr.io/gardener-project/gardener/extensions/shoot-lakom-service' dockerfile: 'Dockerfile' target: gardener-extension-shoot-lakom-service lakom: - registry: 'gcr-readwrite' image: 'eu.gcr.io/gardener-project/gardener/extensions/lakom' dockerfile: 'Dockerfile' target: lakom From 64d94910ea2d5f21fb6a226f246338c09d3a1647 Mon Sep 17 00:00:00 2001 From: Christian Cwienk Date: Tue, 12 Dec 2023 23:21:34 +0100 Subject: [PATCH 2/2] switch GCR -> Artifact-Registry GCR has been deprecated [0] in favour of Artifact-Registry. Thus, change push-targets for OCI-Images: - europe-docker.pkg.dev/gardener-project/snapshots for snapshots - europe-docker.pkg.dev/gardener-project/releases for releases - europe-docker.pkg.dev/gardener-project/public for read-access to snapshots + releases [0] https://cloud.google.com/artifact-registry/docs/transition/transition-from-gcr --- .ci/pipeline_definitions | 31 ++++++++++++------- Makefile | 4 +-- .../values.yaml | 2 +- charts/images.yaml | 2 +- charts/lakom/values.yaml | 2 +- example/controller-registration.yaml | 2 +- pkg/controller/lifecycle/actuator_test.go | 2 +- pkg/controller/seed/reconciler_test.go | 2 +- pkg/lakom/resolvetag/resolver_test.go | 4 +-- pkg/lakom/verifysignature/verifier_test.go | 8 ++--- 10 files changed, 34 insertions(+), 25 deletions(-) diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions index 2f8293d1..e8a7be13 100644 --- a/.ci/pipeline_definitions +++ b/.ci/pipeline_definitions @@ -7,6 +7,8 @@ gardener-extension-shoot-lakom-service: traits: version: preprocess: 'inject-commit-hash' + component_descriptor: + ocm_repository: europe-docker.pkg.dev/gardener-project/snapshots publish: oci-builder: docker-buildx platforms: @@ -14,30 +16,44 @@ gardener-extension-shoot-lakom-service: - linux/arm64 dockerimages: gardener-extension-shoot-lakom-service: - image: 'eu.gcr.io/gardener-project/gardener/extensions/shoot-lakom-service' + image: europe-docker.pkg.dev/gardener-project/snapshots/gardener/extensions/shoot-lakom-service dockerfile: 'Dockerfile' target: gardener-extension-shoot-lakom-service lakom: - image: 'eu.gcr.io/gardener-project/gardener/extensions/lakom' + image: europe-docker.pkg.dev/gardener-project/snapshots/gardener/extensions/lakom dockerfile: 'Dockerfile' target: lakom jobs: head-update: traits: - component_descriptor: ~ + component_descriptor: + ocm_repository_mappings: + - repository: europe-docker.pkg.dev/gardener-project/releases draft_release: ~ options: public_build_logs: true pull-request: traits: pull-request: ~ - component_descriptor: ~ + component_descriptor: + ocm_repository_mappings: + - repository: europe-docker.pkg.dev/gardener-project/releases options: public_build_logs: true release: traits: version: preprocess: 'finalize' + component_descriptor: + ocm_repository: europe-docker.pkg.dev/gardener-project/releases + publish: + dockerimages: + gardener-extension-shoot-lakom-service: + image: europe-docker.pkg.dev/gardener-project/releases/gardener/extensions/shoot-lakom-service + tag_as_latest: true + lakom: + image: europe-docker.pkg.dev/gardener-project/releases/gardener/extensions/lakom + tag_as_latest: true release: nextversion: 'bump_minor' next_version_callback: '.ci/prepare_release' @@ -48,10 +64,3 @@ gardener-extension-shoot-lakom-service: internal_scp_workspace: channel_name: 'C9CEBQPGE' #sap-tech-gardener slack_cfg_name: 'scp_workspace' - component_descriptor: ~ - publish: - dockerimages: - gardener-extension-shoot-lakom-service: - tag_as_latest: true - lakom: - tag_as_latest: true diff --git a/Makefile b/Makefile index d9dbdebe..0a9f594b 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ EXTENSION_PREFIX := gardener-extension EXTENSION_NAME := shoot-lakom-service ADMISSION_NAME := lakom -REGISTRY := eu.gcr.io/gardener-project/gardener -IMAGE_PREFIX := $(REGISTRY)/extensions +REGISTRY := europe-docker.pkg.dev/gardener-project/public +IMAGE_PREFIX := $(REGISTRY)/gardener/extensions REPO_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) HACK_DIR := $(REPO_ROOT)/hack VERSION := $(shell cat "$(REPO_ROOT)/VERSION") diff --git a/charts/gardener-extension-shoot-lakom-service/values.yaml b/charts/gardener-extension-shoot-lakom-service/values.yaml index ec1a69cb..03832a4d 100644 --- a/charts/gardener-extension-shoot-lakom-service/values.yaml +++ b/charts/gardener-extension-shoot-lakom-service/values.yaml @@ -8,7 +8,7 @@ replicaCount: 3 image: pullPolicy: IfNotPresent tag: latest - repository: eu.gcr.io/gardener-project/gardener/extensions/shoot-lakom-service + repository: europe-docker.pkg.dev/gardener-project/public/gardener/extensions/shoot-lakom-service imageVectorOverwrite: {} # images: diff --git a/charts/images.yaml b/charts/images.yaml index 220042a9..503c839d 100644 --- a/charts/images.yaml +++ b/charts/images.yaml @@ -6,4 +6,4 @@ images: - name: lakom sourceRepository: github.com/gardener/gardener-extension-shoot-lakom-service - repository: eu.gcr.io/gardener-project/gardener/extensions/lakom + repository: europe-docker.pkg.dev/gardener-project/releases/gardener/extensions/lakom diff --git a/charts/lakom/values.yaml b/charts/lakom/values.yaml index 56a4fe6d..87b8ce18 100644 --- a/charts/lakom/values.yaml +++ b/charts/lakom/values.yaml @@ -7,7 +7,7 @@ name: lakom-admission-controller image: pullPolicy: IfNotPresent tag: latest - repository: eu.gcr.io/gardener-project/gardener/extensions/lakom + repository: europe-docker.pkg.dev/gardener-project/public/gardener/extensions/lakom replicaCount: 3 resources: diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml index fe1357c6..ce0601bd 100644 --- a/example/controller-registration.yaml +++ b/example/controller-registration.yaml @@ -5,7 +5,7 @@ metadata: name: shoot-lakom-service type: helm providerConfig: - chart: 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 + chart: H4sIAAAAAAAAA+0ca2/btnaf9St41Q1ri0l+J7sGCtw0cbtgbWIkWe8dhqGgJcbmIosaKTn12t7ffg9JSdbLz6ROeqeDIpUpPg7J8+ahxpi7xCfcIh9C4gvKfEtMGAstD9+wqSUIn1GHNL65CzQBDns99T9A8X/13Op0W+1e++BAlrcO293eN6h3p1E3hEiEmCP0DYdJr6q37v1XCuPN9t+eEG9Kxz7jZPsx5AYfdLtL9x+2Pb//7Va32f4GNe9/umX4m+//EzTEYUi4L1DIkN5hdDshPhpF1HOpP0YBdm7wmAjbeIKuJlQgEQUB4yE8AFV4aOyxEZri0JlA7R8QJx4O6YxAu3CSKce+Cx34ZAxvmY+eBpxc0w/ERbcU6v3jmY3OfW+OmK9aSpRQQDjyqE9swz65fH8ZAm7QxTGbTqGDd8eXyKVcGPaYhg31V6Nv2KO/eEP9TQom44b8k/wUM7+x6GgE84sCdE09IozntrgN4O8I38DfcArP/4Wq7zCnLBLo9GQAAwac/UGc0LCpS3BD14Miw54Jh7mkYTz0rm4OG/L/8QTz0J7jqbfDGOv4v93rFvm/ddip+X8fgAP6jnC57300axk4CNKfZstumoZLhMNpEKqiI/QT6AHkSGpA14yjcELQ65iE0BtJMuhSkwwaJASlKl5KogIR4uMp6aPNqM6YJag0bcDlK+Kqrwc25H+XOfaY7TjGOv4/bPcK/N/sSPuv5v8vD40Guhye/Md6BdrvmAVzUJmT8AqIoY/azXYbXR4N0eUAAQdjX/3A16AoKQ4Jctg0wP5cKvaFDHCYH3I6ikBXC6PRMJL+3wAV+YJYp1AtpNeUcJAmYFlMiNUG1oZ6Y9Yfyy5k12KCLAeZtt2AfzPiu4w3QL9PopENozYSol08TECHN5LmlkKCeR6QNSdjKkKubA4buq0gbmSjb586OER6uHeDi8vT87Nn8U/yAU8DjzSW9Sl14kLW9Sv6N+XswMxSVlQsO4mPR2BuoNyktVmlxGVcKM0vKWIdxjkYHGiBBMohYQTZ3rcRlBvyf0hgEQBJsYsnuLX/1261u53a/9sHbL3/78HmB7tc2GGwqS243v/rFPa/0zuo5f9e4ONHCyEXPDFwu0w6BRliIuvzZwMh+YZeowkWQ+WpIVNMcLt30DeR/Q57ETiEqr4d4jFKWwSc+uE1Mr8T//pOFGtyEjBBQTXMV3VBPEGqOuzv3CEoKPiReVTPyaw9gl0CXisIWCB/6uoFWMkPlm5jJY3SvmXLh97SrWBr/nc84BjCwQiAv8Ly2HgMWmqla7jW/usW7b+Dg07t/+0FnnxB8++J8WQz48+yLCPriF4DJ/vhiIa2frIpa8xa2AtAABk31Hf76FiT4StFhsaUhNjFIe4Dx3t4BBJEPqFMR6mlGM4DcEBNQYhrQh3tj65hdvnLEAFxZK8x5ctHkE6YQy09GEI3ZH6m+gOuiIviCpuMYOm6cUNO5EtyImeFQh4RKFfBtD66iUaE+wS40X6+st/n6tfzVRJpV/7XuN4P//dah2X+P6z5fx/wlfP/ULNMlv835ugFv20jMhIx8IcATFWLkE7Jz2QOXCq+Lt0vYXv+Z/41HU9xkGmhy5bKgDX83+odtAr8f9jp1ec/e4FHyf+zVsLlirDe4mBbDrc1ScaVBYwFLT5+RPYFmOxYEPssKZbuQNJxho776JNi7ixaagQ7HVfEg6SCwnY8FrmJpGqp9tl5RDpao8od8FvG/jAaedQB4QHCB7AL2a8ympS4Motoj3zO10efEPQMy4kOtKMDkgtTL+JkyKDKXM+2oqNcraSpFG0vZYA+5DhIrBl2C3M622D5ZOVIEHl8dyq9r2HkeZfE4SQUS9FYUj/pziWjaKxXLUFHh8yGnEkC9MdLe840tQttYNHA6cORF8JipV7monNoFUoKZf4uw1S0rhjwoRm+AHeQ/8rTnoEDzLjFZoTfchqSKiWwTv43D9p5+d9pdtvNWv7vAx6N/I/DTbkwzjtFXOcJbUl23VpNVBB4hqNj+pbiDHqvJukNlUjejMRBYGf8NDBgt0dnSUfUB5L1q3DJ6jI1FfE+z5hSq5X1TOVap/qlW4idPTTF1nCfsLX8d0ngsflUemWbpoOslv+tdrtbkP/tbqdVy/+9wKOR/1nBDjJPNFLpfpJS3B3F+4aCvKiJVNLYBREs4g6JLVTs+yxU1nws73nyvugN6OZ9ZMoYnpkVpF9IYchMTVtMGuooeA8KR40JZGPhGbgWeATkEc6TkMDSZdExlYVBncZVOJlRieVPVMhznTd0SmEWPfUmAJ8F532KuPCYRaCqFDZCHcqwOCirQqZvMut8jyu9y1olgjTGLkPPqr8iWakQMmdQb0KiDK6lzj+hPyMWZlArtpOpBUudGajHqSOGMv1gbU/CASdxQdFJJeBm50ZE0xURIjU+9R0vcolMAKWwZ9/aV/GS2C9hNkOZNGquizKZz5ANiOoDSRhzgeyGZuRGSFdag7vMYbmntHoiqaCQ4OWI+F7JeDemlwDVbxm/kScARQZnFgeepFNigWhXZxkg9bHnsVvibtbeBS7YrkWg4iNWXGfb1iOPOTfEtRzq8kLbRDplSGwcoqdy86sk0TPUyggJUJk+yMQMRzP3CJbmqPRCCrk/I8qJexIBZY0vgT7dSEYSTpUaiYsHH4gTqYzMTEtLU8hlTvwtQAnCwYcAJLLIy5ek+Y2MYVdTVaEuQiyQ6UkwCjr1Sy9nakGKA8ghdqLNNfglhHpfOK4idwkhC5jHxnMV8jfzuEyYCOV6mcuYGOQFA+afH3tYiLM8v4q5AO1g/bPZjCvH63HkOJKmznblbgHEosaU8Smw7NLZAH8eiTPmX4Bpm54xalC0P+R0BnbhmAyEgz2sU4BVHCutB31LO1AHvEh2ObWCv9Ai4EQHweLXUvNg6seHqHrV7yC7lHTNieUkkcUuVZOhxooAqU4aCdKXORXBplOwcRdzs1BjM68p08KKtdeLBgmdRt63yui1XAuPXhNn7njEmuIPsj1sIwcr2OJE/pDXFV4s0edpU3vR7HLuOyI7MTnGhGAvnCgtuP0omcbrxtFWsKVZUi7XwtJZ1rtucp60OEobFPsu5OJY1H2RpYVyeo9dsQo8HBEcWql/8GJltLvcEGZObi3QB7Cp2IO9ham4q1ZOt7NVu9O42aVuVb1J1gi8IQu7rpTgL/or90QZcoVeYhtvs26yBmHWEJTXfrKckLLycFPzMidNNdfHrzPlYHCGzGFeH10dD9Nyj85gtYQAaTPKyZpJGAavSZiX5vL6UR819IL8lX+1CtnqFZQggNQlvj9dXQ0zL6QOp9g7IR6exzvYR63mQswCAdKt8Zat5ntHu5dWIP4su9F6p94Mjk4GF+8HbwbHV6fnZ+/Pjt4OLodHx4NMv0qzvgKPIT8t8Po994JcF1WuKh+qOSfekJ1yYVp3S7M+wff07dHrwTtA9vzi/fm7wcW/L06vSrjCYitfORMsbVRGT3PY5NR6CUGeDxckhBAXVh32LVp8AlVMp4sAbKtZHKgw9ox50ZS8lUaCKO9ZPvMhPRdNYCqb6fUv66acYYpdeWJXMBR23Jg1TtYS/ErbtBl+ueXSi1WyPFaukpOcL2SJd6tT6AQA6WnB6owN2yorQIMWCOX3Wy39tgu/Ysr3cqKSQHw8+pa50HO33czMrT5v2ANsHf8H39WlgkfqRuAocsdk7UHAuvPfVqeU/9tu1/n/e4FHGf8PlBO2OAEYMvckpbmXiub2cxTwSM50k+gTeGi/+HGYHbxt1Hrk4e6HJu4a1sLW8p+PsLPlhwDWyP9Or1vM/+40u3X+917gUcj/J+jq/OT86SzwZdnsWR9dkClYiyjyfUJc4sovgUypDlwjBvImvhWb3oalQjkA87IuUfSKo3DCOP1L35a9+VHojPJ8LvkF88iqPNPiGWZ/lbh8FHqDR570dCyZxfqasyiIb63I83Uj54/K0kVmh3wJtvoofiHVrTpfoEI/3EotU+526UqVx4pvkew40LJT5fI4U+yD/+GmpfnxzOdmuXPTLHeT2gpffmUWVQs/G7DTYbQZAvpqUvIUBUDRZLOZpoeWenih03I1KrMyaVSuoMMYd6mfZbbyQIpSC73BWFh5h+tXdLsxknJl3Ol3G4WIK0+s0uBtHvl4lZNduZscegkF1B//n4kjmFgcAUx2c8W6GGnyfEY832UVRDSSX21SAlH3fJk7YPuSjsRDq/mlsLX9l4S2tjAB19h/7VazmP/X6R3U93/2Aivtv85D3/+JGfSuad3yesvGHn8pByuTM7I0ne2aA7Ngz1NDWTpDygLCAk0grDiRxNKnZ+j73z6a8tHc7PDtBzM5DTP75tXx0Pz8+/cb45VO2UriBDECmUAB4FFIY8gdxMCoulPz8zYjB8y1lNZJR14crsKKUJnHl7N1HoWKSiItOnsh1jynw1Kc5cEQzJzBWhXHpxtn+cXDlw9aNdFucZz70BKshrvArvofa5tpIzNg3f3/g8Ni/L/X6nVr/b8PeBTxn3X6PzHQ/04xf3CJmDr7zq/BFbshaRbePez/1vw/C/C234Fde/+/9P2P9mG7VfP/PuDR8H8hm0GSmb5W7RZufZqSM2RCqjQ/0xCKGUsMqBZSeDlk7lFcr/L7IF9AcCS2Y8VMEis5m12aL9PSJpNOB4U0SVPJ5NntnAU8pf6R9kMWGR1TMmVcZ8ImeefIXI63vejD1k113F23NFfMuKJl8etsieWZpohVXQiT5aVLYbtlpkAzHbHLrr8u0ckomZZyQtnK9qLe1345dkP5r9Pld/wA+Lr4T7tXlP+tbueglv/7gEch/zOc2a/6Qq+RvVvTRx3D0Dn/0hvOJPSfXp+xcCg/nKakQojHMq8PjJZQidvkU5F9RCLOAmK58roPt4Obse2S2SKpP/68f0PfJlp8ZDh7FlOBpFGVgQdyRIqaJ/F9/L56LqQdxmV5HK8Zs0eYV46eb6XmOWvZbbtjFC6rJoaikTsYkRIbFiVWLk4Q9VGvOTWyGqHV/vEtNUDuyTqxHk4zK6s0V1m9JF0ddKGndcLWlMraNIxMmEF9xGDZHYDFPZT0qkOqQbP3ECQZG/JObHpTYU01fbKT3Okt5+YD9cmapc/3oN9+V22ewNZ+ip9gmyW8HLw+PUPDX16+OT1GPw9+VYVplVa7083XH5ydLKm9Zdd45LibdF34cNAr+JmumQ4E/dj8Uc46E/hRZVIhL/3wT7JBpU/5lD7ks7hStOIzPPfm8dRQQw011FBDDTXUUEMNNdRQw98P/gdvL4sfAHgAAA== values: image: tag: v0.12.0-dev diff --git a/pkg/controller/lifecycle/actuator_test.go b/pkg/controller/lifecycle/actuator_test.go index a4d04005..85146cef 100644 --- a/pkg/controller/lifecycle/actuator_test.go +++ b/pkg/controller/lifecycle/actuator_test.go @@ -119,7 +119,7 @@ var _ = Describe("Actuator", func() { genericKubeconfigName = "generic-kubeconfig" shootAccessServiceAccountName = "extension-shoot-lakom-service" serverTLSSecretName = "shoot-lakom-service-tls" //#nosec G101 -- this is false positive - image = "eu.gcr.io/gardener-project/gardener/extensions/lakom:v0.0.0" + image = "europe-docker.pkg.dev/gardener-project/releases/gardener/extensions/lakom:v0.0.0" useOnlyImagePullSecrets = true cosignSecretName = "extension-shoot-lakom-service-cosign-public-keys-e3b0c442" diff --git a/pkg/controller/seed/reconciler_test.go b/pkg/controller/seed/reconciler_test.go index 398a4149..10dbf668 100644 --- a/pkg/controller/seed/reconciler_test.go +++ b/pkg/controller/seed/reconciler_test.go @@ -36,7 +36,7 @@ var _ = Describe("Reconciler", func() { failurePolicy = admissionregistrationv1.Ignore cosignSecretName = "extension-shoot-lakom-service-seed-cosign-public-keys-e3b0c442" serverTLSSecretName = "shoot-lakom-service-seed-tls" //#nosec G101 -- this is false positive - image = "eu.gcr.io/gardener-project/gardener/extensions/lakom:v0.0.0" + image = "europe-docker.pkg.dev/gardener-project/releases/gardener/extensions/lakom:v0.0.0" useOnlyImagePullSecrets = true validatingWebhookKey = "validatingwebhookconfiguration____gardener-extension-shoot-lakom-service-seed.yaml" diff --git a/pkg/lakom/resolvetag/resolver_test.go b/pkg/lakom/resolvetag/resolver_test.go index b5b567f8..b04f792e 100644 --- a/pkg/lakom/resolvetag/resolver_test.go +++ b/pkg/lakom/resolvetag/resolver_test.go @@ -74,7 +74,7 @@ var _ = Describe("Resolver", func() { Entry("Do not run actual resolving of image with digest", "image@sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", "image@sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", true, false, ""), Entry("Fail to parse bad image digest", "gardener/non-existing-image@sha256:123", "", true, false, "repository can only contain the characters `abcdefghijklmnopqrstuvwxyz0123456789_-./`"), Entry("Fail to parse bad image tag", "gardener/non-existing-image:123!", "", true, false, "tag can only contain the characters `abcdefghijklmnopqrstuvwxyz0123456789_-.ABCDEFGHIJKLMNOPQRSTUVWXYZ`"), - Entry("Fail to get non-existing image", "eu.gcr.io/gardener-project/non-existing-image:123", "", false, true, "unexpected status code 404 Not Found"), + Entry("Fail to get non-existing image", "europe-docker.pkg.dev/gardener-project/releases/non-existing-image:123", "", false, true, "unexpected status code 404 Not Found"), ) }) @@ -107,7 +107,7 @@ var _ = Describe("Resolver", func() { Entry("Do not run actual resolving of image with digest", "image@sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", "image@sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", true, false, ""), Entry("Fail to parse bad image digest", "gardener/non-existing-image@sha256:123", "", true, false, "repository can only contain the characters `abcdefghijklmnopqrstuvwxyz0123456789_-./`"), Entry("Fail to parse bad image tag", "gardener/non-existing-image:123!", "", true, false, "tag can only contain the characters `abcdefghijklmnopqrstuvwxyz0123456789_-.ABCDEFGHIJKLMNOPQRSTUVWXYZ`"), - Entry("Fail to get non-existing image", "eu.gcr.io/gardener-project/non-existing-image:123", "", false, true, "unexpected status code 404 Not Found"), + Entry("Fail to get non-existing image", "europe-docker.pkg.dev/gardener-project/releases/non-existing-image:123", "", false, true, "unexpected status code 404 Not Found"), ) It("Should uses the cache to resolve the image", func() { diff --git a/pkg/lakom/verifysignature/verifier_test.go b/pkg/lakom/verifysignature/verifier_test.go index 91034071..6fc69834 100644 --- a/pkg/lakom/verifysignature/verifier_test.go +++ b/pkg/lakom/verifysignature/verifier_test.go @@ -80,14 +80,14 @@ IqozONbbdbqz11hlRJy9c7SG+hdcFl9jE9uE/dwtuwU2MqU9T/cN0YkWww== Entry("Fail to parse bad image tag", "gardener/non-existing-image:123!", false, true, "could not parse reference"), Entry("Refuse to verify image not using digest", "k8s.gcr.io/pause:3.7", false, true, "image reference is not a digest"), Entry("Successfully verify signed image", "gcr.io/projectsigstore/cosign@sha256:f9fd5a287a67f4b955d08062a966df10f9a600b6b8583fd367bce3f1f000a429", true, false, ""), - Entry("Successfully verify unsigned image", "eu.gcr.io/gardener-project/gardener/apiserver@sha256:249ea7f1d0439a94893b486e7820f6f0ab52522c5f22e1bad21782d6381e739e", false, false, ""), + Entry("Successfully verify unsigned image", "europe-docker.pkg.dev/gardener-project/releases/gardener/apiserver@sha256:249ea7f1d0439a94893b486e7820f6f0ab52522c5f22e1bad21782d6381e739e", false, false, ""), ) It("Should fail image verification when context is canceled", func() { canceledCtx, cancel := context.WithCancel(ctx) cancel() - verified, err := directVerifier.Verify(canceledCtx, "eu.gcr.io/gardener-project/gardener/apiserver@sha256:249ea7f1d0439a94893b486e7820f6f0ab52522c5f22e1bad21782d6381e739e", kcr) + verified, err := directVerifier.Verify(canceledCtx, "europe-docker.pkg.dev/gardener-project/releases/gardener/apiserver@sha256:249ea7f1d0439a94893b486e7820f6f0ab52522c5f22e1bad21782d6381e739e", kcr) Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("context canceled")) Expect(verified).To(BeFalse()) @@ -136,7 +136,7 @@ IqozONbbdbqz11hlRJy9c7SG+hdcFl9jE9uE/dwtuwU2MqU9T/cN0YkWww== Entry("Fail to parse bad image tag", "gardener/non-existing-image:123!", false, true, "could not parse reference"), Entry("Refuse to verify image not using digest", "k8s.gcr.io/pause:3.7", false, true, "image reference is not a digest"), Entry("Successfully verify signed image", "gcr.io/projectsigstore/cosign@sha256:f9fd5a287a67f4b955d08062a966df10f9a600b6b8583fd367bce3f1f000a429", true, false, ""), - Entry("Successfully verify unsigned image", "eu.gcr.io/gardener-project/gardener/apiserver@sha256:249ea7f1d0439a94893b486e7820f6f0ab52522c5f22e1bad21782d6381e739e", false, false, ""), + Entry("Successfully verify unsigned image", "europe-docker.pkg.dev/gardener-project/releases/gardener/apiserver@sha256:249ea7f1d0439a94893b486e7820f6f0ab52522c5f22e1bad21782d6381e739e", false, false, ""), ) It("Should not run real validation for cached result", func() { @@ -156,7 +156,7 @@ IqozONbbdbqz11hlRJy9c7SG+hdcFl9jE9uE/dwtuwU2MqU9T/cN0YkWww== canceledCtx, cancel := context.WithCancel(ctx) cancel() - image := "eu.gcr.io/gardener-project/gardener/apiserver@sha256:249ea7f1d0439a94893b486e7820f6f0ab52522c5f22e1bad21782d6381e739e" // #nosec G101 + image := "europe-docker.pkg.dev/gardener-project/releases/gardener/apiserver@sha256:249ea7f1d0439a94893b486e7820f6f0ab52522c5f22e1bad21782d6381e739e" // #nosec G101 verified, err := cachedVerifier.Verify(canceledCtx, image, kcr) Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("context canceled"))