Allow kube-dns to load its configuration from a config map
- Adds command line flags --config-map, --config-map-ns. - Fixes 36194 (https://github.com/kubernetes/kubernetes/issues/36194) - Update kube-dns yamls - Update bazel (hack/update-bazel.sh) - Update known command line flags - Temporarily reference new kube-dns image (this will be fixed with a separate commit when the DNS image is created)
This commit is contained in:
Bowei Du
@@ -31,6 +31,7 @@ go_library(
|
||||
"disruption.go",
|
||||
"dns.go",
|
||||
"dns_autoscaling.go",
|
||||
"dns_configmap.go",
|
||||
"e2e.go",
|
||||
"empty.go",
|
||||
"empty_dir_wrapper.go",
|
||||
@@ -148,6 +149,7 @@ go_library(
|
||||
"//pkg/controller/petset:go_default_library",
|
||||
"//pkg/controller/replicaset:go_default_library",
|
||||
"//pkg/controller/replication:go_default_library",
|
||||
"//pkg/dns/federation:go_default_library",
|
||||
"//pkg/fields:go_default_library",
|
||||
"//pkg/kubectl:go_default_library",
|
||||
"//pkg/kubectl/cmd/util:go_default_library",
|
||||
|
||||
318
test/e2e/dns_configmap.go
Normal file
318
test/e2e/dns_configmap.go
Normal file
@@ -0,0 +1,318 @@
|
||||
/*
|
||||
Copyright 2015 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package e2e
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"k8s.io/kubernetes/pkg/api"
|
||||
"k8s.io/kubernetes/pkg/api/unversioned"
|
||||
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
|
||||
fed "k8s.io/kubernetes/pkg/dns/federation"
|
||||
"k8s.io/kubernetes/pkg/fields"
|
||||
"k8s.io/kubernetes/pkg/labels"
|
||||
"k8s.io/kubernetes/pkg/util/intstr"
|
||||
"k8s.io/kubernetes/pkg/util/wait"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
|
||||
. "github.com/onsi/ginkgo"
|
||||
. "github.com/onsi/gomega"
|
||||
)
|
||||
|
||||
type dnsConfigMapTest struct {
|
||||
f *framework.Framework
|
||||
c clientset.Interface
|
||||
ns string
|
||||
name string
|
||||
labels []string
|
||||
|
||||
cm *api.ConfigMap
|
||||
isValid bool
|
||||
|
||||
dnsPod *api.Pod
|
||||
utilPod *api.Pod
|
||||
utilService *api.Service
|
||||
}
|
||||
|
||||
var _ = framework.KubeDescribe("DNS config map", func() {
|
||||
test := &dnsConfigMapTest{
|
||||
f: framework.NewDefaultFramework("dns-config-map"),
|
||||
ns: "kube-system",
|
||||
name: "kube-dns",
|
||||
}
|
||||
|
||||
BeforeEach(func() {
|
||||
test.c = test.f.ClientSet
|
||||
})
|
||||
|
||||
It("should be able to change configuration", func() {
|
||||
test.run()
|
||||
})
|
||||
})
|
||||
|
||||
func (t *dnsConfigMapTest) init() {
|
||||
By("Finding a DNS pod")
|
||||
label := labels.SelectorFromSet(labels.Set(map[string]string{"k8s-app": "kube-dns"}))
|
||||
options := api.ListOptions{LabelSelector: label}
|
||||
|
||||
pods, err := t.f.ClientSet.Core().Pods("kube-system").List(options)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
Expect(len(pods.Items)).Should(BeNumerically(">=", 1))
|
||||
|
||||
t.dnsPod = &pods.Items[0]
|
||||
framework.Logf("Using DNS pod: %v", t.dnsPod.Name)
|
||||
}
|
||||
|
||||
func (t *dnsConfigMapTest) run() {
|
||||
t.init()
|
||||
|
||||
defer t.c.Core().ConfigMaps(t.ns).Delete(t.name, nil)
|
||||
t.createUtilPod()
|
||||
defer t.deleteUtilPod()
|
||||
|
||||
t.validate()
|
||||
|
||||
t.labels = []string{"abc", "ghi"}
|
||||
valid1 := map[string]string{"federations": t.labels[0] + "=def"}
|
||||
valid2 := map[string]string{"federations": t.labels[1] + "=xyz"}
|
||||
invalid := map[string]string{"federations": "invalid.map=xyz"}
|
||||
|
||||
By("empty -> valid1")
|
||||
t.setConfigMap(&api.ConfigMap{Data: valid1}, true)
|
||||
t.validate()
|
||||
|
||||
By("valid1 -> valid2")
|
||||
t.setConfigMap(&api.ConfigMap{Data: valid2}, true)
|
||||
t.validate()
|
||||
|
||||
By("valid2 -> invalid")
|
||||
t.setConfigMap(&api.ConfigMap{Data: invalid}, false)
|
||||
t.validate()
|
||||
|
||||
By("invalid -> valid1")
|
||||
t.setConfigMap(&api.ConfigMap{Data: valid1}, true)
|
||||
t.validate()
|
||||
|
||||
By("valid1 -> deleted")
|
||||
t.deleteConfigMap()
|
||||
t.validate()
|
||||
|
||||
By("deleted -> invalid")
|
||||
t.setConfigMap(&api.ConfigMap{Data: invalid}, false)
|
||||
t.validate()
|
||||
}
|
||||
|
||||
func (t *dnsConfigMapTest) validate() {
|
||||
t.validateFederation()
|
||||
}
|
||||
|
||||
func (t *dnsConfigMapTest) validateFederation() {
|
||||
federations := make(map[string]string)
|
||||
if t.cm != nil {
|
||||
err := fed.ParseFederationsFlag(t.cm.Data["federations"], federations)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
}
|
||||
|
||||
if len(federations) == 0 {
|
||||
By(fmt.Sprintf("Validating federation labels %v do not exist", t.labels))
|
||||
|
||||
for _, label := range t.labels {
|
||||
var federationDNS = fmt.Sprintf("e2e-dns-configmap.%s.%s.svc.cluster.local.",
|
||||
t.f.Namespace.Name, label)
|
||||
predicate := func(actual []string) bool {
|
||||
return len(actual) == 0
|
||||
}
|
||||
t.checkDNSRecord(federationDNS, predicate, wait.ForeverTestTimeout)
|
||||
}
|
||||
} else {
|
||||
for label := range federations {
|
||||
var federationDNS = fmt.Sprintf("%s.%s.%s.svc.cluster.local.",
|
||||
t.utilService.ObjectMeta.Name, t.f.Namespace.Name, label)
|
||||
var localDNS = fmt.Sprintf("%s.%s.svc.cluster.local.",
|
||||
t.utilService.ObjectMeta.Name, t.f.Namespace.Name)
|
||||
// Check local mapping. Checking a remote mapping requires
|
||||
// creating an arbitrary DNS record which is not possible at the
|
||||
// moment.
|
||||
By(fmt.Sprintf("Validating federation record %v", label))
|
||||
predicate := func(actual []string) bool {
|
||||
for _, v := range actual {
|
||||
if v == localDNS {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
t.checkDNSRecord(federationDNS, predicate, wait.ForeverTestTimeout)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (t *dnsConfigMapTest) checkDNSRecord(name string, predicate func([]string) bool, timeout time.Duration) {
|
||||
var actual []string
|
||||
|
||||
err := wait.PollImmediate(
|
||||
time.Duration(1)*time.Second,
|
||||
timeout,
|
||||
func() (bool, error) {
|
||||
actual = t.runDig(name)
|
||||
if predicate(actual) {
|
||||
return true, nil
|
||||
}
|
||||
return false, nil
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
framework.Logf("dig result did not match: %#v after %v",
|
||||
actual, timeout)
|
||||
}
|
||||
}
|
||||
|
||||
// runDig querying for `dnsName`. Returns a list of responses.
|
||||
func (t *dnsConfigMapTest) runDig(dnsName string) []string {
|
||||
cmd := []string{
|
||||
"/usr/bin/dig",
|
||||
"+short",
|
||||
"@" + t.dnsPod.Status.PodIP,
|
||||
"-p", "10053", dnsName,
|
||||
}
|
||||
stdout, stderr, err := t.f.ExecWithOptions(framework.ExecOptions{
|
||||
Command: cmd,
|
||||
Namespace: t.f.Namespace.Name,
|
||||
PodName: t.utilPod.Name,
|
||||
ContainerName: "util",
|
||||
CaptureStdout: true,
|
||||
CaptureStderr: true,
|
||||
})
|
||||
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
|
||||
framework.Logf("Running dig: %v, stdout: %q, stderr: %q",
|
||||
cmd, stdout, stderr)
|
||||
|
||||
if stdout == "" {
|
||||
return []string{}
|
||||
} else {
|
||||
return strings.Split(stdout, "\n")
|
||||
}
|
||||
}
|
||||
|
||||
func (t *dnsConfigMapTest) setConfigMap(cm *api.ConfigMap, isValid bool) {
|
||||
if isValid {
|
||||
t.cm = cm
|
||||
}
|
||||
t.isValid = isValid
|
||||
|
||||
cm.ObjectMeta.Namespace = t.ns
|
||||
cm.ObjectMeta.Name = t.name
|
||||
|
||||
options := api.ListOptions{
|
||||
FieldSelector: fields.Set{
|
||||
"metadata.namespace": t.ns,
|
||||
"metadata.name": t.name,
|
||||
}.AsSelector(),
|
||||
}
|
||||
cmList, err := t.c.Core().ConfigMaps(t.ns).List(options)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
|
||||
if len(cmList.Items) == 0 {
|
||||
By(fmt.Sprintf("Creating the ConfigMap (%s:%s) %+v", t.ns, t.name, *cm))
|
||||
_, err := t.c.Core().ConfigMaps(t.ns).Create(cm)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
} else {
|
||||
By(fmt.Sprintf("Updating the ConfigMap (%s:%s) to %+v", t.ns, t.name, *cm))
|
||||
_, err := t.c.Core().ConfigMaps(t.ns).Update(cm)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
}
|
||||
}
|
||||
|
||||
func (t *dnsConfigMapTest) deleteConfigMap() {
|
||||
By(fmt.Sprintf("Deleting the ConfigMap (%s:%s)", t.ns, t.name))
|
||||
|
||||
t.cm = nil
|
||||
t.isValid = false
|
||||
|
||||
err := t.c.Core().ConfigMaps(t.ns).Delete(t.name, nil)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
}
|
||||
|
||||
func (t *dnsConfigMapTest) createUtilPod() {
|
||||
// Actual port # doesn't matter, just need to exist.
|
||||
const servicePort = 10101
|
||||
|
||||
t.utilPod = &api.Pod{
|
||||
TypeMeta: unversioned.TypeMeta{
|
||||
Kind: "Pod",
|
||||
},
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Namespace: t.f.Namespace.Name,
|
||||
Labels: map[string]string{"app": "e2e-dns-configmap"},
|
||||
GenerateName: "e2e-dns-configmap-",
|
||||
},
|
||||
Spec: api.PodSpec{
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: "util",
|
||||
Image: "gcr.io/google_containers/dnsutils:e2e",
|
||||
Command: []string{"sleep", "10000"},
|
||||
Ports: []api.ContainerPort{
|
||||
{ContainerPort: servicePort, Protocol: "TCP"},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
var err error
|
||||
t.utilPod, err = t.c.Core().Pods(t.f.Namespace.Name).Create(t.utilPod)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
framework.Logf("Created pod %v", t.utilPod)
|
||||
Expect(t.f.WaitForPodRunning(t.utilPod.Name)).NotTo(HaveOccurred())
|
||||
|
||||
t.utilService = &api.Service{
|
||||
TypeMeta: unversioned.TypeMeta{
|
||||
Kind: "Service",
|
||||
},
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Namespace: t.f.Namespace.Name,
|
||||
Name: "e2e-dns-configmap",
|
||||
},
|
||||
Spec: api.ServiceSpec{
|
||||
Selector: map[string]string{"app": "e2e-dns-configmap"},
|
||||
Ports: []api.ServicePort{
|
||||
{
|
||||
Protocol: "TCP",
|
||||
Port: servicePort,
|
||||
TargetPort: intstr.FromInt(servicePort),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
t.utilService, err = t.c.Core().Services(t.f.Namespace.Name).Create(t.utilService)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
framework.Logf("Created service %v", t.utilService)
|
||||
}
|
||||
|
||||
func (t *dnsConfigMapTest) deleteUtilPod() {
|
||||
podClient := t.c.Core().Pods(t.f.Namespace.Name)
|
||||
if err := podClient.Delete(t.utilPod.Name, api.NewDeleteOptions(0)); err != nil {
|
||||
framework.Logf("Delete of pod %v:%v failed: %v",
|
||||
t.utilPod.Namespace, t.utilPod.Name, err)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user