Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c847a1f0
Unverified
Commit
c847a1f0
authored
Oct 01, 2018
by
k8s-ci-robot
Committed by
GitHub
Oct 01, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #68462 from knightXun/dns
refactor kubelet/network/dns
parents
042139d8
a578c707
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
dns.go
pkg/kubelet/network/dns/dns.go
+2
-2
No files found.
pkg/kubelet/network/dns/dns.go
View file @
c847a1f0
...
...
@@ -239,7 +239,7 @@ func parseResolvConf(reader io.Reader) (nameservers []string, searches []string,
return
nameservers
,
searches
,
options
,
utilerrors
.
NewAggregate
(
allErrors
)
}
func
(
c
*
Configurer
)
getHostDNSConfig
(
pod
*
v1
.
Pod
)
(
*
runtimeapi
.
DNSConfig
,
error
)
{
func
(
c
*
Configurer
)
getHostDNSConfig
()
(
*
runtimeapi
.
DNSConfig
,
error
)
{
var
hostDNS
,
hostSearch
,
hostOptions
[]
string
// Get host DNS settings
if
c
.
ResolverConfig
!=
""
{
...
...
@@ -329,7 +329,7 @@ func appendDNSConfig(existingDNSConfig *runtimeapi.DNSConfig, dnsConfig *v1.PodD
// GetPodDNS returns DNS settings for the pod.
func
(
c
*
Configurer
)
GetPodDNS
(
pod
*
v1
.
Pod
)
(
*
runtimeapi
.
DNSConfig
,
error
)
{
dnsConfig
,
err
:=
c
.
getHostDNSConfig
(
pod
)
dnsConfig
,
err
:=
c
.
getHostDNSConfig
()
if
err
!=
nil
{
return
nil
,
err
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment