mirror of
https://github.com/fluxcd/flux2.git
synced 2026-05-23 01:45:53 +00:00
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
144 lines
4.8 KiB
Go
144 lines
4.8 KiB
Go
/*
|
|
Copyright 2022 The Flux authors
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
|
|
"github.com/google/go-containerregistry/pkg/crane"
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/fluxcd/pkg/oci"
|
|
sourcev1 "github.com/fluxcd/source-controller/api/v1"
|
|
|
|
"github.com/fluxcd/flux2/v2/internal/flags"
|
|
)
|
|
|
|
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.
|
|
|
|
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
|
|
layerIndex int
|
|
provider flags.SourceOCIProvider
|
|
}
|
|
|
|
var pullArtifactArgs = newPullArtifactFlags()
|
|
|
|
func newPullArtifactFlags() pullArtifactFlags {
|
|
return pullArtifactFlags{
|
|
provider: flags.SourceOCIProvider(sourcev1.GenericOCIProvider),
|
|
layerIndex: -1,
|
|
}
|
|
}
|
|
|
|
func init() {
|
|
pullArtifactCmd.Flags().StringVarP(&pullArtifactArgs.output, "output", "o", "", "path where the artifact content should be extracted.")
|
|
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)
|
|
}
|
|
|
|
func pullArtifactCmdRun(cmd *cobra.Command, args []string) error {
|
|
if len(args) < 1 {
|
|
return fmt.Errorf("artifact URL is required")
|
|
}
|
|
ociURL := args[0]
|
|
|
|
if pullArtifactArgs.output == "" {
|
|
return fmt.Errorf("output path cannot be empty")
|
|
}
|
|
|
|
if fs, err := os.Stat(pullArtifactArgs.output); err != nil || !fs.IsDir() {
|
|
return fmt.Errorf("invalid output path %q: %w", pullArtifactArgs.output, err)
|
|
}
|
|
|
|
url, err := oci.ParseArtifactURL(ociURL)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), rootArgs.timeout)
|
|
defer cancel()
|
|
|
|
opts := oci.DefaultOptions()
|
|
|
|
if pullArtifactArgs.insecure {
|
|
opts = append(opts, crane.Insecure)
|
|
}
|
|
|
|
if pullArtifactArgs.provider.String() != sourcev1.GenericOCIProvider {
|
|
logger.Actionf("logging in to registry with provider credentials")
|
|
opt, _, err := loginWithProvider(ctx, url, pullArtifactArgs.provider.String())
|
|
if err != nil {
|
|
return fmt.Errorf("error during login with provider: %w", err)
|
|
}
|
|
opts = append(opts, opt)
|
|
}
|
|
|
|
ociClient := oci.NewClient(opts)
|
|
|
|
if pullArtifactArgs.provider.String() == sourcev1.GenericOCIProvider && pullArtifactArgs.creds != "" {
|
|
logger.Actionf("logging in to registry with credentials")
|
|
if err := ociClient.LoginWithCredentials(pullArtifactArgs.creds); err != nil {
|
|
return fmt.Errorf("could not login with credentials: %w", err)
|
|
}
|
|
}
|
|
|
|
logger.Actionf("pulling artifact from %s", url)
|
|
|
|
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
|
|
}
|
|
|
|
if meta.Source != "" {
|
|
logger.Successf("source %s", meta.Source)
|
|
}
|
|
if meta.Revision != "" {
|
|
logger.Successf("revision %s", meta.Revision)
|
|
}
|
|
logger.Successf("digest %s", meta.Digest)
|
|
logger.Successf("artifact content extracted to %s", pullArtifactArgs.output)
|
|
|
|
return nil
|
|
}
|