Skip to content
This repository has been archived by the owner on Sep 24, 2021. It is now read-only.

Support dns options and searches #119

Merged
merged 5 commits into from
Apr 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions hack/test-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function start_frakti() {
sudo "${FRAKTI_OUTPUT_BINDIR}/frakti" \
--listen="${FRAKTI_LISTEN_ADDR}" \
--hyper-endpoint="127.0.0.1:${HYPERD_PORT}" \
--log_dir=${FRAKTI_TEMP} \
--logtostderr \
--v=3 1>&2 & \
FRAKTI_PID=$!
}
Expand Down Expand Up @@ -72,9 +72,9 @@ __EOF__
#--v=1 \
sudo "${HYPERD_BINARY_PATH}" \
--host="tcp://127.0.0.1:${hyper_api_port}" \
--log_dir=${HYPERD_TEMP} \
--logtostderr \
--v=3 \
--config="${config}" &>/dev/null &
--config="${config}" &
HYPERD_PID=$!
# wait hyperd start
frakti::util::wait_for_url "http://127.0.0.1:${hyper_api_port}/info" "hyper-info"
Expand Down Expand Up @@ -119,7 +119,7 @@ EOF'
EOF'

# build cni plugins and copy to specified folder
./build
./build.sh
sudo mkdir -p /opt/cni/bin
sudo cp bin/* /opt/cni/bin/
}
Expand Down
5 changes: 3 additions & 2 deletions pkg/hyper/sandbox.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,11 @@ func buildUserPod(config *kubeapi.PodSandboxConfig) (*types.UserPod, error) {
},
}

// Make dns
// Setup dns options.
if config.DnsConfig != nil {
// TODO: support DNS search domains in upstream hyperd
spec.Dns = config.DnsConfig.Servers
spec.DnsOptions = config.DnsConfig.Options
spec.DnsSearch = config.DnsConfig.Searches
}

return spec, nil
Expand Down
Loading