Merge pull request #1239 from fluxcd/oci-created

oci: set created timestamp in the config

Author: matheuscscp

oci/push.go

@@ -117,9 +117,29 @@ func (c *Client) Push(ctx context.Context, url, sourcePath string, opts ...PushO
 		o.meta.Created = ct.Format(time.RFC3339)
 	}
 
+	annotations := o.meta.ToAnnotations()
+	createdValue := annotations[CreatedAnnotation]
+	if createdValue == "" {
+		createdValue = o.meta.Created
+		annotations[CreatedAnnotation] = createdValue
+	}
+	created, err := time.Parse(time.RFC3339, createdValue)
+	if err != nil {
+		return "", fmt.Errorf("invalid created timestamp %q: %w", createdValue, err)
+	}
+
 	img := mutate.MediaType(empty.Image, types.OCIManifestSchema1)
 	img = mutate.ConfigMediaType(img, CanonicalConfigMediaType)
-	img = mutate.Annotations(img, o.meta.ToAnnotations()).(gcrv1.Image)
+	configFile, err := img.ConfigFile()
+	if err != nil {
+		return "", fmt.Errorf("reading artifact config failed: %w", err)
+	}
+	configFile.Created = gcrv1.Time{Time: created}
+	img, err = mutate.ConfigFile(img, configFile)
+	if err != nil {
+		return "", fmt.Errorf("setting artifact config failed: %w", err)
+	}
+	img = mutate.Annotations(img, annotations).(gcrv1.Image)
 
 	img, err = mutate.Append(img, mutate.Addendum{Layer: layer})
 	if err != nil {

oci/push_pull_test.go

@@ -253,6 +253,10 @@ func Test_Push_Pull(t *testing.T) {
 				g.Expect(manifest.Annotations[CreatedAnnotation]).To(BeEquivalentTo(created))
 				g.Expect(manifest.Annotations[SourceAnnotation]).To(BeEquivalentTo(source))
 				g.Expect(manifest.Annotations[RevisionAnnotation]).To(BeEquivalentTo(revision))
+
+				configFile, err := image.ConfigFile()
+				g.Expect(err).ToNot(HaveOccurred())
+				g.Expect(configFile.Created.Time.UTC().Format(time.RFC3339)).To(BeEquivalentTo(created))
 			}
 
 			// Verify media types
@@ -322,6 +326,70 @@ func Test_Push_Pull(t *testing.T) {
 	}
 }
 
+func Test_PushCreatedAnnotationOverridesConfigCreated(t *testing.T) {
+	g := NewWithT(t)
+	ctx := context.Background()
+	c := NewClient(DefaultOptions())
+	repo := "test-push-created" + randStringRunes(5)
+	url := fmt.Sprintf("%s/%s:%s", dockerReg, repo, "v0.0.1")
+	created := time.Date(2026, 6, 10, 12, 0, 0, 0, time.UTC).Format(time.RFC3339)
+
+	metadata := Metadata{
+		Source:   "github.com/fluxcd/flux2",
+		Revision: "rev",
+		Annotations: map[string]string{
+			CreatedAnnotation: created,
+		},
+	}
+
+	_, err := c.Push(ctx, url, "testdata/artifact", WithPushMetadata(metadata))
+	g.Expect(err).ToNot(HaveOccurred())
+
+	image, err := crane.Pull(url)
+	g.Expect(err).ToNot(HaveOccurred())
+
+	manifest, err := image.Manifest()
+	g.Expect(err).ToNot(HaveOccurred())
+	g.Expect(manifest.Annotations[CreatedAnnotation]).To(BeEquivalentTo(created))
+
+	configFile, err := image.ConfigFile()
+	g.Expect(err).ToNot(HaveOccurred())
+	g.Expect(configFile.Created.Time.UTC().Format(time.RFC3339)).To(BeEquivalentTo(created))
+}
+
+func Test_PushEmptyCreatedAnnotationUsesDefaultCreated(t *testing.T) {
+	g := NewWithT(t)
+	ctx := context.Background()
+	c := NewClient(DefaultOptions())
+	repo := "test-push-empty-created" + randStringRunes(5)
+	url := fmt.Sprintf("%s/%s:%s", dockerReg, repo, "v0.0.1")
+
+	metadata := Metadata{
+		Source:   "github.com/fluxcd/flux2",
+		Revision: "rev",
+		Annotations: map[string]string{
+			CreatedAnnotation: "",
+		},
+	}
+
+	_, err := c.Push(ctx, url, "testdata/artifact", WithPushMetadata(metadata))
+	g.Expect(err).ToNot(HaveOccurred())
+
+	image, err := crane.Pull(url)
+	g.Expect(err).ToNot(HaveOccurred())
+
+	manifest, err := image.Manifest()
+	g.Expect(err).ToNot(HaveOccurred())
+	created := manifest.Annotations[CreatedAnnotation]
+	g.Expect(created).ToNot(BeEmpty())
+	_, err = time.Parse(time.RFC3339, created)
+	g.Expect(err).ToNot(HaveOccurred())
+
+	configFile, err := image.ConfigFile()
+	g.Expect(err).ToNot(HaveOccurred())
+	g.Expect(configFile.Created.Time.UTC().Format(time.RFC3339)).To(BeEquivalentTo(created))
+}
+
 func Test_getLayerMediaType(t *testing.T) {
 	tests := []struct {
 		name              string