actions/fluxcd-flux2
2
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-05-23 01:45:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Add --layer-index flag to pull artifact

Browse source 
The flux pull artifact command currently extracts only the first layer
of the OCI manifest, which prevents pulling arbitrary layers from OCI
artifacts not created by flux. The underlying oci.Client.Pull already
accepts a WithPullLayerIndex option but it was not exposed to the CLI.

Add a --layer-index int flag (default -1, meaning unset) wired through
to oci.WithPullLayerIndex when set. The default flow is unchanged.

Signed-off-by: Ruslan Shaydullin <shaydullin.r.d@outlook.com>
Assisted-by: claude-code/claude-opus-4-7
This commit is contained in:
Ruslan Shaydullin 2026-05-11 11:39:21 +05:00
parent abb86f161b
commit 96ba98b79f
1 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
cmd/flux/pull_artifact.go
View file

@ -34,25 +34,32 @@ var pullArtifactCmd = &cobra.Command{
Use: "artifact",
Short: "Pull artifact",
Long: `The pull artifact command downloads and extracts the OCI artifact content to the given path.
The command can read the credentials from '~/.docker/config.json' but they can also be passed with --creds. It can also login to a supported provider with the --provider flag.`,
The command can read the credentials from '~/.docker/config.json' but they can also be passed with --creds. It can also login to a supported provider with the --provider flag.
By default the first layer of the OCI manifest is extracted; use --layer-index to select a different layer of an arbitrary OCI artifact.`,
Example: ` # Pull an OCI artifact created by flux from GHCR
flux pull artifact oci://ghcr.io/org/manifests/app:v0.0.1 --output ./path/to/local/manifests
# Pull layer index 1 from an arbitrary OCI artifact
flux pull artifact oci://ghcr.io/org/charts/app:v0.0.1 --output ./path/to/local/extracted --layer-index 1
`,
RunE: pullArtifactCmdRun,
}
type pullArtifactFlags struct {
output string
creds string
insecure bool
provider flags.SourceOCIProvider
output string
creds string
insecure bool
layerIndex int
provider flags.SourceOCIProvider
}
var pullArtifactArgs = newPullArtifactFlags()
func newPullArtifactFlags() pullArtifactFlags {
return pullArtifactFlags{
provider: flags.SourceOCIProvider(sourcev1.GenericOCIProvider),
provider: flags.SourceOCIProvider(sourcev1.GenericOCIProvider),
layerIndex: -1,
}
}
@ -61,6 +68,7 @@ func init() {
pullArtifactCmd.Flags().StringVar(&pullArtifactArgs.creds, "creds", "", "credentials for OCI registry in the format <username>[:<password>] if --provider is generic")
pullArtifactCmd.Flags().Var(&pullArtifactArgs.provider, "provider", sourceOCIRepositoryArgs.provider.Description())
pullArtifactCmd.Flags().BoolVar(&pullArtifactArgs.insecure, "insecure-registry", false, "allows artifacts to be pulled without TLS")
pullArtifactCmd.Flags().IntVar(&pullArtifactArgs.layerIndex, "layer-index", -1, "pull a specific layer of the OCI manifest by its zero-based index (default: pull the first layer)")
pullCmd.AddCommand(pullArtifactCmd)
}
@ -112,7 +120,13 @@ func pullArtifactCmdRun(cmd *cobra.Command, args []string) error {
logger.Actionf("pulling artifact from %s", url)
meta, err := ociClient.Pull(ctx, url, pullArtifactArgs.output)
var pullOptions []oci.PullOption
if pullArtifactArgs.layerIndex >= 0 {
logger.Actionf("selecting layer index %d", pullArtifactArgs.layerIndex)
pullOptions = append(pullOptions, oci.WithPullLayerIndex(pullArtifactArgs.layerIndex))
}
meta, err := ociClient.Pull(ctx, url, pullArtifactArgs.output, pullOptions...)
if err != nil {
return err
}