Skip to content

K
k3s
Commit 21f84db4 authored by Bowei Du's avatar Bowei Du
Browse files
Options

Remove reference to dns code from e2e test

This reference was not necessary and avoids having to vendor dns back into Kubernetes for now.
parent 0992e2bf
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 12 deletions
test/e2e/dns_configmap.go
View file @ 21f84db4
...@@ -24,7 +24,6 @@ import ( ...@@ -24,7 +24,6 @@ import (
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
fed "k8s.io/kubernetes/pkg/dns/federation"
"k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/intstr"
...@@ -43,6 +42,7 @@ type dnsConfigMapTest struct { ...@@ -43,6 +42,7 @@ type dnsConfigMapTest struct {
labels []string labels []string
cm *v1.ConfigMap cm *v1.ConfigMap
fedMap map[string]string
isValid bool isValid bool
dnsPod *v1.Pod dnsPod *v1.Pod
...@@ -90,23 +90,25 @@ func (t *dnsConfigMapTest) run() { ...@@ -90,23 +90,25 @@ func (t *dnsConfigMapTest) run() {
t.labels = []string{"abc", "ghi"} t.labels = []string{"abc", "ghi"}
valid1 := map[string]string{"federations": t.labels[0] + "=def"} valid1 := map[string]string{"federations": t.labels[0] + "=def"}
valid1m := map[string]string{t.labels[0]: "def"}
valid2 := map[string]string{"federations": t.labels[1] + "=xyz"} valid2 := map[string]string{"federations": t.labels[1] + "=xyz"}
valid2m := map[string]string{t.labels[1]: "xyz"}
invalid := map[string]string{"federations": "invalid.map=xyz"} invalid := map[string]string{"federations": "invalid.map=xyz"}
By("empty -> valid1") By("empty -> valid1")
t.setConfigMap(&v1.ConfigMap{Data: valid1}, true) t.setConfigMap(&v1.ConfigMap{Data: valid1}, valid1m, true)
t.validate() t.validate()
By("valid1 -> valid2") By("valid1 -> valid2")
t.setConfigMap(&v1.ConfigMap{Data: valid2}, true) t.setConfigMap(&v1.ConfigMap{Data: valid2}, valid2m, true)
t.validate() t.validate()
By("valid2 -> invalid") By("valid2 -> invalid")
t.setConfigMap(&v1.ConfigMap{Data: invalid}, false) t.setConfigMap(&v1.ConfigMap{Data: invalid}, nil, false)
t.validate() t.validate()
By("invalid -> valid1") By("invalid -> valid1")
t.setConfigMap(&v1.ConfigMap{Data: valid1}, true) t.setConfigMap(&v1.ConfigMap{Data: valid1}, valid1m, true)
t.validate() t.validate()
By("valid1 -> deleted") By("valid1 -> deleted")
...@@ -114,7 +116,7 @@ func (t *dnsConfigMapTest) run() { ...@@ -114,7 +116,7 @@ func (t *dnsConfigMapTest) run() {
t.validate() t.validate()
By("deleted -> invalid") By("deleted -> invalid")
t.setConfigMap(&v1.ConfigMap{Data: invalid}, false) t.setConfigMap(&v1.ConfigMap{Data: invalid}, nil, false)
t.validate() t.validate()
} }
...@@ -123,11 +125,7 @@ func (t *dnsConfigMapTest) validate() { ...@@ -123,11 +125,7 @@ func (t *dnsConfigMapTest) validate() {
} }
func (t *dnsConfigMapTest) validateFederation() { func (t *dnsConfigMapTest) validateFederation() {
federations := make(map[string]string) federations := t.fedMap
if t.cm != nil {
err := fed.ParseFederationsFlag(t.cm.Data["federations"], federations)
Expect(err).NotTo(HaveOccurred())
}
if len(federations) == 0 { if len(federations) == 0 {
By(fmt.Sprintf("Validating federation labels %v do not exist", t.labels)) By(fmt.Sprintf("Validating federation labels %v do not exist", t.labels))
...@@ -210,9 +208,10 @@ func (t *dnsConfigMapTest) runDig(dnsName string) []string { ...@@ -210,9 +208,10 @@ func (t *dnsConfigMapTest) runDig(dnsName string) []string {
} }
} }
func (t *dnsConfigMapTest) setConfigMap(cm *v1.ConfigMap, isValid bool) { func (t *dnsConfigMapTest) setConfigMap(cm *v1.ConfigMap, fedMap map[string]string, isValid bool) {
if isValid { if isValid {
t.cm = cm t.cm = cm
t.fedMap = fedMap
} }
t.isValid = isValid t.isValid = isValid
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment