Merge pull request #126 from rajansandeep/cleanuputils

Cleanup naming in utils for better clarity

Author: k8s-ci-robot

utils/utils.go

@@ -14,16 +14,16 @@ import (
 )
 
 const (
-	coreDNSDomain = "cluster.local"
-	coreDNSIP     = "10.96.0.10"
+	dnsDomain = "cluster.local"
+	dnsIP     = "10.96.0.10"
 )
 
-// getCoreDNSService fetches the CoreDNS Service
-func getCoreDNSService(ctx context.Context, c client.Client) (*corev1.Service, error) {
+// getKubernetesService fetches the Kubernetes Service
+func getKubernetesService(ctx context.Context, c client.Client) (*corev1.Service, error) {
 	kubernetesService := &corev1.Service{}
 	id := client.ObjectKey{Namespace: metav1.NamespaceDefault, Name: "kubernetes"}
 
-	// Get the CoreDNS Service
+	// Get the Kubernetes Service
 	err := c.Get(ctx, id, kubernetesService)
 
 	return kubernetesService, err
@@ -33,14 +33,14 @@ func getCoreDNSService(ctx context.Context, c client.Client) (*corev1.Service, e
 // It is usually the 10th address to the Kubernetes Service Cluster IP
 // If the Kubernetes Service Cluster IP is not found, we default it to be "10.96.0.10"
 func FindDNSClusterIP(ctx context.Context, c client.Client) (string, error) {
-	kubernetesService, err := getCoreDNSService(ctx, c)
+	kubernetesService, err := getKubernetesService(ctx, c)
 	if err != nil && !apierrors.IsNotFound(err) {
 		return "", err
 	}
 
 	if apierrors.IsNotFound(err) {
 		// If it cannot determine the Cluster IP, we default it to "10.96.0.10"
-		return coreDNSIP, nil
+		return dnsIP, nil
 	}
 
 	ip := net.ParseIP(kubernetesService.Spec.ClusterIP)
@@ -49,7 +49,7 @@ func FindDNSClusterIP(ctx context.Context, c client.Client) (string, error) {
 	}
 
 	// The kubernetes Service ClusterIP is the 1st IP in the Service Subnet.
-	// Increment the right-most byte by 9 to get to the 10th address, canonically used for CoreDNS.
+	// Increment the right-most byte by 9 to get to the 10th address, canonically used for DNS.
 	// This works for both IPV4, IPV6, and 16-byte IPV4 addresses.
 	ip[len(ip)-1] += 9
 
@@ -67,14 +67,14 @@ func GetDNSDomain() string {
 	cname, err := net.LookupCNAME(svc)
 	if err != nil {
 		// If it cannot determine the domain, we default it to "cluster.local"
-		klog.Infof("determined DNS Domain for cluster should be %q", coreDNSDomain)
-		return coreDNSDomain
+		klog.Infof("determined DNS Domain for cluster should be %q", dnsDomain)
+		return dnsDomain
 	}
 
 	domain := strings.TrimPrefix(cname, svc)
-	domain = strings.TrimSuffix(coreDNSDomain, ".")
+	domain = strings.TrimSuffix(dnsDomain, ".")
 
-	klog.Infof("determined DNS Domain for CoreDNS should be %q", domain)
+	klog.Infof("determined DNS Domain for DNS should be %q", domain)
 
 	return domain
 }