feat:Complete the domain name resolution of the static type

Author: xiejunqiao

chaos.go

@@ -63,14 +63,6 @@ func (k Kubernetes) chaosDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M
 		return dns.RcodeServerFailure, fmt.Errorf("dns chaos error")
 	}
 
-	//return static IP
-	if podInfo.Action == ActionStatic {
-		//return staticIP(ctx, w, r, state, podInfo)
-		//k.chaosMap
-		domainAndIPMap := k.domainAndIPMap[podInfo.Namespace][podInfo.Name]
-		return generateDNSRecords(state, domainAndIPMap, r, w)
-	}
-
 	answers := []dns.RR{}
 	qname := state.Name()
 
@@ -180,8 +172,14 @@ func (k Kubernetes) needChaos(podInfo *PodInfo, records []dns.RR, name string) b
 	if podInfo.Scope == ScopeAll {
 		return true
 	}
-	if podInfo.Action == ActionStatic && k.domainAndIPMap[podInfo.Namespace][podInfo.Name] != nil {
-		return true
+	if podInfo.Action == ActionStatic {
+		domainMap := k.domainAndIPMap[podInfo.Namespace][podInfo.Name]
+		if domainMap != nil {
+			if _, ok := domainMap[name]; ok {
+				return true
+			}
+		}
+		return false
 	}
 
 	rules := podInfo.Selector.Match(name, "")
@@ -212,21 +210,26 @@ func generateDNSRecords(state request.Request, domainAndIpMap map[string]string,
 	if domainAndIpMap == nil {
 		return dns.RcodeServerFailure, nil
 	}
-	ip, ok := domainAndIpMap[qname]
+	ipStr, ok := domainAndIpMap[qname]
 	if !ok {
-		//如果不存在则
 		return dns.RcodeServerFailure, fmt.Errorf("domain %s not found", qname)
 	}
+	ip := net.ParseIP(ipStr)
 	switch state.QType() {
 	case dns.TypeA:
-		ips := []net.IP{net.ParseIP(ip)}
-		log.Debugf("dns.TypeA %v", ips)
-		answers = a(qname, 10, ips)
+		ipv4 := ip.To4()
+		if ipv4 == nil {
+			return dns.RcodeServerFailure, fmt.Errorf("not a valid IPv4 address: %s", ipStr)
+		}
+		answers = a(qname, 10, []net.IP{ipv4})
+		log.Debugf("dns.TypeA %v", ipv4)
 	case dns.TypeAAAA:
-		// TODO: return random IP
-		ips := []net.IP{net.ParseIP(ip)}
-		log.Debugf("dns.TypeAAAA %v", ips)
-		answers = aaaa(qname, 10, ips)
+		ipv6 := ip.To16()
+		if ip.To4() != nil {
+			return dns.RcodeServerFailure, fmt.Errorf("not a valid IPv6 address: %s", ipStr)
+		}
+		log.Debugf("dns.TypeAAAA %v", ipv6)
+		answers = aaaa(qname, 10, []net.IP{ipv6})
 	}
 	m := new(dns.Msg)
 	m.SetReply(r)

handler.go

@@ -24,9 +24,19 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M
 	if k.needChaos(chaosPod, records, state.QName()) && chaosPod.Action != ActionStatic {
 		return k.chaosDNS(ctx, w, r, state, chaosPod)
 	}
+	// Check if chaos testing is needed and the action type is static IP.
 	if k.needChaos(chaosPod, records, state.QName()) && chaosPod.Action == ActionStatic {
-		log.Infof("need chaos, but action is static")
-		return generateDNSRecords(state, k.domainAndIPMap[chaosPod.Namespace][chaosPod.Name], r, w)
+		log.Debugf("need chaos, but action is static")
+		// Get the domain-IP mapping for the specific namespace and pod name.
+		domainMap := k.domainAndIPMap[chaosPod.Namespace][chaosPod.Name]
+		// Check if the domain-IP mapping exists.
+		if domainMap != nil {
+			// Check if the requested domain exists in the mapping.
+			if _, ok := domainMap[state.Name()]; ok {
+				// Generate DNS records using the domain-IP mapping and return the result.
+				return generateDNSRecords(state, domainMap, r, w)
+			}
+		}
 	}
 
 	if k.IsNameError(err) {

setup.go

@@ -19,9 +19,8 @@ import (
 	"github.com/caddyserver/caddy"
 	"github.com/miekg/dns"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
-	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"       // pull this in here, because we want it excluded if plugin.cfg doesn't have k8s
-	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"      // pull this in here, because we want it excluded if plugin.cfg doesn't have k8s
-	_ "k8s.io/client-go/plugin/pkg/client/auth/openstack" // pull this in here, because we want it excluded if plugin.cfg doesn't have k8s
+	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"  // pull this in here, because we want it excluded if plugin.cfg doesn't have k8s
+	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc" // pull this in here, because we want it excluded if plugin.cfg doesn't have k8s
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog"
 )