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

fix: delete k3d-tools node after gathering environment information, so it doesn't block an IP in a designated subnet

Browse Source
This commit is contained in:
iwilltry42 2021-08-31 10:09:26 +02:00
parent 17dc4b7b4d
commit 6f76f8ce5d
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/client/cluster.go
View File

@ -70,10 +70,6 @@ func ClusterRun(ctx context.Context, runtime k3drt.Runtime, clusterConfig *confi
/* /*
* Step 2: Pre-Start Configuration * Step 2: Pre-Start Configuration
*/ */
_, err := EnsureToolsNode(ctx, runtime, &clusterConfig.Cluster)
if err != nil {
return fmt.Errorf("failed to ensure k3d-tools node: %w", err)
}
envInfo, err := GatherEnvironmentInfo(ctx, runtime, &clusterConfig.Cluster) envInfo, err := GatherEnvironmentInfo(ctx, runtime, &clusterConfig.Cluster)
if err != nil { if err != nil {
return fmt.Errorf("failed to gather environment information used for cluster creation: %w", err) return fmt.Errorf("failed to gather environment information used for cluster creation: %w", err)

8
pkg/client/environment.go
View File

@ -25,12 +25,20 @@ import (
"context" "context"
"fmt" "fmt"
l "github.com/rancher/k3d/v4/pkg/logger"
"github.com/rancher/k3d/v4/pkg/runtimes" "github.com/rancher/k3d/v4/pkg/runtimes"
k3d "github.com/rancher/k3d/v4/pkg/types" k3d "github.com/rancher/k3d/v4/pkg/types"
) )
func GatherEnvironmentInfo(ctx context.Context, runtime runtimes.Runtime, cluster *k3d.Cluster) (*k3d.EnvironmentInfo, error) { func GatherEnvironmentInfo(ctx context.Context, runtime runtimes.Runtime, cluster *k3d.Cluster) (*k3d.EnvironmentInfo, error) {
l.Log().Infof("Using the k3d-tools node to gather environment information")
toolsNode, err := EnsureToolsNode(ctx, runtime, cluster)
if err != nil {
return nil, err
}
defer NodeDelete(ctx, runtime, toolsNode, k3d.NodeDeleteOpts{SkipLBUpdate: true})
envInfo := &k3d.EnvironmentInfo{} envInfo := &k3d.EnvironmentInfo{}
hostIP, err := GetHostIP(ctx, runtime, cluster) hostIP, err := GetHostIP(ctx, runtime, cluster)