opensource/sealos
3
0
Fork 0
mirror of https://github.com/labring/sealos.git synced 2026-09-24 15:46:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor buildah interface, arguments as flagsetters (#2281)

Browse Source 
Signed-off-by: fengxsong <fengxsong@outlook.com>

Signed-off-by: fengxsong <fengxsong@outlook.com>
This commit is contained in:
fengxsong
2022-12-19 16:28:48 +08:00
committed by GitHub
parent 1119a94e26
commit 2ca3820604
4 changed files with 90 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apply/processor/create.go
+2 -1
View File
@@ -108,7 +108,8 @@ func (c *CreateProcessor) CheckImageType(cluster *v2.Cluster) error {
func (c *CreateProcessor) PreProcess(cluster *v2.Cluster) error {
logger.Info("Executing pipeline PreProcess in CreateProcessor.")
err := c.Buildah.Pull(buildah.DefaultPlatform(), buildah.PullIfMissing.String(), cluster.Spec.Image...)
err := c.Buildah.Pull(cluster.Spec.Image, buildah.WithPlatformOption(buildah.DefaultPlatform()),
buildah.WithPullPolicyOption(buildah.PullIfMissing.String()))
if err != nil {
return err
}
pkg/apply/processor/install.go
+2 -1
View File
@@ -114,7 +114,8 @@ func (c *InstallProcessor) SyncStatusAndCheck(cluster *v2.Cluster) error {
}
func (c *InstallProcessor) PreProcess(cluster *v2.Cluster) error {
if err := c.Buildah.Pull(buildah.DefaultPlatform(), buildah.PullIfMissing.String(), c.NewImages...); err != nil {
if err := c.Buildah.Pull(c.NewImages, buildah.WithPlatformOption(buildah.DefaultPlatform()),
buildah.WithPullPolicyOption(buildah.PullIfMissing.String())); err != nil {
return err
}
imageTypes := sets.NewString()
pkg/buildah/create.go
+28 -3
View File
@@ -18,24 +18,49 @@ import (
"os"
"os/exec"
"github.com/containers/buildah/pkg/parse"
"github.com/containers/storage/pkg/unshare"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/labring/sealos/pkg/utils/logger"
)
type createOptions struct {
name string
platform string
}
func newDefaultCreateOptions() *createOptions {
return &createOptions{
name: "default",
platform: parse.DefaultPlatform(),
}
}
func (opts *createOptions) RegisterFlags(fs *pflag.FlagSet) {
fs.StringVarP(&opts.name, "cluster", "c", opts.name, "name of cluster to be created but not actually run")
fs.StringVar(&opts.platform, "platform", opts.platform, "set the OS/ARCH/VARIANT of the image to the provided value instead of the current operating system and architecture of the host (for example `linux/arm`)")
}
func newCreateCmd() *cobra.Command {
var clusterName string
opts := newDefaultCreateOptions()
var createCmd = &cobra.Command{
Use: "create",
Short: "Create a cluster without running the CMD, for inspecting image",
Args: cobra.MinimumNArgs(1),
RunE: func(c *cobra.Command, args []string) error {
oss, arch, variant, err := parse.Platform(opts.platform)
if err != nil {
return err
}
bder, err := New("")
if err != nil {
return err
}
info, err := bder.Create(clusterName, args[0])
info, err := bder.Create(opts.name, args[0],
WithPlatformOption(v1.Platform{OS: oss, Architecture: arch, Variant: variant}))
if err != nil {
return err
}
@@ -68,6 +93,6 @@ func newCreateCmd() *cobra.Command {
return nil
},
}
createCmd.Flags().StringVarP(&clusterName, "cluster", "c", "default", "name of cluster to be created but not actually run")
opts.RegisterFlags(createCmd.Flags())
return createCmd
}
pkg/buildah/interface.go
+58 -19
View File
@@ -25,17 +25,18 @@ import (
storagetypes "github.com/containers/storage/types"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/labring/sealos/pkg/utils/logger"
)
type Interface interface {
Pull(v1.Platform, string, ...string) error
Load(string) (string, error)
InspectImage(string) (v1.Image, error)
Create(string, string) (buildah.BuilderInfo, error)
Delete(string) error
InspectContainer(string) (buildah.BuilderInfo, error)
Pull(imageNames []string, opts ...FlagSetter) error
Load(input string) (string, error)
InspectImage(name string) (v1.Image, error)
Create(name string, image string, opts ...FlagSetter) (buildah.BuilderInfo, error)
Delete(name string) error
InspectContainer(name string) (buildah.BuilderInfo, error)
ListContainers() ([]JSONContainer, error)
}
@@ -61,14 +62,47 @@ type realImpl struct {
systemContext *types.SystemContext
}
func (impl *realImpl) Pull(pf v1.Platform, pullPolicy string, imageNames ...string) error {
type FlagSetter func(*pflag.FlagSet) error
func newFlagSetter(k string, v string) FlagSetter {
return func(fs *pflag.FlagSet) error {
if f := fs.Lookup(k); f != nil {
return fs.Set(k, v)
}
return nil
}
}
func WithPlatformOption(pf v1.Platform) FlagSetter {
return func(fs *pflag.FlagSet) error {
for _, fn := range []FlagSetter{
newFlagSetter("os", pf.OS),
newFlagSetter("arch", pf.Architecture),
newFlagSetter("variant", pf.Variant),
} {
if err := fn(fs); err != nil {
return err
}
}
return nil
}
}
func WithPullPolicyOption(policy string) FlagSetter {
return func(fs *pflag.FlagSet) error {
return newFlagSetter("policy", policy)(fs)
}
}
func (impl *realImpl) Pull(imageNames []string, opts ...FlagSetter) error {
cmd := impl.mockCmd()
iopt := newDefaultPullOptions()
iopt.os = pf.OS
iopt.arch = pf.Architecture
iopt.variant = pf.Variant
iopt.pullPolicy = pullPolicy
_ = iopt.RegisterFlags(cmd.Flags())
for i := range opts {
if err := opts[i](cmd.Flags()); err != nil {
return err
}
}
if err := setDefaultFlags(cmd); err != nil {
return err
}
@@ -89,11 +123,11 @@ func (impl *realImpl) InspectImage(name string) (v1.Image, error) {
return out.OCIv1, nil
}
func (impl *realImpl) Create(name string, image string) (buildah.BuilderInfo, error) {
func (impl *realImpl) Create(name string, image string, opts ...FlagSetter) (buildah.BuilderInfo, error) {
if err := impl.Delete(impl.finalizeName(name)); err != nil {
return buildah.BuilderInfo{}, fmt.Errorf("failed to delete: %v", err)
}
if _, err := impl.from(impl.finalizeName(name), image); err != nil {
if _, err := impl.from(impl.finalizeName(name), image, opts...); err != nil {
return buildah.BuilderInfo{}, fmt.Errorf("failed to from: %v", err)
}
if _, err := impl.mount(impl.finalizeName(name)); err != nil {
@@ -113,16 +147,21 @@ func (impl *realImpl) Delete(name string) error {
return builder.Delete()
}
func (impl *realImpl) from(name, image string) (*buildah.Builder, error) {
func (impl *realImpl) from(name, image string, opts ...FlagSetter) (*buildah.Builder, error) {
cmd := impl.mockCmd()
opts := newDefaultFromReply()
opts.name = impl.finalizeName(name)
opts.pull = ""
opts.RegisterFlags(cmd.Flags())
iopts := newDefaultFromReply()
iopts.name = impl.finalizeName(name)
iopts.pull = ""
iopts.RegisterFlags(cmd.Flags())
for i := range opts {
if err := opts[i](cmd.Flags()); err != nil {
return nil, err
}
}
if err := setDefaultFlags(cmd); err != nil {
return nil, err
}
return doFrom(cmd, image, opts, impl.store, nil)
return doFrom(cmd, image, iopts, impl.store, nil)
}
func (impl *realImpl) mount(name string) (jsonMount, error) {