more changes in dnstest answer

joshisumit · Jul 12, 2020 · a04e279 · a04e279
1 parent 0133ada
commit a04e279
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 26 deletions.
diff --git a/cmd/corefile.go b/cmd/corefile.go
@@ -15,14 +15,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-type corednsPatchValue struct {
-	Data *corefileValue `json:"data"`
-}
-
-type corefileValue struct {
-	Corefile string `json:"Corefile"`
-}
-
 func getCorefile(ns string) (string, error) {
 	api := Clientset.CoreV1()
 

diff --git a/cmd/dnsutil.go b/cmd/dnsutil.go
@@ -30,7 +30,7 @@ type DnsTestResultForDomain struct {
 	DomainName string   `json:"domain"`
 	Server     string   `json:"server"`
 	Result     string   `json:"result"`
-	Answer     []net.IP `json:"answer"`
+	Answer     []string `json:"answer"`
 }
 
 type Dnstest struct {
@@ -56,6 +56,7 @@ func lookupIP(host string, server []string) *DnsTestResultForDomain {
 	resolver.RetryTimes = 3
 
 	//Perform each DNS query for 3 times
+	answer := make([]string, 0)
 	for i := 1; i <= 3; i++ {
 		log.Infof("DNS query: %s Servers: %v", host, srv)
 		ip, err := resolver.LookupHost(host)
@@ -65,9 +66,13 @@ func lookupIP(host string, server []string) *DnsTestResultForDomain {
 			continue
 		}
 		s++
-		log.Infof("Answer: %s A %s", host, ip)
 	}
 
+	for _, ipaddr := range ip {
+		answer = append(answer, ipaddr.String())
+	}
+	log.Infof("Answer: %s A %s %v", host, ip, answer)
+
 	log.Debugf("success: %d fail: %d domain: %s Servers: %s", s, f, host, srv)
 	if f > 0 {
 		log.Errorf("DNS query failed %d times", f)
@@ -77,7 +82,7 @@ func lookupIP(host string, server []string) *DnsTestResultForDomain {
 		result = "success"
 	}
 
-	testres.DomainName, testres.Server, testres.Result, testres.Answer = host, srv[0], result, ip
+	testres.DomainName, testres.Server, testres.Result, testres.Answer = host, srv[0], result, answer
 
 	return &testres
 }
diff --git a/cmd/verify-configs.go b/cmd/verify-configs.go
@@ -129,7 +129,7 @@ func (cd *Coredns) testDNS() {
 
 	//2. Match nameserver in /etc/resolv.conf with ClusterIP ->it should match
 	//from the nameserver IP -> check its coredns or nodeLocalDNSCache
-	dnstest.Description = "tests the DNS queries against ClusterIP and two Coredns Pod IPs"
+	dnstest.Description = "tests the internal and external DNS queries against ClusterIP and two Coredns Pod IPs"
 
 	if rc.Nameserver[0] == cd.ClusterIP {
 		log.Infof("Pod's nameserver is matching to ClusterIP: %s", rc.Nameserver[0])
@@ -168,9 +168,9 @@ func (cd *Coredns) testDNS() {
 		}
 	}
 	if successCount != len(dnstest.DnsTestResultForDomains) {
-		dnstest.DnsResolution = "Failed"
+		dnstest.DnsResolution = "failed"
 	}
-	dnstest.DnsResolution = "Success"
+	dnstest.DnsResolution = "success"
 
 	cd.Dnstest = *dnstest
 	//cd.Dnstest = success

diff --git a/pkg/aws/aws.go b/pkg/aws/aws.go
@@ -19,17 +19,10 @@ import (
 const (
 	maxRetries       = 10
 	resourceID       = "resource-id"
-	resourceKey      = "key"
 	tagKeyMatchValue = "kubernetes.io/cluster/"
 )
 
-type ec2MetdataClient struct {
-	//instanceIdentityDocument ec2metadata.EC2InstanceIdentityDocument
-	client ec2metadata.EC2Metadata
-}
-
 type ec2Client struct {
-	//client ec2.EC2
 	ec2ServiceClient ec2iface.EC2API
 }
 
@@ -50,7 +43,7 @@ type ClusterInfo struct {
 	ClusterName              string                                  `json:"clusterName"`
 	ClusterSGID              string                                  `json:"clusterSecurityGroup"`
 	TagList                  []map[string]string                     `json:"tagList,omitempty"`
-	InstanceIdentityDocument ec2metadata.EC2InstanceIdentityDocument `json:"instanceDetails"`
+	InstanceIdentityDocument ec2metadata.EC2InstanceIdentityDocument `json:"-"`
 	ClusterDetails           *eks.Cluster                            `json:"-"`
 }
 
@@ -214,7 +207,7 @@ func (w *ClusterInfo) getClusterDetails(clusterName string, region string) (*eks
 
 // getSecurityGrupRules returns SG rules based on sg-id or sg-name
 func getSecurityGrupRules(sgFilter string, region string) (*ec2.SecurityGroup, error) {
-	ec2Client, err := newEC2Client(region)
+	ec2Client, _ := newEC2Client(region)
 	fmt.Printf("EC2 Client: %v %T\n\n", ec2Client, ec2Client)
 
 	//input := &ec2.DescribeSecurityGroupsInput{}
@@ -300,7 +293,7 @@ func verifyClusterSGRules(clusterSGID string, region string) (bool, bool, error)
 // requires IAM policy
 func verifyNaclRules(region string, vpcid string) (bool, error) {
 
-	ec2Client, err := newEC2Client(region)
+	ec2Client, _ := newEC2Client(region)
 
 	//    NetworkAclIds: []*string{
 	//aws.String("acl-5fb85d36"),
@@ -413,11 +406,12 @@ func DiscoverClusterInfo() (*ClusterInfo, error) {
 	log.Infof("Fetching Clustername...")
 	clusterName, err := ec2Client.getClusterName(wkr1.InstanceIdentityDocument.InstanceID)
 	if err != nil {
-		log.Errorf(`Error finding required tag "kubernetes.io/cluster/clusterName" on EC2 instance : `, err)
+		log.Errorf("Error finding required tag %q on EC2 instance: %v", "kubernetes.io/cluster/clusterName", err)
 		return nil, err
 	}
 	wkr.ClusterName = clusterName
-	log.Infof("Clustername is :%v", clusterName)
+	wkr.Region = region
+	log.Infof("Clustername is: %v", clusterName)
 
 	log.Infof("Fetching SGs attached to an EC2 instance")
 	sgID, err := wkr.getAttachedSG()