Fix descriptor handling for the OCI spec

hardikdr · hardikdr · commit 015291c7a521 · 2025-08-01T10:09:15.000+02:00
diff --git a/go.mod b/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
 )
diff --git a/go.sum b/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=
diff --git a/internal/controller/serverbootconfiguration_pxe_controller.go b/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)

Original file line number	Diff line number	Diff line change
`@@ -120,5 +120,5 @@ require (`
`120`	`120`	`sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect`
`121`	`121`	`sigs.k8s.io/randfill v1.0.0 // indirect`
`122`	`122`	`sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect`
`123`		`- sigs.k8s.io/yaml v1.5.0 // indirect`
	`123`	`+ sigs.k8s.io/yaml v1.6.0 // indirect`
`124`	`124`	`)`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,6 @@ func (r *ServerBootConfigurationPXEReconciler) getLayerDigestsFromNestedManifest`
`228`	`228`	`return "", "", "", fmt.Errorf("failed to resolve image reference: %w", err)`
`229`	`229`	`}`
`230`	`230`
`231`		`- targetManifestDesc := desc`
`232`	`231`	`manifestData, err := fetchContent(ctx, resolver, name, desc)`
`233`	`232`	`if err != nil {`
`234`	`233`	`return "", "", "", fmt.Errorf("failed to fetch manifest data: %w", err)`
`@@ -240,6 +239,7 @@ func (r *ServerBootConfigurationPXEReconciler) getLayerDigestsFromNestedManifest`
`240`	`239`	`}`
`241`	`240`
`242`	`241`	`if desc.MediaType == ocispec.MediaTypeImageIndex {`
	`242`	`+ var targetManifestDesc ocispec.Descriptor`
`243`	`243`	`var indexManifest ocispec.Index`
`244`	`244`	`if err := json.Unmarshal(manifestData, &indexManifest); err != nil {`
`245`	`245`	`return "", "", "", fmt.Errorf("failed to unmarshal index manifest: %w", err)`