From 6bec72feffe4f33e01ce0c784140e42b1b5b5350 Mon Sep 17 00:00:00 2001 From: Hardik Dodiya Date: Wed, 26 Feb 2025 10:28:42 +0100 Subject: [PATCH] Remove check for the architecture while fetching nested OCI layer digests --- .../serverbootconfiguration_pxe_controller.go | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/internal/controller/serverbootconfiguration_pxe_controller.go b/internal/controller/serverbootconfiguration_pxe_controller.go index 01389f35..d3f81112 100644 --- a/internal/controller/serverbootconfiguration_pxe_controller.go +++ b/internal/controller/serverbootconfiguration_pxe_controller.go @@ -46,13 +46,10 @@ type ServerBootConfigurationPXEReconciler struct { } const ( - MediaTypeKernel = "application/io.gardenlinux.kernel" - MediaTypeInitrd = "application/io.gardenlinux.initrd" - MediaTypeSquashFS = "application/io.gardenlinux.squashfs" - AnnotationArchitecture = "io.gardenlinux.image.layer.architecture" - CNAMEPrefixMetalPXE = "metal_pxe" - ArchitectureAMD64 = "amd64" - ArchitectureARM64 = "arm64" + MediaTypeKernel = "application/io.gardenlinux.kernel" + MediaTypeInitrd = "application/io.gardenlinux.initrd" + MediaTypeSquashFS = "application/io.gardenlinux.squashfs" + CNAMEPrefixMetalPXE = "metal_pxe" ) //+kubebuilder:rbac:groups=metal.ironcore.dev,resources=serverbootconfigurations,verbs=get;list;watch @@ -265,15 +262,13 @@ func (r *ServerBootConfigurationPXEReconciler) getLayerDigestsFromNestedManifest var kernelDigest, initrdDigest, squashFSDigest string for _, layer := range manifest.Layers { - if layer.Annotations[AnnotationArchitecture] == r.Architecture { - switch layer.MediaType { - case MediaTypeKernel: - kernelDigest = layer.Digest.String() - case MediaTypeInitrd: - initrdDigest = layer.Digest.String() - case MediaTypeSquashFS: - squashFSDigest = layer.Digest.String() - } + switch layer.MediaType { + case MediaTypeKernel: + kernelDigest = layer.Digest.String() + case MediaTypeInitrd: + initrdDigest = layer.Digest.String() + case MediaTypeSquashFS: + squashFSDigest = layer.Digest.String() } }