Skip to content

Commit 89eebbb

Browse files
authored
Avoid checking architecture while fetching nested OCI digests
1 parent 5cfb1cd commit 89eebbb

File tree

1 file changed

+11
-16
lines changed

1 file changed

+11
-16
lines changed

internal/controller/serverbootconfiguration_pxe_controller.go

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,10 @@ type ServerBootConfigurationPXEReconciler struct {
4646
}
4747

4848
const (
49-
MediaTypeKernel = "application/io.gardenlinux.kernel"
50-
MediaTypeInitrd = "application/io.gardenlinux.initrd"
51-
MediaTypeSquashFS = "application/io.gardenlinux.squashfs"
52-
AnnotationArchitecture = "io.gardenlinux.image.layer.architecture"
53-
CNAMEPrefixMetalPXE = "metal_pxe"
54-
ArchitectureAMD64 = "amd64"
55-
ArchitectureARM64 = "arm64"
49+
MediaTypeKernel = "application/io.gardenlinux.kernel"
50+
MediaTypeInitrd = "application/io.gardenlinux.initrd"
51+
MediaTypeSquashFS = "application/io.gardenlinux.squashfs"
52+
CNAMEPrefixMetalPXE = "metal_pxe"
5653
)
5754

5855
//+kubebuilder:rbac:groups=metal.ironcore.dev,resources=serverbootconfigurations,verbs=get;list;watch
@@ -265,15 +262,13 @@ func (r *ServerBootConfigurationPXEReconciler) getLayerDigestsFromNestedManifest
265262

266263
var kernelDigest, initrdDigest, squashFSDigest string
267264
for _, layer := range manifest.Layers {
268-
if layer.Annotations[AnnotationArchitecture] == r.Architecture {
269-
switch layer.MediaType {
270-
case MediaTypeKernel:
271-
kernelDigest = layer.Digest.String()
272-
case MediaTypeInitrd:
273-
initrdDigest = layer.Digest.String()
274-
case MediaTypeSquashFS:
275-
squashFSDigest = layer.Digest.String()
276-
}
265+
switch layer.MediaType {
266+
case MediaTypeKernel:
267+
kernelDigest = layer.Digest.String()
268+
case MediaTypeInitrd:
269+
initrdDigest = layer.Digest.String()
270+
case MediaTypeSquashFS:
271+
squashFSDigest = layer.Digest.String()
277272
}
278273
}
279274

0 commit comments

Comments
 (0)