Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
C
Coredns
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Railgun
Coredns
Commits
4b6860fc
Commit
4b6860fc
authored
Feb 07, 2017
by
Chris O'Haver
Committed by
John Belamaric
Feb 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix k8s PTR when all namespaces exposed (#507)
* check for no namespace filter * integration test
parent
89dc5720
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
2 deletions
+49
-2
middleware/kubernetes/kubernetes.go
middleware/kubernetes/kubernetes.go
+2
-2
test/kubernetes_test.go
test/kubernetes_test.go
+47
-0
No files found.
middleware/kubernetes/kubernetes.go
View file @
4b6860fc
...
...
@@ -508,7 +508,7 @@ func (k *Kubernetes) getServiceRecordForIP(ip, name string) []msg.Service {
return
nil
}
for
_
,
service
:=
range
svcList
{
if
!
dnsstrings
.
StringInSlice
(
service
.
Namespace
,
k
.
Namespaces
)
{
if
(
len
(
k
.
Namespaces
)
>
0
)
&&
!
dnsstrings
.
StringInSlice
(
service
.
Namespace
,
k
.
Namespaces
)
{
continue
}
if
service
.
Spec
.
ClusterIP
==
ip
{
...
...
@@ -522,7 +522,7 @@ func (k *Kubernetes) getServiceRecordForIP(ip, name string) []msg.Service {
return
nil
}
for
_
,
ep
:=
range
epList
.
Items
{
if
!
dnsstrings
.
StringInSlice
(
ep
.
ObjectMeta
.
Namespace
,
k
.
Namespaces
)
{
if
(
len
(
k
.
Namespaces
)
>
0
)
&&
!
dnsstrings
.
StringInSlice
(
ep
.
ObjectMeta
.
Namespace
,
k
.
Namespaces
)
{
continue
}
for
_
,
eps
:=
range
ep
.
Subsets
{
...
...
test/kubernetes_test.go
View file @
4b6860fc
...
...
@@ -315,6 +315,42 @@ var dnsTestCasesPartialCidrReverseZone = []test.Case{
},
}
var
dnsTestCasesAllNSExposed
=
[]
test
.
Case
{
{
Qname
:
"svc-1-a.test-1.svc.cluster.local."
,
Qtype
:
dns
.
TypeA
,
Rcode
:
dns
.
RcodeSuccess
,
Answer
:
[]
dns
.
RR
{
test
.
A
(
"svc-1-a.test-1.svc.cluster.local. 303 IN A 10.0.0.100"
),
},
},
{
Qname
:
"svc-c.test-2.svc.cluster.local."
,
Qtype
:
dns
.
TypeA
,
Rcode
:
dns
.
RcodeSuccess
,
Answer
:
[]
dns
.
RR
{
test
.
A
(
"svc-c.test-1.svc.cluster.local. 303 IN A 10.0.0.120"
),
},
},
{
Qname
:
"123.0.0.10.in-addr.arpa."
,
Qtype
:
dns
.
TypePTR
,
Rcode
:
dns
.
RcodeSuccess
,
Answer
:
[]
dns
.
RR
{},
},
{
Qname
:
"100.0.0.10.in-addr.arpa."
,
Qtype
:
dns
.
TypePTR
,
Rcode
:
dns
.
RcodeSuccess
,
Answer
:
[]
dns
.
RR
{
test
.
PTR
(
"100.0.0.10.in-addr.arpa. 303 IN PTR svc-1-a.test-1.svc.cluster.local."
),
},
},
{
Qname
:
"120.0.0.10.in-addr.arpa."
,
Qtype
:
dns
.
TypePTR
,
Rcode
:
dns
.
RcodeSuccess
,
Answer
:
[]
dns
.
RR
{
test
.
PTR
(
"120.0.0.10.in-addr.arpa. 303 IN PTR svc-c.test-2.svc.cluster.local."
),
},
},
}
func
createTestServer
(
t
*
testing
.
T
,
corefile
string
)
(
*
caddy
.
Instance
,
string
)
{
server
,
err
:=
CoreDNSServer
(
corefile
)
if
err
!=
nil
{
...
...
@@ -424,3 +460,14 @@ func TestKubernetesIntegrationPartialCidrReverseZone(t *testing.T) {
`
doIntegrationTests
(
t
,
corefile
,
dnsTestCasesPartialCidrReverseZone
)
}
func
TestKubernetesIntegrationAllNSExposed
(
t
*
testing
.
T
)
{
corefile
:=
`.:0 {
kubernetes cluster.local {
endpoint http://localhost:8080
cidrs 10.0.0.0/24
}
`
doIntegrationTests
(
t
,
corefile
,
dnsTestCasesAllNSExposed
)
}
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