mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ENHANCEMENT] imageImport: start existing tools node before using it and add option to keep it around (#672)

Browse Source
This commit is contained in:
Thorsten Klein 2021-07-09 08:22:05 +02:00 committed by GitHub
parent 4b1b14034c
commit c5f7884f78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/image/imageImport.go
View File

@ -86,6 +86,7 @@ So if a file './rancher/k3d-tools' exists, k3d will try to import it instead of
} }
cmd.Flags().BoolVarP(&loadImageOpts.KeepTar, "keep-tarball", "k", false, "Do not delete the tarball containing the saved images from the shared volume") cmd.Flags().BoolVarP(&loadImageOpts.KeepTar, "keep-tarball", "k", false, "Do not delete the tarball containing the saved images from the shared volume")
cmd.Flags().BoolVarP(&loadImageOpts.KeepToolsNode, "keep-tools", "t", false, "Do not delete the tools node after import")
/* Subcommands */ /* Subcommands */

27
pkg/tools/tools.go
View File

@ -40,7 +40,7 @@ import (
// ImageImportIntoClusterMulti starts up a k3d tools container for the selected cluster and uses it to export // ImageImportIntoClusterMulti starts up a k3d tools container for the selected cluster and uses it to export
// images from the runtime to import them into the nodes of the selected cluster // images from the runtime to import them into the nodes of the selected cluster
func ImageImportIntoClusterMulti(ctx context.Context, runtime runtimes.Runtime, images []string, cluster *k3d.Cluster, loadImageOpts k3d.ImageImportOpts) error { func ImageImportIntoClusterMulti(ctx context.Context, runtime runtimes.Runtime, images []string, cluster *k3d.Cluster, opts k3d.ImageImportOpts) error {
imagesFromRuntime, imagesFromTar, err := findImages(ctx, runtime, images) imagesFromRuntime, imagesFromTar, err := findImages(ctx, runtime, images)
if err != nil { if err != nil {
return err return err
@ -80,8 +80,8 @@ func ImageImportIntoClusterMulti(ctx context.Context, runtime runtimes.Runtime,
var toolsNode *k3d.Node var toolsNode *k3d.Node
toolsNode, err = runtime.GetNode(ctx, &k3d.Node{Name: fmt.Sprintf("%s-%s-tools", k3d.DefaultObjectNamePrefix, cluster.Name)}) toolsNode, err = runtime.GetNode(ctx, &k3d.Node{Name: fmt.Sprintf("%s-%s-tools", k3d.DefaultObjectNamePrefix, cluster.Name)})
if err != nil || toolsNode == nil { if err != nil || toolsNode == nil {
log.Infoln("Starting k3d-tools node...") log.Infoln("Starting new tools node...")
toolsNode, err = startToolsNode( // TODO: re-use existing container toolsNode, err = runToolsNode( // TODO: re-use existing container
ctx, ctx,
runtime, runtime,
cluster, cluster,
@ -91,7 +91,12 @@ func ImageImportIntoClusterMulti(ctx context.Context, runtime runtimes.Runtime,
fmt.Sprintf("%s:%s", runtime.GetRuntimePath(), runtime.GetRuntimePath()), fmt.Sprintf("%s:%s", runtime.GetRuntimePath(), runtime.GetRuntimePath()),
}) })
if err != nil { if err != nil {
log.Errorf("Failed to start tools container for cluster '%s'", cluster.Name) log.Errorf("Failed to run tools container for cluster '%s'", cluster.Name)
}
} else if !toolsNode.State.Running {
log.Infof("Starting existing tools node %s...", toolsNode.Name)
if err := runtime.StartNode(ctx, toolsNode); err != nil {
return fmt.Errorf("error starting existing tools node %s: %v", toolsNode.Name, err)
} }
} }
@ -151,7 +156,7 @@ func ImageImportIntoClusterMulti(ctx context.Context, runtime runtimes.Runtime,
importWaitgroup.Wait() importWaitgroup.Wait()
// remove tarball // remove tarball
if !loadImageOpts.KeepTar && len(importTarNames) > 0 { if !opts.KeepTar && len(importTarNames) > 0 {
log.Infoln("Removing the tarball(s) from image volume...") log.Infoln("Removing the tarball(s) from image volume...")
if err := runtime.ExecInNode(ctx, toolsNode, []string{"rm", "-f", strings.Join(importTarNames, " ")}); err != nil { if err := runtime.ExecInNode(ctx, toolsNode, []string{"rm", "-f", strings.Join(importTarNames, " ")}); err != nil {
log.Errorf("Failed to delete one or more tarballs from '%+v'", importTarNames) log.Errorf("Failed to delete one or more tarballs from '%+v'", importTarNames)
@ -160,9 +165,11 @@ func ImageImportIntoClusterMulti(ctx context.Context, runtime runtimes.Runtime,
} }
// delete tools container // delete tools container
log.Infoln("Removing k3d-tools node...") if !opts.KeepToolsNode {
if err := runtime.DeleteNode(ctx, toolsNode); err != nil { log.Infoln("Removing k3d-tools node...")
log.Errorf("Failed to delete tools node '%s': Try to delete it manually", toolsNode.Name) if err := runtime.DeleteNode(ctx, toolsNode); err != nil {
log.Errorf("Failed to delete tools node '%s': Try to delete it manually", toolsNode.Name)
}
} }
log.Infoln("Successfully imported image(s)") log.Infoln("Successfully imported image(s)")
@ -266,8 +273,8 @@ func containsVersionPart(imageTag string) bool {
return strings.Contains(substringAfterSlash, ":") return strings.Contains(substringAfterSlash, ":")
} }
// startToolsNode will start a new k3d tools container and connect it to the network of the chosen cluster // runToolsNode will start a new k3d tools container and connect it to the network of the chosen cluster
func startToolsNode(ctx context.Context, runtime runtimes.Runtime, cluster *k3d.Cluster, network string, volumes []string) (*k3d.Node, error) { func runToolsNode(ctx context.Context, runtime runtimes.Runtime, cluster *k3d.Cluster, network string, volumes []string) (*k3d.Node, error) {
labels := map[string]string{} labels := map[string]string{}
for k, v := range k3d.DefaultObjectLabels { for k, v := range k3d.DefaultObjectLabels {
labels[k] = v labels[k] = v

3
pkg/types/types.go
View File

@ -253,7 +253,8 @@ type NodeHookAction interface {
// ImageImportOpts describes a set of options one can set for loading image(s) into cluster(s) // ImageImportOpts describes a set of options one can set for loading image(s) into cluster(s)
type ImageImportOpts struct { type ImageImportOpts struct {
KeepTar bool KeepTar bool
KeepToolsNode bool
} }
type IPAM struct { type IPAM struct {