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

createCluster/network: add basic support for hostnetwork mode in docker

Browse Source
This commit is contained in:
iwilltry42 2020-04-16 09:49:30 +02:00
parent 469d8ab62d
commit c51ec003bd
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
5 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/create/createCluster.go
View File

@ -170,6 +170,9 @@ func parseCreateClusterCmd(cmd *cobra.Command, args []string, createClusterOpts
network.Name = networkName network.Name = networkName
network.External = true network.External = true
} }
if networkName == "host" && (masterCount+workerCount) > 1 {
log.Fatalln("Can only run a single node in hostnetwork mode")
}
// --secret // --secret
secret, err := cmd.Flags().GetString("secret") secret, err := cmd.Flags().GetString("secret")

11
pkg/runtimes/docker/network.go
View File

@ -93,3 +93,14 @@ func (d Docker) DeleteNetwork(ID string) error {
// (3) delete network // (3) delete network
return docker.NetworkRemove(ctx, ID) return docker.NetworkRemove(ctx, ID)
} }
// GetNetwork gets information about a network by its ID
func GetNetwork(ID string) (types.NetworkResource, error) {
ctx := context.Background()
docker, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
if err != nil {
log.Errorln("Failed to create docker client")
return types.NetworkResource{}, err
}
return docker.NetworkInspect(ctx, ID, types.NetworkInspectOptions{})
}

8
pkg/runtimes/docker/translate.go
View File

@ -86,11 +86,17 @@ func TranslateNodeToContainer(node *k3d.Node) (*NodeInDocker, error) {
} }
containerConfig.ExposedPorts = exposedPorts containerConfig.ExposedPorts = exposedPorts
hostConfig.PortBindings = portBindings hostConfig.PortBindings = portBindings
/* Network */ /* Network */
networkingConfig.EndpointsConfig = map[string]*network.EndpointSettings{ networkingConfig.EndpointsConfig = map[string]*network.EndpointSettings{
node.Network: {}, node.Network: {},
} }
netInfo, err := GetNetwork(node.Network)
if err != nil {
log.Warnln("Failed to get network information")
log.Warnln(err)
} else if netInfo.Driver == "host" {
hostConfig.NetworkMode = "host"
}
return &NodeInDocker{ return &NodeInDocker{
ContainerConfig: containerConfig, ContainerConfig: containerConfig,

4
tests/test_basic.sh
View File

@ -7,8 +7,8 @@ CURR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
source "$CURR_DIR/common.sh" source "$CURR_DIR/common.sh"
info "Creating two clusters..." info "Creating two clusters..."
$EXE --verbose create cluster c1 --wait --timeout 60 --api-port 6443 || failed "could not create cluster c1" $EXE --verbose create cluster c1 --wait --timeout 60s --api-port 6443 || failed "could not create cluster c1"
$EXE --verbose create cluster c2 --wait --timeout 60 --api-port 6444 || failed "could not create cluster c2" $EXE --verbose create cluster c2 --wait --timeout 60s --api-port 6444 || failed "could not create cluster c2"
info "Checking we have access to both clusters..." info "Checking we have access to both clusters..."
check_k3d_clusters "c1" "c2" || failed "error checking cluster" check_k3d_clusters "c1" "c2" || failed "error checking cluster"

2
tests/test_multi_master.sh
View File

@ -7,7 +7,7 @@ CURR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
source "$CURR_DIR/common.sh" source "$CURR_DIR/common.sh"
info "Creating cluster multimaster..." info "Creating cluster multimaster..."
$EXE create cluster "multimaster" --masters 3 --api-port 6443 --wait --timeout 360 || failed "could not create cluster multimaster" $EXE --verbose create cluster "multimaster" --masters 3 --api-port 6443 --wait --timeout 360s || failed "could not create cluster multimaster"
info "Checking we have access to the cluster..." info "Checking we have access to the cluster..."
check_k3d_clusters "multimaster" || failed "error checking cluster" check_k3d_clusters "multimaster" || failed "error checking cluster"