Fix descriptor handling for the OCI spec

Author: hardikdr

go.mod

@@ -120,5 +120,5 @@ require (
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
-	sigs.k8s.io/yaml v1.5.0 // indirect
+	sigs.k8s.io/yaml v1.6.0 // indirect
 )

go.sum

@@ -321,5 +321,5 @@ sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxO
 sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
 sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
-sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
-sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
+sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
+sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

internal/controller/serverbootconfiguration_pxe_controller.go

@@ -228,7 +228,6 @@ func (r *ServerBootConfigurationPXEReconciler) getLayerDigestsFromNestedManifest
 		return "", "", "", fmt.Errorf("failed to resolve image reference: %w", err)
 	}
 
-	targetManifestDesc := desc
 	manifestData, err := fetchContent(ctx, resolver, name, desc)
 	if err != nil {
 		return "", "", "", fmt.Errorf("failed to fetch manifest data: %w", err)
@@ -240,6 +239,7 @@ func (r *ServerBootConfigurationPXEReconciler) getLayerDigestsFromNestedManifest
 	}
 
 	if desc.MediaType == ocispec.MediaTypeImageIndex {
+		var targetManifestDesc ocispec.Descriptor
 		var indexManifest ocispec.Index
 		if err := json.Unmarshal(manifestData, &indexManifest); err != nil {
 			return "", "", "", fmt.Errorf("failed to unmarshal index manifest: %w", err)

internal/controller/serverbootconfiguration_pxe_controller_test.go

@@ -31,7 +31,7 @@ import (
 var _ = Describe("ServerBootConfiguration Controller", func() {
 	ns := SetupTest()
 
-	It("should map a new ServerBootConfiguration", func(ctx SpecContext) {
+	It("should map a ServerBootConfiguration using ironcore oci image", func(ctx SpecContext) {
 		By("creating a new Server object")
 		server := &metalv1alpha1.Server{
 			ObjectMeta: metav1.ObjectMeta{
@@ -64,7 +64,7 @@ var _ = Describe("ServerBootConfiguration Controller", func() {
 				ServerRef: corev1.LocalObjectReference{
 					Name: server.Name,
 				},
-				Image:             "ghcr.io/ironcore-dev/os-images/test-image:100.1",
+				Image:             "ghcr.io/ironcore-dev/os-images/gardenlinux:1877.0",
 				IgnitionSecretRef: &corev1.LocalObjectReference{Name: "foo"},
 			},
 		}
@@ -92,7 +92,7 @@ var _ = Describe("ServerBootConfiguration Controller", func() {
 		))
 	})
 
-	It("should map a new ServerBootConfiguration", func(ctx SpecContext) {
+	It("should map a ServerBootConfiguration using gardenlinux oci image", func(ctx SpecContext) {
 		By("creating a new Server object")
 		server := &metalv1alpha1.Server{
 			ObjectMeta: metav1.ObjectMeta{
@@ -125,7 +125,7 @@ var _ = Describe("ServerBootConfiguration Controller", func() {
 				ServerRef: corev1.LocalObjectReference{
 					Name: server.Name,
 				},
-				Image:             "ghcr.io/ironcore-dev/os-images/test-image:100.1",
+				Image:             "ghcr.io/gardenlinux/gardenlinux:1772.0",
 				IgnitionSecretRef: &corev1.LocalObjectReference{Name: "foo"},
 			},
 		}