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

[FIX] do not ignore --no-hostip and don't try to inject if network = host (#471)

Browse Source
This commit is contained in:
Konrad Malik 2021-02-03 11:38:31 +01:00 committed by GitHub
parent 092f26a4e2
commit 73e1548264
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/client/cluster.go
View File

@ -93,7 +93,11 @@ func ClusterRun(ctx context.Context, runtime k3drt.Runtime, clusterConfig *confi
// add /etc/hosts and CoreDNS entry for host.k3d.internal, referring to the host system
if !clusterConfig.ClusterCreateOpts.PrepDisableHostIPInjection {
prepInjectHostIP(ctx, runtime, &clusterConfig.Cluster)
if clusterConfig.Cluster.Network.Name != "host" {
prepInjectHostIP(ctx, runtime, &clusterConfig.Cluster)
} else {
log.Infoln("Hostnetwork selected -> Skipping injection of docker host into the cluster")
}
}
// create the registry hosting configmap

17
pkg/config/transform.go
View File

@ -219,14 +219,15 @@ func TransformSimpleToClusterConfig(ctx context.Context, runtime runtimes.Runtim
**************************/
clusterCreateOpts := k3d.ClusterCreateOpts{
DisableImageVolume: simpleConfig.Options.K3dOptions.DisableImageVolume,
WaitForServer: simpleConfig.Options.K3dOptions.Wait,
Timeout: simpleConfig.Options.K3dOptions.Timeout,
DisableLoadBalancer: simpleConfig.Options.K3dOptions.DisableLoadbalancer,
K3sServerArgs: simpleConfig.Options.K3sOptions.ExtraServerArgs,
K3sAgentArgs: simpleConfig.Options.K3sOptions.ExtraAgentArgs,
GlobalLabels: map[string]string{}, // empty init
GlobalEnv: []string{}, // empty init
PrepDisableHostIPInjection: simpleConfig.Options.K3dOptions.PrepDisableHostIPInjection,
DisableImageVolume: simpleConfig.Options.K3dOptions.DisableImageVolume,
WaitForServer: simpleConfig.Options.K3dOptions.Wait,
Timeout: simpleConfig.Options.K3dOptions.Timeout,
DisableLoadBalancer: simpleConfig.Options.K3dOptions.DisableLoadbalancer,
K3sServerArgs: simpleConfig.Options.K3sOptions.ExtraServerArgs,
K3sAgentArgs: simpleConfig.Options.K3sOptions.ExtraAgentArgs,
GlobalLabels: map[string]string{}, // empty init
GlobalEnv: []string{}, // empty init
}
// ensure, that we have the default object labels