feat(crane): add option to allow pushing non-distributable layers (#1348

) Signed-off-by: jwiegratz <jasper.wiegratz@sva.de> Signed-off-by: jwhb <jwhy@jwhy.de>
google · Jun 21, 2022 · 0c40ec8 · 0c40ec8
1 parent 2a21d4f
commit 0c40ec8
Show file tree

Hide file tree

Showing 24 changed files with 102 additions and 67 deletions.
diff --git a/cmd/crane/cmd/root.go b/cmd/crane/cmd/root.go
@@ -38,6 +38,7 @@ var Root = New(use, short, []crane.Option{})
 func New(use, short string, options []crane.Option) *cobra.Command {
 	verbose := false
 	insecure := false
+	ndlayers := false
 	platform := &platformValue{}
 
 	root := &cobra.Command{
@@ -55,6 +56,9 @@ func New(use, short string, options []crane.Option) *cobra.Command {
 			if insecure {
 				options = append(options, crane.Insecure)
 			}
+			if ndlayers {
+				options = append(options, crane.WithNondistributable())
+			}
 			if Version != "" {
 				binary := "crane"
 				if len(os.Args[0]) != 0 {
@@ -113,6 +117,7 @@ func New(use, short string, options []crane.Option) *cobra.Command {
 
 	root.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "Enable debug logs")
 	root.PersistentFlags().BoolVar(&insecure, "insecure", false, "Allow image references to be fetched without TLS")
+	root.PersistentFlags().BoolVar(&ndlayers, "allow-nondistributable-artifacts", false, "Allow pushing non-distributable (foreign) layers")
 	root.PersistentFlags().Var(platform, "platform", "Specifies the platform in the form os/arch[/variant][:osversion] (e.g. linux/amd64).")
 
 	return root

diff --git a/cmd/crane/doc/crane.md b/cmd/crane/doc/crane.md
diff --git a/cmd/crane/doc/crane_append.md b/cmd/crane/doc/crane_append.md
diff --git a/cmd/crane/doc/crane_auth.md b/cmd/crane/doc/crane_auth.md
diff --git a/cmd/crane/doc/crane_auth_get.md b/cmd/crane/doc/crane_auth_get.md
diff --git a/cmd/crane/doc/crane_auth_login.md b/cmd/crane/doc/crane_auth_login.md
diff --git a/cmd/crane/doc/crane_blob.md b/cmd/crane/doc/crane_blob.md
diff --git a/cmd/crane/doc/crane_catalog.md b/cmd/crane/doc/crane_catalog.md
diff --git a/cmd/crane/doc/crane_config.md b/cmd/crane/doc/crane_config.md
diff --git a/cmd/crane/doc/crane_copy.md b/cmd/crane/doc/crane_copy.md
diff --git a/cmd/crane/doc/crane_delete.md b/cmd/crane/doc/crane_delete.md
diff --git a/cmd/crane/doc/crane_digest.md b/cmd/crane/doc/crane_digest.md
diff --git a/cmd/crane/doc/crane_export.md b/cmd/crane/doc/crane_export.md
diff --git a/cmd/crane/doc/crane_flatten.md b/cmd/crane/doc/crane_flatten.md
diff --git a/cmd/crane/doc/crane_ls.md b/cmd/crane/doc/crane_ls.md
diff --git a/cmd/crane/doc/crane_manifest.md b/cmd/crane/doc/crane_manifest.md
diff --git a/cmd/crane/doc/crane_mutate.md b/cmd/crane/doc/crane_mutate.md
diff --git a/cmd/crane/doc/crane_pull.md b/cmd/crane/doc/crane_pull.md
diff --git a/cmd/crane/doc/crane_push.md b/cmd/crane/doc/crane_push.md
diff --git a/cmd/crane/doc/crane_rebase.md b/cmd/crane/doc/crane_rebase.md
diff --git a/cmd/crane/doc/crane_tag.md b/cmd/crane/doc/crane_tag.md
diff --git a/cmd/crane/doc/crane_validate.md b/cmd/crane/doc/crane_validate.md
diff --git a/cmd/crane/doc/crane_version.md b/cmd/crane/doc/crane_version.md
diff --git a/pkg/crane/options.go b/pkg/crane/options.go
@@ -108,6 +108,14 @@ func WithUserAgent(ua string) Option {
 	}
 }
 
+// WithNondistributable is an option that allows pushing non-distributable
+// layers.
+func WithNondistributable() Option {
+	return func(o *Options) {
+		o.Remote = append(o.Remote, remote.WithNondistributable)
+	}
+}
+
 // WithContext is a functional option for setting the context.
 func WithContext(ctx context.Context) Option {
 	return func(o *Options) {