buildah manifest: add artifact-related options by nalind · Pull Request #5301 · containers/buildah

nalind · 2024-01-30T22:56:34Z

What type of PR is this?

/kind feature

What this PR does / why we need it:

Add functionality for creating artifact manifests and adding them to image indexes. buildah manifest add gets a --artifact option for telling it to create artifact manifests, and --artifact-type, --artifact-config-type, --artifact-layer-type, --artifact-exclude-titles, and --subject options to fine-tune the contents of the artifact manifests it creates.

Add a --index flag to buildah manifest annotate so that it can be told to set annotations on the index itself instead of on one of the entries in the image index.

Add a --subject flag to buildah manifest annotate for setting the subject field of an image index.

Add a --annotation flag to buildah manifest create to allow for adding annotations to the new image index.

How to verify it

New integration tests!

Which issue(s) this PR fixes:

Fixes #5051

Special notes for your reviewer:

Does this PR introduce a user-facing change?

`buildah manifest add` now accepts a `--artifact` option, which can create artifact manifests for arbitrary files and add those artifact manifests to an image index.
`buildah manifest annotate` now accepts a `--index` option, indicating that `--annotation` values should be added to the image index rather than an item listed in an image index.

nalind · 2024-01-30T22:56:55Z

/hold until after containers/common#1833 is merged, so that it doesn't depend on a branch in my personal fork.

packit-as-a-service · 2024-01-30T23:17:12Z

Ephemeral COPR build failed. @containers/packit-build please check.

rhatdan · 2024-02-07T16:11:46Z

Can you change the common PR above to not be Do not merge? I think common is up 2 date.

nalind · 2024-02-07T16:21:00Z

Removing the update of github.com/containers/common from the first commit in the series.

nalind · 2024-02-07T16:35:06Z

Oh, you meant "take the DO NOT MERGE off the description", since the previously-vendored version of common is from November.

Update github.com/openshift/imagebuilder to the v1.2.6 release Update github.com/containers/common to the current tip of the main branch Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

github.com/docker/docker/client.NewVersionError() takes a context.Context now. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

... in an attempt to try to get UID 0 in a user namespace to stop trying to read files from root's home directory, where the permissions error is treated as a hard failure. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

... which will have netavark installed in it, so that tests won't just fail because it isn't there. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

In tests/validate/pr-should-include-tests and tests/validate/whitespace.sh, use grep -E instead of egrep, because egrep keeps telling us to switch. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

github.com/cilium/ebpf v0.12.3 (the latest tag as of this moment) won't build on linux/loong64, but the tip of its main branch does. When v0.12.4 is released, and we're using that or a later version, we can turn it back on. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

... instead of github.com/containers/common/pkg/util.StringInSlice, per linters. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

Locally-defined structs don't need to be aliases for themselves. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

Lock an image index's image before attempting to modify or push it. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

Add functionality for creating artifact manifests and adding them to image indexes. `buildah manifest add` gets a `--artifact` option for telling it to create artifact manifests, and `--artifact-type`, `--artifact-config`, `--artifact-config-type`, `--artifact-layer-type`, `--artifact-exclude-titles`, and `--subject` options to fine-tune the contents of the artifact manifests it creates. Add a `--index` flag to `buildah manifest annotate` so that it can be told to set annotations on the index itself instead of on one of the entries in the image index. Add a `--subject` flag to `buildah manifest annotate` for setting the `subject` field of an image index. Add a `--annotation` flag to `buildah manifest create` to allow for adding annotations to the new image index. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

rhatdan · 2024-02-07T19:59:03Z

chroot/run_common.go

 	cmd.Stdin, cmd.Stdout, cmd.Stderr = stdin, stdout, stderr
 	cmd.Dir = "/"
 	cmd.Env = []string{fmt.Sprintf("LOGLEVEL=%d", logrus.GetLevel())}
+	if _, ok := os.LookupEnv(containersConfEnv); ok {


Nit: Why not use the val passed back rather then calling os.Getenv() again.if

val, ok := os.LookupEnv(containersConfEnv); ok { cmd.Env = append(cmd.Env, containersConfEnv+"="+val)) }

Yes, that would have been better.

rhatdan

LGTM

openshift-ci · 2024-02-07T20:02:50Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nalind, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [nalind,rhatdan]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

baude · 2024-02-07T20:17:16Z

i verified it worked with multiple artifacts and quay ... great work @nalind

/lgtm

openshift-ci bot added kind/feature Categorizes issue or PR as related to a new feature. approved labels Jan 30, 2024

openshift-ci bot added the do-not-merge/hold label Jan 30, 2024

nalind force-pushed the fun-with-artifacts branch 2 times, most recently from adbf537 to 70a6313 Compare January 30, 2024 23:12

nalind force-pushed the fun-with-artifacts branch 2 times, most recently from 353916c to 3a5c70a Compare January 31, 2024 15:05

nalind mentioned this pull request Jan 31, 2024

Update dependencies, keep up with API changes openshift/imagebuilder#276

Merged

nalind force-pushed the fun-with-artifacts branch 12 times, most recently from 9eb3c83 to b0c2566 Compare February 7, 2024 14:33

nalind force-pushed the fun-with-artifacts branch from b0c2566 to dad7450 Compare February 7, 2024 16:20

nalind force-pushed the fun-with-artifacts branch from dad7450 to 68b2475 Compare February 7, 2024 16:42

nalind added 3 commits February 7, 2024 11:47

Update github.com/openshift/imagebuilder and containers/common

5d58b88

Update github.com/openshift/imagebuilder to the v1.2.6 release Update github.com/containers/common to the current tip of the main branch Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

Update to match dependency API update

56e6ef8

github.com/docker/docker/client.NewVersionError() takes a context.Context now. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

Set CONTAINERS_CONF in the chroot-mount-flags integration test

04847f5

... in an attempt to try to get UID 0 in a user namespace to stop trying to read files from root's home directory, where the permissions error is treated as a hard failure. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

nalind added 8 commits February 7, 2024 11:48

Try Cirrus with a newer VM version

e6d1794

... which will have netavark installed in it, so that tests won't just fail because it isn't there. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

egrep is obsolescent; use grep -E

302a798

In tests/validate/pr-should-include-tests and tests/validate/whitespace.sh, use grep -E instead of egrep, because egrep keeps telling us to switch. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

Fix a couple of typos in one-line comments

e999600

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

Use golang.org/x/exp/slices.Contains

4f0b619

... instead of github.com/containers/common/pkg/util.StringInSlice, per linters. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

cmd/buildah/manifest.go: don't make struct declarations aliases

a0852e9

Locally-defined structs don't need to be aliases for themselves. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

cmd/buildah/manifest.go: lock lists before adding/annotating/pushing

0705791

Lock an image index's image before attempting to modify or push it. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

nalind force-pushed the fun-with-artifacts branch from 68b2475 to aca884a Compare February 7, 2024 16:53

rhatdan reviewed Feb 7, 2024

View reviewed changes

rhatdan approved these changes Feb 7, 2024

View reviewed changes

rhatdan removed the do-not-merge/hold label Feb 7, 2024

openshift-ci bot assigned baude Feb 7, 2024

openshift-ci bot added the lgtm label Feb 7, 2024

nalind mentioned this pull request Feb 7, 2024

fix(deps): update module github.com/openshift/imagebuilder to v1.2.6 - autoclosed #5323

Closed

1 task

openshift-merge-bot bot merged commit 817237a into containers:main Feb 7, 2024

nalind deleted the fun-with-artifacts branch February 7, 2024 20:20

kachick mentioned this pull request Mar 17, 2024

Improve building and deploying containers kachick/dotfiles#490

Merged

stale-locking-app bot added the locked - please file new issue/PR label May 8, 2024

stale-locking-app bot locked as resolved and limited conversation to collaborators May 8, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

buildah manifest: add artifact-related options#5301

buildah manifest: add artifact-related options#5301
openshift-merge-bot[bot] merged 11 commits intocontainers:mainfrom
nalind:fun-with-artifacts

nalind commented Jan 30, 2024 •

edited

Loading

Uh oh!

nalind commented Jan 30, 2024

Uh oh!

packit-as-a-service bot commented Jan 30, 2024

Uh oh!

rhatdan commented Feb 7, 2024

Uh oh!

nalind commented Feb 7, 2024

Uh oh!

nalind commented Feb 7, 2024

Uh oh!

rhatdan Feb 7, 2024

Uh oh!

nalind Feb 7, 2024

Uh oh!

rhatdan left a comment

Uh oh!

openshift-ci bot commented Feb 7, 2024

Uh oh!

baude commented Feb 7, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

nalind commented Jan 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What type of PR is this?

What this PR does / why we need it:

How to verify it

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Uh oh!

nalind commented Jan 30, 2024

Uh oh!

packit-as-a-service bot commented Jan 30, 2024

Uh oh!

rhatdan commented Feb 7, 2024

Uh oh!

nalind commented Feb 7, 2024

Uh oh!

nalind commented Feb 7, 2024

Uh oh!

rhatdan Feb 7, 2024

Choose a reason for hiding this comment

Uh oh!

nalind Feb 7, 2024

Choose a reason for hiding this comment

Uh oh!

rhatdan left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Feb 7, 2024

Uh oh!

baude commented Feb 7, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

nalind commented Jan 30, 2024 •

edited

Loading