mw/kubernetes: don't export Pod-mode constants. (#959)
* mw/kubernetes: don't export Pod-mode constants. * merged
This commit is contained in:
Miek Gieben
GitHub
parent
12db6618c8
commit
7f5086e97a
4 changed files with 43 additions and 42 deletions
|
|
@ -185,13 +185,13 @@ func TestServeDNS(t *testing.T) {
|
|||
ctx := context.TODO()
|
||||
runServeDNSTests(ctx, t, dnsTestCases, k)
|
||||
|
||||
k.PodMode = PodModeDisabled
|
||||
k.podMode = podModeDisabled
|
||||
runServeDNSTests(ctx, t, podModeDisabledCases, k)
|
||||
|
||||
k.PodMode = PodModeInsecure
|
||||
k.podMode = podModeInsecure
|
||||
runServeDNSTests(ctx, t, podModeInsecureCases, k)
|
||||
|
||||
k.PodMode = PodModeVerified
|
||||
k.podMode = podModeVerified
|
||||
runServeDNSTests(ctx, t, podModeVerifiedCases, k)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ type Kubernetes struct {
|
|||
APIClientKey string
|
||||
APIConn dnsController
|
||||
Namespaces map[string]bool
|
||||
PodMode string
|
||||
podMode string
|
||||
Fallthrough bool
|
||||
|
||||
primaryZoneIndex int
|
||||
|
|
@ -53,19 +53,19 @@ func New(zones []string) *Kubernetes {
|
|||
k.Zones = zones
|
||||
k.Namespaces = make(map[string]bool)
|
||||
k.interfaceAddrsFunc = func() net.IP { return net.ParseIP("127.0.0.1") }
|
||||
k.PodMode = PodModeDisabled
|
||||
k.podMode = podModeDisabled
|
||||
k.Proxy = proxy.Proxy{}
|
||||
|
||||
return k
|
||||
}
|
||||
|
||||
const (
|
||||
// PodModeDisabled is the default value where pod requests are ignored
|
||||
PodModeDisabled = "disabled"
|
||||
// PodModeVerified is where Pod requests are answered only if they exist
|
||||
PodModeVerified = "verified"
|
||||
// PodModeInsecure is where pod requests are answered without verfying they exist
|
||||
PodModeInsecure = "insecure"
|
||||
// podModeDisabled is the default value where pod requests are ignored
|
||||
podModeDisabled = "disabled"
|
||||
// podModeVerified is where Pod requests are answered only if they exist
|
||||
podModeVerified = "verified"
|
||||
// podModeInsecure is where pod requests are answered without verfying they exist
|
||||
podModeInsecure = "insecure"
|
||||
// DNSSchemaVersion is the schema version: https://github.com/kubernetes/dns/blob/master/docs/specification.md
|
||||
DNSSchemaVersion = "1.0.1"
|
||||
)
|
||||
|
|
@ -277,7 +277,7 @@ func (k *Kubernetes) initKubeCache(opts dnsControlOpts) (err error) {
|
|||
opts.selector = &selector
|
||||
}
|
||||
|
||||
opts.initPodCache = k.PodMode == PodModeVerified
|
||||
opts.initPodCache = k.podMode == podModeVerified
|
||||
|
||||
k.APIConn = newdnsController(kubeClient, opts)
|
||||
|
||||
|
|
@ -360,7 +360,7 @@ func (k *Kubernetes) getRecordsForK8sItems(services []kService, pods []kPod, zon
|
|||
}
|
||||
|
||||
func (k *Kubernetes) findPods(namespace, podname string) (pods []kPod, err error) {
|
||||
if k.PodMode == PodModeDisabled {
|
||||
if k.podMode == podModeDisabled {
|
||||
return pods, errPodsDisabled
|
||||
}
|
||||
|
||||
|
|
@ -371,7 +371,7 @@ func (k *Kubernetes) findPods(namespace, podname string) (pods []kPod, err error
|
|||
ip = strings.Replace(podname, "-", ":", -1)
|
||||
}
|
||||
|
||||
if k.PodMode == PodModeInsecure {
|
||||
if k.podMode == podModeInsecure {
|
||||
s := kPod{name: podname, namespace: namespace, addr: ip}
|
||||
pods = append(pods, s)
|
||||
return pods, nil
|
||||
|
|
|
|||
|
|
@ -101,8 +101,8 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, dnsControlOpts, error) {
|
|||
args := c.RemainingArgs()
|
||||
if len(args) == 1 {
|
||||
switch args[0] {
|
||||
case PodModeDisabled, PodModeInsecure, PodModeVerified:
|
||||
k8s.PodMode = args[0]
|
||||
case podModeDisabled, podModeInsecure, podModeVerified:
|
||||
k8s.podMode = args[0]
|
||||
default:
|
||||
return nil, opts, fmt.Errorf("wrong value for pods: %s, must be one of: disabled, verified, insecure", args[0])
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -43,7 +43,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -56,7 +56,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -70,7 +70,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -84,7 +84,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
1,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -98,7 +98,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
2,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -112,7 +112,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
30 * time.Second,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -126,7 +126,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
15 * time.Minute,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -140,7 +140,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
defaultResyncPeriod,
|
||||
"environment=prod",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -154,7 +154,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
defaultResyncPeriod,
|
||||
"application=nginx,environment in (production,qa,staging)",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -172,10 +172,11 @@ func TestKubernetesParse(t *testing.T) {
|
|||
2,
|
||||
15 * time.Minute,
|
||||
"application=nginx,environment in (production,qa,staging)",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
true,
|
||||
nil,
|
||||
},
|
||||
// negative
|
||||
{
|
||||
`kubernetes coredns.local {
|
||||
endpoint
|
||||
|
|
@ -186,7 +187,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
-1,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -200,7 +201,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
-1,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -214,7 +215,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
0 * time.Minute,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -228,7 +229,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
0 * time.Second,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -242,7 +243,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
0 * time.Second,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -256,7 +257,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
0 * time.Second,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -270,7 +271,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
0 * time.Second,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -285,7 +286,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -300,7 +301,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeInsecure,
|
||||
podModeInsecure,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -315,7 +316,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeVerified,
|
||||
podModeVerified,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -330,7 +331,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeVerified,
|
||||
podModeVerified,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -345,7 +346,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -360,7 +361,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
[]string{"13.14.15.16:53"},
|
||||
},
|
||||
|
|
@ -375,7 +376,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
0,
|
||||
defaultResyncPeriod,
|
||||
"",
|
||||
PodModeDisabled,
|
||||
podModeDisabled,
|
||||
false,
|
||||
nil,
|
||||
},
|
||||
|
|
@ -436,7 +437,7 @@ func TestKubernetesParse(t *testing.T) {
|
|||
}
|
||||
}
|
||||
// Pods
|
||||
foundPodMode := k8sController.PodMode
|
||||
foundPodMode := k8sController.podMode
|
||||
if foundPodMode != test.expectedPodMode {
|
||||
t.Errorf("Test %d: Expected kubernetes controller to be initialized with pod mode '%s'. Instead found pod mode '%s' for input '%s'", i, test.expectedPodMode, foundPodMode, test.input)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue