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
8beb1b21
Commit
8beb1b21
authored
Feb 01, 2017
by
Chris O'Haver
Committed by
John Belamaric
Feb 01, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow cidr based reverse zone config (#500)
* add cidrs opt * remove state data from middleware object
parent
3a04d2a3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
1 deletion
+33
-1
middleware/kubernetes/handler.go
middleware/kubernetes/handler.go
+6
-1
middleware/kubernetes/kubernetes.go
middleware/kubernetes/kubernetes.go
+12
-0
middleware/kubernetes/setup.go
middleware/kubernetes/setup.go
+15
-0
No files found.
middleware/kubernetes/handler.go
View file @
8beb1b21
...
@@ -26,8 +26,13 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M
...
@@ -26,8 +26,13 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M
// otherwise delegate to the next in the pipeline.
// otherwise delegate to the next in the pipeline.
zone
:=
middleware
.
Zones
(
k
.
Zones
)
.
Matches
(
state
.
Name
())
zone
:=
middleware
.
Zones
(
k
.
Zones
)
.
Matches
(
state
.
Name
())
if
zone
==
""
{
if
zone
==
""
{
// If this is a PTR request, and a the request is in a defined
// pod/service cidr range, process the request in this middleware,
// otherwise pass to next middleware.
if
state
.
Type
()
!=
"PTR"
||
!
k
.
IsRequestInReverseRange
(
state
)
{
return
middleware
.
NextOrFailure
(
k
.
Name
(),
k
.
Next
,
ctx
,
w
,
r
)
return
middleware
.
NextOrFailure
(
k
.
Name
(),
k
.
Next
,
ctx
,
w
,
r
)
}
}
}
var
(
var
(
records
,
extra
[]
dns
.
RR
records
,
extra
[]
dns
.
RR
...
...
middleware/kubernetes/kubernetes.go
View file @
8beb1b21
...
@@ -5,6 +5,7 @@ import (
...
@@ -5,6 +5,7 @@ import (
"errors"
"errors"
"fmt"
"fmt"
"log"
"log"
"net"
"strings"
"strings"
"time"
"time"
...
@@ -41,6 +42,7 @@ type Kubernetes struct {
...
@@ -41,6 +42,7 @@ type Kubernetes struct {
LabelSelector
*
unversionedapi
.
LabelSelector
LabelSelector
*
unversionedapi
.
LabelSelector
Selector
*
labels
.
Selector
Selector
*
labels
.
Selector
PodMode
string
PodMode
string
ReverseCidrs
[]
net
.
IPNet
}
}
const
(
const
(
...
@@ -128,6 +130,16 @@ func (k *Kubernetes) Reverse(state request.Request, exact bool, opt middleware.O
...
@@ -128,6 +130,16 @@ func (k *Kubernetes) Reverse(state request.Request, exact bool, opt middleware.O
return
records
,
nil
,
nil
return
records
,
nil
,
nil
}
}
func
(
k
*
Kubernetes
)
IsRequestInReverseRange
(
state
request
.
Request
)
bool
{
ip
:=
dnsutil
.
ExtractAddressFromReverse
(
state
.
Name
())
for
_
,
c
:=
range
k
.
ReverseCidrs
{
if
c
.
Contains
(
net
.
ParseIP
(
ip
))
{
return
true
}
}
return
false
}
// Lookup implements the ServiceBackend interface.
// Lookup implements the ServiceBackend interface.
func
(
k
*
Kubernetes
)
Lookup
(
state
request
.
Request
,
name
string
,
typ
uint16
)
(
*
dns
.
Msg
,
error
)
{
func
(
k
*
Kubernetes
)
Lookup
(
state
request
.
Request
,
name
string
,
typ
uint16
)
(
*
dns
.
Msg
,
error
)
{
return
k
.
Proxy
.
Lookup
(
state
,
name
,
typ
)
return
k
.
Proxy
.
Lookup
(
state
,
name
,
typ
)
...
...
middleware/kubernetes/setup.go
View file @
8beb1b21
...
@@ -3,6 +3,7 @@ package kubernetes
...
@@ -3,6 +3,7 @@ package kubernetes
import
(
import
(
"errors"
"errors"
"fmt"
"fmt"
"net"
"strings"
"strings"
"time"
"time"
...
@@ -84,6 +85,20 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) {
...
@@ -84,6 +85,20 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) {
for
c
.
NextBlock
()
{
for
c
.
NextBlock
()
{
switch
c
.
Val
()
{
switch
c
.
Val
()
{
case
"cidrs"
:
args
:=
c
.
RemainingArgs
()
if
len
(
args
)
>
0
{
for
_
,
cidrStr
:=
range
args
{
_
,
cidr
,
err
:=
net
.
ParseCIDR
(
cidrStr
)
if
err
!=
nil
{
return
nil
,
errors
.
New
(
c
.
Val
()
+
" contains an invalid cidr: "
+
cidrStr
)
}
k8s
.
ReverseCidrs
=
append
(
k8s
.
ReverseCidrs
,
*
cidr
)
}
continue
}
return
nil
,
c
.
ArgErr
()
case
"pods"
:
case
"pods"
:
args
:=
c
.
RemainingArgs
()
args
:=
c
.
RemainingArgs
()
if
len
(
args
)
==
1
{
if
len
(
args
)
==
1
{
...
...
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